diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:13:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 13:13:45 +0000 |
| commit | 5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e (patch) | |
| tree | d3eb8d67b632e47885ede0b25199433084cff1d1 /Bootloaders/CDC | |
| parent | 40fd566dbaa76b1b40677cc826da2e89af424aa2 (diff) | |
| parent | 998009c490409ed4419d3f3d6e43313826bc1796 (diff) | |
| download | lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.tar.gz lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.tar.bz2 lufa-5cba3ce3a489f1c6c38606bc6425f9c8a06fba8e.zip | |
AppConfigHeaders: Merge in latest trunk.
Diffstat (limited to 'Bootloaders/CDC')
| -rw-r--r-- | Bootloaders/CDC/BootloaderAPITable.S | 20 | ||||
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.txt | 10 |
2 files changed, 20 insertions, 10 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 9abd7b2f8..a54ad0b04 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 * |