forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed incorrect signature reported in the CDC class bootloader for the ATMEGA32U2.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 84696c727d
commit e61345f872
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File

6
Bootloaders/CDC/BootloaderCDC.c
Unescape View File

@ -101,15 +101,15 @@ void EVENT_USB_Device_ConfigurationChanged(void)
{ {
/* Setup CDC Notification, Rx and Tx Endpoints */ /* Setup CDC Notification, Rx and Tx Endpoints */
Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE, ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);
Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK, Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE, ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);
Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK, Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE, ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);
} }

4
Bootloaders/CDC/Descriptors.h
Unescape View File

@ -70,8 +70,8 @@
#define AVR_SIGNATURE_3 0x88 #define AVR_SIGNATURE_3 0x88
#elif defined(__AVR_ATmega32U2__) #elif defined(__AVR_ATmega32U2__)
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_2 0x95
#define AVR_SIGNATURE_3 0x82 #define AVR_SIGNATURE_3 0x8A
#elif defined(__AVR_ATmega16U2__) #elif defined(__AVR_ATmega16U2__)
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_2 0x94

20
Bootloaders/DFU/Descriptors.h
Unescape View File

@ -68,16 +68,16 @@
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x97 #define AVR_SIGNATURE_2 0x97
#define AVR_SIGNATURE_3 0x82 #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__) #elif defined(__AVR_AT90USB647__)
#define PRODUCT_ID_CODE 0x2FF9 #define PRODUCT_ID_CODE 0x2FF9
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x96 #define AVR_SIGNATURE_2 0x96
#define AVR_SIGNATURE_3 0x82 #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__) #elif defined(__AVR_AT90USB646__)
#define PRODUCT_ID_CODE 0x2FF9 #define PRODUCT_ID_CODE 0x2FF9
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
@ -93,16 +93,16 @@
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x95 #define AVR_SIGNATURE_2 0x95
#define AVR_SIGNATURE_3 0x87 #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__) #elif defined(__AVR_ATmega16U4__)
#define PRODUCT_ID_CODE 0x2FF3 #define PRODUCT_ID_CODE 0x2FF3
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_2 0x94
#define AVR_SIGNATURE_3 0x88 #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__) #elif defined(__AVR_ATmega16U2__)
#define PRODUCT_ID_CODE 0x2FEF #define PRODUCT_ID_CODE 0x2FEF
#define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_1 0x1E

2
LUFA/Drivers/Board/USBFOO/Buttons.h
Unescape View File

@ -40,7 +40,7 @@
/** \ingroup Group_Buttons /** \ingroup Group_Buttons
* @defgroup Group_Buttons_USBFOO USBFOO * @defgroup Group_Buttons_USBFOO USBFOO
* *
* Board specific Buttons driver header for the USBFOO Development Board (http://shop.kernelconcepts.de/product_info.php?products_id=102). * Board specific Buttons driver header for the Kernel Concepts USBFOO (http://shop.kernelconcepts.de/product_info.php?products_id=102).
* *
* \note This file should not be included directly. It is automatically included as needed by the Buttons driver * \note This file should not be included directly. It is automatically included as needed by the Buttons driver
* dispatch header located in LUFA/Drivers/Board/Buttons.h. * dispatch header located in LUFA/Drivers/Board/Buttons.h.

1
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -53,6 +53,7 @@
* - Fixed LowLevel PrinterHost demo not sending control requests to the attached printer with the correct printer interface wIndex value * - Fixed LowLevel PrinterHost demo not sending control requests to the attached printer with the correct printer interface wIndex value
* - Added LEDs_ToggleLEDs() function to several board LED drivers which were missing it (thanks to Andrei Krainev) * - Added LEDs_ToggleLEDs() function to several board LED drivers which were missing it (thanks to Andrei Krainev)
* - Fixed SET FEATURE and CLEAR FEATURE control requests directed at an unconfigured endpoint causing request timeouts * - Fixed SET FEATURE and CLEAR FEATURE control requests directed at an unconfigured endpoint causing request timeouts
* - Fixed incorrect signature reported in the CDC class bootloader for the ATMEGA32U2
* *
* \section Sec_ChangeLog100807 Version 100807 * \section Sec_ChangeLog100807 Version 100807
* <b>New:</b> * <b>New:</b>

Write Preview
Loading…
Cancel
Save