X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0b1f33e2a26091714982447132b251496d5a48b2..ba6d9c1a971db3c42bf0b054ebb64f72b3e3ddba:/Bootloaders/MassStorage/BootloaderAPITable.S

diff --git a/Bootloaders/MassStorage/BootloaderAPITable.S b/Bootloaders/MassStorage/BootloaderAPITable.S
index 2aded7421..d15766dc5 100644
--- a/Bootloaders/MassStorage/BootloaderAPITable.S
+++ b/Bootloaders/MassStorage/BootloaderAPITable.S
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2018.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -28,6 +28,17 @@
   this software.
 */
 
+#if AUX_BOOT_SECTION_SIZE > 0
+#warning Using a AUX bootloader section in addition to the defined bootloader space (see documentation).
+
+; Trampoline to jump over the AUX bootloader section to the start of the bootloader,
+; on devices where an AUX bootloader section is used.
+.section .boot_aux_trampoline, "ax"
+.global Boot_AUX_Trampoline
+Boot_AUX_Trampoline:
+	jmp BOOT_START_ADDR
+#endif
+
 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
 .section .apitable_trampolines, "ax"
@@ -48,15 +59,15 @@ BootloaderAPI_Trampolines:
 		jmp BootloaderAPI_ReadLock
 	BootloaderAPI_WriteLock_Trampoline:
 		jmp BootloaderAPI_WriteLock
-	BootloaderAPU_UNUSED1:
+	BootloaderAPI_UNUSED1:
 		ret
-	BootloaderAPU_UNUSED2:
+	BootloaderAPI_UNUSED2:
 		ret
-	BootloaderAPU_UNUSED3:
+	BootloaderAPI_UNUSED3:
 		ret
-	BootloaderAPU_UNUSED4:
+	BootloaderAPI_UNUSED4:
 		ret
-	BootloaderAPU_UNUSED5:
+	BootloaderAPI_UNUSED5:
 		ret
 
 
@@ -73,11 +84,11 @@ BootloaderAPI_JumpTable:
 	rjmp BootloaderAPI_ReadFuse_Trampoline
 	rjmp BootloaderAPI_ReadLock_Trampoline
 	rjmp BootloaderAPI_WriteLock_Trampoline
-	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
+	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