forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce bootloader magic key to 16 bits to save FLASH space.

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent 10944d9ddf
commit 56d368f2de
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
Bootloaders/CDC/BootloaderCDC.c
Unescape View File

@ -61,7 +61,7 @@ static bool RunBootloader = true;
* low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value * low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value
* \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start. * \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start.
*/ */
uint32_t MagicBootKey ATTR_NO_INIT; uint16_t MagicBootKey ATTR_NO_INIT;
/** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application /** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application

2
Bootloaders/CDC/BootloaderCDC.h
Unescape View File

@ -69,7 +69,7 @@
#define SOFTWARE_IDENTIFIER "LUFACDC" #define SOFTWARE_IDENTIFIER "LUFACDC"
/** Magic bootloader key to unlock forced application start mode. */ /** Magic bootloader key to unlock forced application start mode. */
#define MAGIC_BOOT_KEY 0xDC42CACA #define MAGIC_BOOT_KEY 0xDC42
/* Type Defines: */ /* Type Defines: */
/** Type define for a non-returning pointer to the start of the loaded application in flash memory. */ /** Type define for a non-returning pointer to the start of the loaded application in flash memory. */

2
Bootloaders/DFU/BootloaderDFU.c
Unescape View File

@ -97,7 +97,7 @@ static uint16_t EndAddr = 0x0000;
* low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value * low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value
* \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start. * \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start.
*/ */
uint32_t MagicBootKey ATTR_NO_INIT; uint16_t MagicBootKey ATTR_NO_INIT;
/** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application /** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application

2
Bootloaders/DFU/BootloaderDFU.h
Unescape View File

@ -62,7 +62,7 @@
#define BOOTLOADER_VERSION_REV 0 #define BOOTLOADER_VERSION_REV 0
/** Magic bootloader key to unlock forced application start mode. */ /** Magic bootloader key to unlock forced application start mode. */
#define MAGIC_BOOT_KEY 0xDC42CACA #define MAGIC_BOOT_KEY 0xDC42
/** Complete bootloader version number expressed as a packed byte, constructed from the /** Complete bootloader version number expressed as a packed byte, constructed from the
* two individual bootloader version macros. * two individual bootloader version macros.

2
Bootloaders/HID/BootloaderHID.c
Unescape View File

@ -46,7 +46,7 @@ static bool RunBootloader = true;
* low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value * low when the application attempts to start via a watchdog reset, the bootloader will re-start. If set to the value
* \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start. * \ref MAGIC_BOOT_KEY the special init function \ref Application_Jump_Check() will force the application to start.
*/ */
uint32_t MagicBootKey ATTR_NO_INIT; uint16_t MagicBootKey ATTR_NO_INIT;
/** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application /** Special startup routine to check if the bootloader was started via a watchdog reset, and if the magic application

2
Bootloaders/HID/BootloaderHID.h
Unescape View File

@ -53,7 +53,7 @@
#define COMMAND_STARTAPPLICATION 0xFFFF #define COMMAND_STARTAPPLICATION 0xFFFF
/** Magic bootloader key to unlock forced application start mode. */ /** Magic bootloader key to unlock forced application start mode. */
#define MAGIC_BOOT_KEY 0xDC42CACA #define MAGIC_BOOT_KEY 0xDC42
/* Function Prototypes: */ /* Function Prototypes: */
static void SetupHardware(void); static void SetupHardware(void);

Write Preview
Loading…
Cancel
Save