projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix outdated filename references in the LUFA documentation.
[pub/USBasp.git]
/
Bootloaders
/
MassStorage
/
BootloaderMassStorage.h
diff --git
a/Bootloaders/MassStorage/BootloaderMassStorage.h
b/Bootloaders/MassStorage/BootloaderMassStorage.h
index
ec66d94
..
d8271ea
100644
(file)
--- a/
Bootloaders/MassStorage/BootloaderMassStorage.h
+++ b/
Bootloaders/MassStorage/BootloaderMassStorage.h
@@
-44,11
+44,13
@@
#include <string.h>
#include "Descriptors.h"
#include <string.h>
#include "Descriptors.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__)
@@
-71,11
+73,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
+91,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