AVR8: Add option to keep 3.3V regulator enabled

[pub/USBasp.git] / Bootloaders / CDC / BootloaderAPITable.S

diff --git a/Bootloaders/CDC/BootloaderAPITable.S b/Bootloaders/CDC/BootloaderAPITable.S
index fc1e2e9..0d36b54 100644 (file)
--- a/Bootloaders/CDC/BootloaderAPITable.S
+++ b/Bootloaders/CDC/BootloaderAPITable.S
@@ -1,6 +1,6 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -28,33 +28,44 @@
   this software.
 */
 
   this software.
 */
 

-; Bootloader API Jump Table
-.section .apitable, "ax"
-

 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)

-.org 0
-BootloaderAPI_ErasePage_Trampoline:
-       jmp BootloaderAPI_ErasePage
-BootloaderAPI_WritePage_Trampoline:
-       jmp BootloaderAPI_WritePage
-BootloaderAPI_FillWord_Trampoline:
-       jmp BootloaderAPI_FillWord
-BootloaderAPI_ReadSignature_Trampoline:
-       jmp BootloaderAPI_ReadSignature
-BootloaderAPI_ReadFuse_Trampoline:
-       jmp BootloaderAPI_ReadFuse
-BootloaderAPI_ReadLock_Trampoline:
-       jmp BootloaderAPI_ReadLock
-BootloaderAPI_WriteLock_Trampoline:
-       jmp BootloaderAPI_WriteLock
-BootloaderAPU_UNUSED:
-       ret
+.section .apitable_trampolines, "ax"
+.global BootloaderAPI_Trampolines
+BootloaderAPI_Trampolines:
+
+       BootloaderAPI_ErasePage_Trampoline:
+               jmp BootloaderAPI_ErasePage
+       BootloaderAPI_WritePage_Trampoline:
+               jmp BootloaderAPI_WritePage
+       BootloaderAPI_FillWord_Trampoline:
+               jmp BootloaderAPI_FillWord
+       BootloaderAPI_ReadSignature_Trampoline:
+               jmp BootloaderAPI_ReadSignature
+       BootloaderAPI_ReadFuse_Trampoline:
+               jmp BootloaderAPI_ReadFuse
+       BootloaderAPI_ReadLock_Trampoline:
+               jmp BootloaderAPI_ReadLock
+       BootloaderAPI_WriteLock_Trampoline:
+               jmp BootloaderAPI_WriteLock
+       BootloaderAPI_UNUSED1:
+               ret
+       BootloaderAPI_UNUSED2:
+               ret
+       BootloaderAPI_UNUSED3:
+               ret
+       BootloaderAPI_UNUSED4:
+               ret
+       BootloaderAPI_UNUSED5:
+               ret
+
+

 
 ; API function jump table
 
 ; API function jump table

-.org (96 - 32)
+.section .apitable_jumptable, "ax"

 .global BootloaderAPI_JumpTable
 BootloaderAPI_JumpTable:
 .global BootloaderAPI_JumpTable
 BootloaderAPI_JumpTable:

+

        rjmp BootloaderAPI_ErasePage_Trampoline
        rjmp BootloaderAPI_WritePage_Trampoline
        rjmp BootloaderAPI_FillWord_Trampoline
        rjmp BootloaderAPI_ErasePage_Trampoline
        rjmp BootloaderAPI_WritePage_Trampoline
        rjmp BootloaderAPI_FillWord_Trampoline


@@ -62,16 +73,19 @@ BootloaderAPI_JumpTable:
        rjmp BootloaderAPI_ReadFuse_Trampoline
        rjmp BootloaderAPI_ReadLock_Trampoline
        rjmp BootloaderAPI_WriteLock_Trampoline
        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 BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1
+       rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2
+       rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3
+       rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4
+       rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5
+
+

 
 ; Bootloader table signatures and information
 
 ; Bootloader table signatures and information

-.org (96 - 8)
-BootloaderAPI_Signatures:
+.section .apitable_signatures, "ax"

 .global BootloaderAPI_Signatures
 .global BootloaderAPI_Signatures

+BootloaderAPI_Signatures:
+

        .long BOOT_START_ADDR ; Start address of the bootloader
        .long BOOT_START_ADDR ; Start address of the bootloader

-       .word 0xCDC1 ; Signature for the CDC class bootloader, V1
+       .word 0xDF00 ; Signature for the CDC class bootloader

        .word 0xDCFB ; Signature for a LUFA class bootloader
        .word 0xDCFB ; Signature for a LUFA class bootloader