aboutsummaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorChristina Quast <chrysh.ng+git@gmail.com>2015-05-08 16:47:26 +0200
committerChristina Quast <chrysh.ng+git@gmail.com>2015-05-08 16:47:29 +0200
commit3735039b595246338b3f3ff149b00f0838edf80e (patch)
tree312c04b5152f7eb0e98f5480039c5aece3ea4ed0 /firmware
parent14f6399c034b36e0308e46ca4859d3d6e5133b8a (diff)
firmware, host: Changed vendor and product id
The code used a vendor and product id taken from Atmel example code. Now it is changed to the vendor and product id, which was also previously used in the original SIMtrace code.
Diffstat (limited to 'firmware')
-rw-r--r--firmware/include_board/board.h6
-rw-r--r--firmware/src_simtrace/usb.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/firmware/include_board/board.h b/firmware/include_board/board.h
index 2940dfc..37330b5 100644
--- a/firmware/include_board/board.h
+++ b/firmware/include_board/board.h
@@ -181,10 +181,8 @@
#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
//#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_RWAKEUP
-#define ATMEL_VENDOR_ID 0x03EB
-#define SIMTRACE_PRODUCT_ID 0x6004
-//#define OPENPCD_VENDOR_ID 0x16c0
-//#define SIMTRACE_PRODUCT_ID 0x0762
+#define SIMTRACE_VENDOR_ID 0x16c0
+#define SIMTRACE_PRODUCT_ID 0x0762
#define USB_VENDOR_ID OPENPCD_VENDOR_ID
#define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID
diff --git a/firmware/src_simtrace/usb.c b/firmware/src_simtrace/usb.c
index ce50955..f8b6186 100644
--- a/firmware/src_simtrace/usb.c
+++ b/firmware/src_simtrace/usb.c
@@ -564,7 +564,7 @@ const USBDeviceDescriptor deviceDescriptor = {
0xff,
// CDCDeviceDescriptor_PROTOCOL,
BOARD_USB_ENDPOINTS_MAXPACKETSIZE(0),
- ATMEL_VENDOR_ID,
+ SIMTRACE_VENDOR_ID,
SIMTRACE_PRODUCT_ID,
1, /* Release number */
0, /* No string descriptor for manufacturer */