aboutsummaryrefslogtreecommitdiff
path: root/bootloaders/diskloader/src/USBDesc.cpp
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-09-16 11:56:33 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-09-16 11:56:33 -0400
commit81bfed93e5ce246050d7e4b4744b0561b847061d (patch)
treefae18060516ec5a5bd6d349e578242ed8de754eb /bootloaders/diskloader/src/USBDesc.cpp
parentbc096344f5884c72c1bfd9c1de7f264094418d99 (diff)
added to the bootloader iProduct and iManufacturer strings identifying board as an "Arduino Leonardo" manufactured by "Arduino LLC"
Diffstat (limited to 'bootloaders/diskloader/src/USBDesc.cpp')
-rw-r--r--bootloaders/diskloader/src/USBDesc.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/bootloaders/diskloader/src/USBDesc.cpp b/bootloaders/diskloader/src/USBDesc.cpp
index ec7cf7d..be322a0 100644
--- a/bootloaders/diskloader/src/USBDesc.cpp
+++ b/bootloaders/diskloader/src/USBDesc.cpp
@@ -27,11 +27,21 @@ const u16 STRING_LANGUAGE[2] = {
0x0409 // English
};
+const u16 STRING_IPRODUCT[17] = {
+ (3<<8) | (2+2*16),
+ 'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
+};
+
+const u16 STRING_IMANUFACTURER[12] = {
+ (3<<8) | (2+2*11),
+ 'A','r','d','u','i','n','o',' ','L','L','C'
+};
+
//#ifdef CDC_ENABLED
-DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
+DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
//#else
-DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
+DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
//#endif
Config USB_ConfigDescriptor =