CI: Build on Arch (bleeding-ege) and Ubuntu (stable) AVR-GCC toolchains.

[pub/USBasp.git] / Bootloaders / MassStorage / BootloaderMassStorage.h

diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.h b/Bootloaders/MassStorage/BootloaderMassStorage.h
index 5e90739..3241e81 100644 (file)
--- a/Bootloaders/MassStorage/BootloaderMassStorage.h
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -41,18 +41,22 @@
                #include <avr/wdt.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <avr/wdt.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>

+               #include <util/delay.h>

                #include <string.h>
 
                #include "Descriptors.h"
                #include <string.h>
 
                #include "Descriptors.h"

+               #include "BootloaderAPI.h"
+               #include "Config/AppConfig.h"

 
                #include "Lib/SCSI.h"
 
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "Lib/SCSI.h"
 
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>

+               #include <LUFA/Platform/Platform.h>

 
        /* Preprocessor Checks: */
                #if !defined(__OPTIMIZE_SIZE__)
 
        /* Preprocessor Checks: */
                #if !defined(__OPTIMIZE_SIZE__)

-                       #error This bootloader requires that it be compiled for size, not speed for it to fit into the target device.
+                       #error This bootloader requires that it be optimized for size, not speed, to fit into the target device. Change optimization settings and try again.

                #endif
 
        /* Macros: */
                #endif
 
        /* Macros: */


@@ -71,11 +75,15 @@
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2
 

+               /** Magic bootloader key to unlock forced application start mode. */
+               #define MAGIC_BOOT_KEY             0xDC42
+
+       /* Global Variables: */
+               extern bool RunBootloader;
+

        /* Function Prototypes: */
                int main(void) AUX_BOOT_SECTION;
 
        /* Function Prototypes: */
                int main(void) AUX_BOOT_SECTION;
 

-               static void SetupHardware(void) AUX_BOOT_SECTION;
-

                void Application_Jump_Check(void) ATTR_INIT_SECTION(3);
 
                void EVENT_USB_Device_Connect(void) AUX_BOOT_SECTION;
                void Application_Jump_Check(void) ATTR_INIT_SECTION(3);
 
                void EVENT_USB_Device_Connect(void) AUX_BOOT_SECTION;


@@ -85,5 +93,9 @@
 
                bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) AUX_BOOT_SECTION;
 
 
                bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) AUX_BOOT_SECTION;
 

+               #if defined(INCLUDE_FROM_BOOTLOADER_MASSSTORAGE_C)
+                       static void SetupHardware(void) AUX_BOOT_SECTION;
+               #endif
+

 #endif
 
 #endif