diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-11-16 16:38:22 -0500 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-11-16 16:38:22 -0500 |
| commit | 36513f8362d4ee96ec801728921e4c1e8dc29a3b (patch) | |
| tree | eeaf06289d506318e9354c4bc97ad2b03df54735 /bootloaders/diskloader/src/USBDesc.cpp | |
| parent | ed336f1b68cd537965c1294a3402769688a686ab (diff) | |
Leonardo bootloader now sends iSerial string during enumeration. Seems to satisfy Windows' composite device requirements.
Diffstat (limited to 'bootloaders/diskloader/src/USBDesc.cpp')
| -rw-r--r-- | bootloaders/diskloader/src/USBDesc.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bootloaders/diskloader/src/USBDesc.cpp b/bootloaders/diskloader/src/USBDesc.cpp index c8ea9c6..ade072a 100644 --- a/bootloaders/diskloader/src/USBDesc.cpp +++ b/bootloaders/diskloader/src/USBDesc.cpp @@ -27,6 +27,10 @@ const u16 STRING_LANGUAGE[2] = { 0x0409 // English }; +const u16 STRING_SERIAL[13] = { + (3<<8) | (2+2*12), + USB_SERIAL_STRING +}; const u16 STRING_IPRODUCT[28] = { (3<<8) | (2+2*27), @@ -44,11 +48,12 @@ const u16 STRING_IMANUFACTURER[12] = { //#ifdef CDC_ENABLED -DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1); +DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1); //#else -DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1); +DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1); //#endif + Config USB_ConfigDescriptor = { D_CONFIG(sizeof(Config),INTERFACE_COUNT), |