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

Altered DFU bootloader to use the signature byte constants located in the avr-libc part headers, rather than redefining them in Descriptors.h.

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent 7e7124e40b
commit d711e37d2f
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
Bootloaders/DFU/BootloaderDFU.c
Unescape View File

@ -677,7 +677,7 @@ static void ProcessWriteCommand(void)
static void ProcessReadCommand(void) static void ProcessReadCommand(void)
{ {
const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2}; const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};
const uint8_t SignatureInfo[3] = {SIGNATURE_BYTE_1, SIGNATURE_BYTE_2, SIGNATURE_BYTE_3}; const uint8_t SignatureInfo[3] = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2};
uint8_t DataIndexToRead = SentCommand.Data[1]; uint8_t DataIndexToRead = SentCommand.Data[1];

1
Bootloaders/DFU/BootloaderDFU.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/boot.h> #include <avr/boot.h>
#include <avr/pgmspace.h>
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <stdbool.h> #include <stdbool.h>

36
Bootloaders/DFU/Descriptors.h
Unescape View File

@ -65,58 +65,22 @@
#if defined(__AVR_AT90USB1286__) #if defined(__AVR_AT90USB1286__)
#define PRODUCT_ID_CODE 0x2FFB #define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x97
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB1287__) #elif defined(__AVR_AT90USB1287__)
#define PRODUCT_ID_CODE 0x2FFB #define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x97
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB646__) #elif defined(__AVR_AT90USB646__)
#define PRODUCT_ID_CODE 0x2FF9 #define PRODUCT_ID_CODE 0x2FF9
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x96
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB647__) #elif defined(__AVR_AT90USB647__)
#define PRODUCT_ID_CODE 0x2FF9 #define PRODUCT_ID_CODE 0x2FF9
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x96
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB162__) #elif defined(__AVR_AT90USB162__)
#define PRODUCT_ID_CODE 0x2FFA #define PRODUCT_ID_CODE 0x2FFA
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB82__) #elif defined(__AVR_AT90USB82__)
#define PRODUCT_ID_CODE 0x2FF7 #define PRODUCT_ID_CODE 0x2FF7
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_ATmega32U6__) #elif defined(__AVR_ATmega32U6__)
#define PRODUCT_ID_CODE 0x2FFB #define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x95
#define SIGNATURE_BYTE_3 0x88
#elif defined(__AVR_ATmega32U4__) #elif defined(__AVR_ATmega32U4__)
#define PRODUCT_ID_CODE 0x2FF4 #define PRODUCT_ID_CODE 0x2FF4
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x95
#define SIGNATURE_BYTE_3 0x87
#elif defined(__AVR_ATmega16U4__) #elif defined(__AVR_ATmega16U4__)
#define PRODUCT_ID_CODE 0x2FF3 #define PRODUCT_ID_CODE 0x2FF3
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x88
#else #else
#error The selected AVR part is not currently supported by this bootloader. #error The selected AVR part is not currently supported by this bootloader.
#endif #endif

Write Preview
Loading…
Cancel
Save