Minor clean up of the Mass Storage bootloader.

diff --git a/Bootloaders/MassStorage/BootloaderAPI.h b/Bootloaders/MassStorage/BootloaderAPI.h
index d159f68..cbaac42 100644 (file)
--- a/Bootloaders/MassStorage/BootloaderAPI.h
+++ b/Bootloaders/MassStorage/BootloaderAPI.h
@@ -43,6 +43,13 @@
 
                #include <LUFA/Common/Common.h>
 
 
                #include <LUFA/Common/Common.h>
 

+       /* Macros: */
+               #if AUX_BOOT_SECTION_SIZE > 0
+                       #define AUX_BOOT_SECTION       __attribute__((section(".boot_aux")))
+               #else
+                       #define AUX_BOOT_SECTION
+               #endif
+

        /* Function Prototypes: */
                void    BootloaderAPI_ErasePage(const uint32_t Address);
                void    BootloaderAPI_WritePage(const uint32_t Address);
        /* Function Prototypes: */
                void    BootloaderAPI_ErasePage(const uint32_t Address);
                void    BootloaderAPI_WritePage(const uint32_t Address);

diff --git a/Bootloaders/MassStorage/Descriptors.h b/Bootloaders/MassStorage/Descriptors.h
index 4460fda..2e97c6d 100644 (file)
--- a/Bootloaders/MassStorage/Descriptors.h
+++ b/Bootloaders/MassStorage/Descriptors.h
@@ -41,6 +41,8 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
 
                #include <LUFA/Drivers/USB/USB.h>
 

+               #include "BootloaderAPI.h"
+

        /* Macros: */
                /** Endpoint address of the Mass Storage device-to-host data IN endpoint. */
                #define MASS_STORAGE_IN_EPADDR         (ENDPOINT_DIR_IN  | 3)
        /* Macros: */
                /** Endpoint address of the Mass Storage device-to-host data IN endpoint. */
                #define MASS_STORAGE_IN_EPADDR         (ENDPOINT_DIR_IN  | 3)

diff --git a/Bootloaders/MassStorage/makefile b/Bootloaders/MassStorage/makefile
index 598486a..764eedf 100644 (file)
--- a/Bootloaders/MassStorage/makefile
+++ b/Bootloaders/MassStorage/makefile
@@ -46,11 +46,11 @@ BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures,  Boot
 # bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum\r
 # bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.\r
 ifeq ($(BOOT_SECTION_SIZE_KB),8)\r
 # bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum\r
 # bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices.\r
 ifeq ($(BOOT_SECTION_SIZE_KB),8)\r

-  CC_FLAGS           += -DAUX_BOOT_SECTION='' -DAUX_BOOT_SECTION_SIZE=0\r
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE=0\r

 else\r
   AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))\r
 \r
 else\r
   AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB))\r
 \r

-  CC_FLAGS           += -DAUX_BOOT_SECTION='__attribute__((section(".boot_aux")))' -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'\r
+  CC_FLAGS           += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)'\r

   LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))\r
   LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)\r
 endif\r
   LD_FLAGS           += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16))\r
   LD_FLAGS           += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024)\r
 endif\r