diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-04-01 13:55:49 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-04-01 13:55:49 +0000 |
| commit | addbb522d995bf7ab0662b829fbaac5b533ee3e7 (patch) | |
| tree | 07b7dd8f40782d57f53bbcd1afe0e2a7384daa10 | |
| parent | bae804a326d586c584acb622f58cce9b7c1f1de4 (diff) | |
Clean up Bootloader API tables.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2128 d5102386-fcda-11dd-9fdb-3debd5008f28
| -rw-r--r-- | Bootloaders/CDC/BootloaderAPITable.S | 13 | ||||
| -rw-r--r-- | Bootloaders/DFU/BootloaderAPITable.S | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Bootloaders/CDC/BootloaderAPITable.S b/Bootloaders/CDC/BootloaderAPITable.S index 1ad8e28d..50b7a5d3 100644 --- a/Bootloaders/CDC/BootloaderAPITable.S +++ b/Bootloaders/CDC/BootloaderAPITable.S @@ -30,9 +30,9 @@ ; Bootloader API Jump Table .section .apitable, "ax" -.org 0 ; API function jump table +.org 0 .global BootloaderAPI_JumpTable BootloaderAPI_JumpTable: rjmp BootloaderAPI_ErasePage @@ -42,11 +42,16 @@ BootloaderAPI_JumpTable: rjmp BootloaderAPI_ReadFuse rjmp BootloaderAPI_ReadLock rjmp BootloaderAPI_WriteLock + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + ret ; Bootloader table signatures and information -.org 24 +.org (32 - 8) +BootloaderAPI_Signatures: +.global BootloaderAPI_Signatures .long BOOT_START_ADDR ; Start address of the bootloader -.org 28 .word 0xCDC1 ; Signature for the CDC class bootloader, V1 -.org 30 .word 0xDCFB ; Signature for a LUFA class bootloader diff --git a/Bootloaders/DFU/BootloaderAPITable.S b/Bootloaders/DFU/BootloaderAPITable.S index a7d479a7..1ce125e2 100644 --- a/Bootloaders/DFU/BootloaderAPITable.S +++ b/Bootloaders/DFU/BootloaderAPITable.S @@ -30,9 +30,9 @@ ; Bootloader API Jump Table .section .apitable, "ax" -.org 0 ; API function jump table +.org 0 .global BootloaderAPI_JumpTable BootloaderAPI_JumpTable: rjmp BootloaderAPI_ErasePage @@ -42,11 +42,16 @@ BootloaderAPI_JumpTable: rjmp BootloaderAPI_ReadFuse rjmp BootloaderAPI_ReadLock rjmp BootloaderAPI_WriteLock + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + nop ; UNUSED ENTRY + ret ; Bootloader table signatures and information -.org 24 +.org (32 - 8) +BootloaderAPI_Signatures: +.global BootloaderAPI_Signatures .long BOOT_START_ADDR ; Start address of the bootloader -.org 28 .word 0xDFB1 ; Signature for the DFU class bootloader, V1 -.org 30 .word 0xDCFB ; Signature for a LUFA class bootloader |