diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-14 11:19:44 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-14 11:19:44 +0000 |
| commit | e61345f872fc7f1a8b95e53ee68b4dbdea0650db (patch) | |
| tree | 5dc1dff0e3d59dc303c06ad1448e5b12c8a64a58 /Bootloaders | |
| parent | 84696c727df0424eff71a897243c43a6f4b82932 (diff) | |
| download | lufa-e61345f872fc7f1a8b95e53ee68b4dbdea0650db.tar.gz lufa-e61345f872fc7f1a8b95e53ee68b4dbdea0650db.tar.bz2 lufa-e61345f872fc7f1a8b95e53ee68b4dbdea0650db.zip | |
Fixed incorrect signature reported in the CDC class bootloader for the ATMEGA32U2.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 6 | ||||
| -rw-r--r-- | Bootloaders/CDC/Descriptors.h | 4 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.h | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index da2d0b665..cfc040f8b 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -101,15 +101,15 @@ void EVENT_USB_Device_ConfigurationChanged(void) { /* Setup CDC Notification, Rx and Tx Endpoints */ Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, - ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE, + ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE, ENDPOINT_BANK_SINGLE); Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK, - ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE, + ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE, ENDPOINT_BANK_SINGLE); Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK, - ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE, + ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE, ENDPOINT_BANK_SINGLE); } diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index f13f8d88a..307b323a4 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -70,8 +70,8 @@ #define AVR_SIGNATURE_3 0x88 #elif defined(__AVR_ATmega32U2__) #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x94 - #define AVR_SIGNATURE_3 0x82 + #define AVR_SIGNATURE_2 0x95 + #define AVR_SIGNATURE_3 0x8A #elif defined(__AVR_ATmega16U2__) #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x94 diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index fc3d5ffce..133d8fb98 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -68,16 +68,16 @@ #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x97 #define AVR_SIGNATURE_3 0x82 - #elif defined(__AVR_AT90USB1286__) - #define PRODUCT_ID_CODE 0x2FFB - #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x97 - #define AVR_SIGNATURE_3 0x82 #elif defined(__AVR_AT90USB647__) #define PRODUCT_ID_CODE 0x2FF9 #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x96 #define AVR_SIGNATURE_3 0x82 + #elif defined(__AVR_AT90USB1286__) + #define PRODUCT_ID_CODE 0x2FFB + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x97 + #define AVR_SIGNATURE_3 0x82 #elif defined(__AVR_AT90USB646__) #define PRODUCT_ID_CODE 0x2FF9 #define AVR_SIGNATURE_1 0x1E @@ -93,16 +93,16 @@ #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x95 #define AVR_SIGNATURE_3 0x87 - #elif defined(__AVR_ATmega32U2__) - #define PRODUCT_ID_CODE 0x2FF0 - #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x95 - #define AVR_SIGNATURE_3 0x8A #elif defined(__AVR_ATmega16U4__) #define PRODUCT_ID_CODE 0x2FF3 #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_3 0x88 + #elif defined(__AVR_ATmega32U2__) + #define PRODUCT_ID_CODE 0x2FF0 + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x95 + #define AVR_SIGNATURE_3 0x8A #elif defined(__AVR_ATmega16U2__) #define PRODUCT_ID_CODE 0x2FEF #define AVR_SIGNATURE_1 0x1E |