From 55b315b00f1fc86956ad14bc137922b2132888d0 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 1 Apr 2012 13:55:49 +0000 Subject: [PATCH] Clean up Bootloader API tables. --- Bootloaders/CDC/BootloaderAPITable.S | 13 +++++++++---- 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 1ad8e28d13..50b7a5d389 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 a7d479a702..1ce125e218 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