From 96fd39eda86e963177cb7895f6c2216ecb9c732a Mon Sep 17 00:00:00 2001 From: Dean Camera <dean@fourwalledcubicle.com> Date: Sun, 13 May 2012 10:13:24 +0000 Subject: [PATCH] Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay). --- Bootloaders/CDC/BootloaderAPITable.S | 20 ++++++++++++++------ Bootloaders/CDC/BootloaderCDC.txt | 10 ++++++---- Bootloaders/DFU/BootloaderAPITable.S | 20 ++++++++++++++------ Bootloaders/DFU/BootloaderDFU.txt | 12 +++++++----- LUFA/DoxygenPages/ChangeLog.txt | 1 + 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/Bootloaders/CDC/BootloaderAPITable.S b/Bootloaders/CDC/BootloaderAPITable.S index fc1e2e99f..a8e38861d 100644 --- a/Bootloaders/CDC/BootloaderAPITable.S +++ b/Bootloaders/CDC/BootloaderAPITable.S @@ -48,7 +48,15 @@ BootloaderAPI_ReadLock_Trampoline: jmp BootloaderAPI_ReadLock BootloaderAPI_WriteLock_Trampoline: jmp BootloaderAPI_WriteLock -BootloaderAPU_UNUSED: +BootloaderAPU_UNUSED1: + ret +BootloaderAPU_UNUSED2: + ret +BootloaderAPU_UNUSED3: + ret +BootloaderAPU_UNUSED4: + ret +BootloaderAPU_UNUSED5: ret ; API function jump table @@ -62,11 +70,11 @@ BootloaderAPI_JumpTable: rjmp BootloaderAPI_ReadFuse_Trampoline rjmp BootloaderAPI_ReadLock_Trampoline rjmp BootloaderAPI_WriteLock_Trampoline - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY + rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1 + rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2 + rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3 + rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4 + rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5 ; Bootloader table signatures and information .org (96 - 8) diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt index 618b95d25..50748e596 100644 --- a/Bootloaders/CDC/BootloaderCDC.txt +++ b/Bootloaders/CDC/BootloaderCDC.txt @@ -95,7 +95,9 @@ * following layout: * * \code - * #define BOOTLOADER_API_CALL(Index) (void*)(((FLASHEND - 32) + (2 * Index)) / 2) + * #define BOOTLOADER_API_TABLE_SIZE 32 + * #define BOOTLOADER_API_TABLE_START ((FLASHEND + 1UL) - BOOTLOADER_API_TABLE_SIZE) + * #define BOOTLOADER_API_CALL(Index) (void*)((BOOTLOADER_API_TABLE_START + (Index * 2)) / 2) * * void (*BootloaderAPI_ErasePage)(uint32_t Address) = BOOTLOADER_API_CALL(0); * void (*BootloaderAPI_WritePage)(uint32_t Address) = BOOTLOADER_API_CALL(1); @@ -105,13 +107,13 @@ * uint8_t (*BootloaderAPI_ReadLock)(void) = BOOTLOADER_API_CALL(5); * void (*BootloaderAPI_WriteLock)(uint8_t LockBits) = BOOTLOADER_API_CALL(6); * - * #define BOOTLOADER_MAGIC_SIGNATURE_START (FLASHEND - 2) + * #define BOOTLOADER_MAGIC_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 2)) * #define BOOTLOADER_MAGIC_SIGNATURE 0xDCFB * - * #define BOOTLOADER_CLASS_SIGNATURE_START (FLASHEND - 4) + * #define BOOTLOADER_CLASS_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 4)) * #define BOOTLOADER_CDC_SIGNATURE 0xCDC1 * - * #define BOOTLOADER_ADDRESS_START (FLASHEND - 8) + * #define BOOTLOADER_ADDRESS_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 8)) * #define BOOTLOADER_ADDRESS_LENGTH 4 * \endcode * diff --git a/Bootloaders/DFU/BootloaderAPITable.S b/Bootloaders/DFU/BootloaderAPITable.S index 0935aca77..18ae390fc 100644 --- a/Bootloaders/DFU/BootloaderAPITable.S +++ b/Bootloaders/DFU/BootloaderAPITable.S @@ -48,7 +48,15 @@ BootloaderAPI_ReadLock_Trampoline: jmp BootloaderAPI_ReadLock BootloaderAPI_WriteLock_Trampoline: jmp BootloaderAPI_WriteLock -BootloaderAPU_UNUSED: +BootloaderAPU_UNUSED1: + ret +BootloaderAPU_UNUSED2: + ret +BootloaderAPU_UNUSED3: + ret +BootloaderAPU_UNUSED4: + ret +BootloaderAPU_UNUSED5: ret ; API function jump table @@ -62,11 +70,11 @@ BootloaderAPI_JumpTable: rjmp BootloaderAPI_ReadFuse_Trampoline rjmp BootloaderAPI_ReadLock_Trampoline rjmp BootloaderAPI_WriteLock_Trampoline - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY - rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY + rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1 + rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2 + rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3 + rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4 + rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5 ; Bootloader table signatures and information .org (96 - 8) diff --git a/Bootloaders/DFU/BootloaderDFU.txt b/Bootloaders/DFU/BootloaderDFU.txt index 2c9eaf1de..0ef8aba67 100644 --- a/Bootloaders/DFU/BootloaderDFU.txt +++ b/Bootloaders/DFU/BootloaderDFU.txt @@ -100,7 +100,9 @@ * following layout: * * \code - * #define BOOTLOADER_API_CALL(Index) (void*)(((FLASHEND - 32) + (2 * Index)) / 2) + * #define BOOTLOADER_API_TABLE_SIZE 32 + * #define BOOTLOADER_API_TABLE_START ((FLASHEND + 1UL) - BOOTLOADER_API_TABLE_SIZE) + * #define BOOTLOADER_API_CALL(Index) (void*)((BOOTLOADER_API_TABLE_START + (Index * 2)) / 2) * * void (*BootloaderAPI_ErasePage)(uint32_t Address) = BOOTLOADER_API_CALL(0); * void (*BootloaderAPI_WritePage)(uint32_t Address) = BOOTLOADER_API_CALL(1); @@ -110,13 +112,13 @@ * uint8_t (*BootloaderAPI_ReadLock)(void) = BOOTLOADER_API_CALL(5); * void (*BootloaderAPI_WriteLock)(uint8_t LockBits) = BOOTLOADER_API_CALL(6); * - * #define BOOTLOADER_MAGIC_SIGNATURE_START (FLASHEND - 2) + * #define BOOTLOADER_MAGIC_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 2)) * #define BOOTLOADER_MAGIC_SIGNATURE 0xDCFB * - * #define BOOTLOADER_CLASS_SIGNATURE_START (FLASHEND - 4) - * #define BOOTLOADER_DFU_SIGNATURE 0xDFB1 + * #define BOOTLOADER_CLASS_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 4)) + * #define BOOTLOADER_CDC_SIGNATURE 0xDFB1 * - * #define BOOTLOADER_ADDRESS_START (FLASHEND - 8) + * #define BOOTLOADER_ADDRESS_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 8)) * #define BOOTLOADER_ADDRESS_LENGTH 4 * \endcode * diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index f8e1b8f48..79d70ad27 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -66,6 +66,7 @@ * defined (thanks to Steven Morehouse) * - Fixed AVRISP-MKII programmer project reset line polarity inverted when the generated EEP file is loaded into the USB AVR's EEPROM and avr-dude is used * - Fixed CDC and DFU bootloaders failing to compile when the bootloader section size is 8KB or more (thanks to Georg Glock) + * - Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay) * - Fixed incorrect DFU version number reported to the host in the DFU bootloader descriptors (thanks to Georg Glock) * - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock) * -- GitLab