diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2016-04-06 16:33:14 +0200 |
|---|---|---|
| committer | Martino Facchin <m.facchin@arduino.cc> | 2016-04-06 17:41:06 +0200 |
| commit | 5e194bd8efe8dcd2fb6eaa13cec1a2a642c5254a (patch) | |
| tree | f34c3a6aad5f9e3b43e121948bfa3563c1dd3495 /cores/arduino/USBCore.cpp | |
| parent | 71b87bf26bc7b485dc1c111603fd09327c1b6c53 (diff) | |
[AVR] Discover newer bootloader at runtime
Replaces #4280, only checks for the bootloader once
Tested with Hoodloader2, should work with every LUFA-derived bootloader released after 2014 (.apitable_signatures section must be placed at end of the flash)
BootloaderAPITable.S :
.global BootloaderAPI_Signatures
BootloaderAPI_Signatures:
.long BOOT_START_ADDR ; Start address of the bootloader
.word 0xDF00 ; Signature for the CDC class bootloader
.word 0xDCFB ; Signature for a LUFA class bootloader
makefile:
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8)
Diffstat (limited to 'cores/arduino/USBCore.cpp')
| -rw-r--r-- | cores/arduino/USBCore.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp index 62b90ed..3c7da86 100644 --- a/cores/arduino/USBCore.cpp +++ b/cores/arduino/USBCore.cpp @@ -35,6 +35,7 @@ extern const u8 STRING_PRODUCT[] PROGMEM; extern const u8 STRING_MANUFACTURER[] PROGMEM; extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM; extern const DeviceDescriptor USB_DeviceDescriptorB PROGMEM; +extern bool _updatedLUFAbootloader; const u16 STRING_LANGUAGE[2] = { (3<<8) | (2+2), @@ -806,6 +807,12 @@ void USBDevice_::attach() UDIEN = (1<<EORSTE) | (1<<SOFE) | (1<<SUSPE); // Enable interrupts for EOR (End of Reset), SOF (start of frame) and SUSPEND TX_RX_LED_INIT; + +#if MAGIC_KEY_POS != (RAMEND-1) + if (pgm_read_word(FLASHEND - 1) == NEW_LUFA_SIGNATURE) { + _updatedLUFAbootloader = true; + } +#endif } void USBDevice_::detach() |