X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/1e05d46b663ded57a06f4d8773f40aea908f8622..f4687fd36013da45a2885b568a33bbe331ab5d14:/Bootloaders/DFU/BootloaderDFU.c diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 71db9802a..ce76abe29 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2016. + Copyright (C) Dean Camera, 2021. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2016 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2021 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 @@ -131,9 +131,44 @@ void Application_Jump_Check(void) /* Re-enable JTAG debugging */ JTAG_ENABLE(); + #elif ((BOARD == BOARD_PROMICRO) || (BOARD == BOARD_MICRO)) + /* Pro-Micro and Arduino Micro board use power-on reset, but no external reset. Both boards have + * the hardware bootloader pin HWBE enabled. Unfortunately only the external reset allows together + * with an enabled HWBE that the CPU start at the bootloader address independent of the FUSE_BOOTRST. + * That means the power-on reset will start just controlled by the FUSE_BOOTRST the bootloader or + * direct in the application and cannot be overridden by HWBE signal. Therfore FUSE_BOOTRST shall + * be enabled, otherwise the bootloader will not be reached for these boards. + * The bootloader checks FUSE_HWBE as *unprogammed* instead of FUSE_BOOTRST as programmed on other + * board variants to decide fast application start, without waiting the dedicted bootloader timeout + * in case of a USB, watchdog, brown-out or JTAG reset. If the watchdog reset was initiated from + * the bootloader marked with the MAGIC_BOOT_KEY this reset flag is reset. All other reset flags + * are left untouched to allow the application code checking the reset signals, especially in case + * of application fast start. + * The bootloader is entered always for external reset and power-on reset. But the bootloader is + * anyway exited after that dedicted timeout, if a reset-vector to the application is programmed. + * Once a DFU program interacts this the bootloader during this dedicted timeout, the timer stops + * and the application needs to be started by DFU bootloader command manually or using a reset. + */ + + /* Check if the device's forced Bootloader via Hardware Bootenable is unprogrammed */ + if (BootloaderAPI_ReadFuse(GET_EXTENDED_FUSE_BITS) & ~FUSE_HWBE) + { + /* If the reset source was not an external or power-on reset jump to the application */ + if (!(MCUSR & ((1 << EXTRF) || (1 << PORF)))) + JumpToApplication = true; + } + /* If the reset source was the bootloader and the key is correct, clear it and jump to the application; + * this can happen in the HWBE fuse is set, and the HBE pin is low during the watchdog reset */ + if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY)) + { + JumpToApplication = true; + + /* Clear reset source */ + MCUSR &= ~(1 << WDRF); + } #else /* Check if the device's BOOTRST fuse is set */ - if (boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS) & FUSE_BOOTRST) + if (!(BootloaderAPI_ReadFuse(GET_HIGH_FUSE_BITS) & ~FUSE_BOOTRST)) { /* If the reset source was not an external reset or the key is correct, clear it and jump to the application */ if (!(MCUSR & (1 << EXTRF)) || (MagicBootKey == MAGIC_BOOT_KEY)) @@ -154,6 +189,9 @@ void Application_Jump_Check(void) } #endif + /* Clear the boot key in any case */ + MagicBootKey = 0; + /* Don't run the user application if the reset vector is blank (no app loaded) */ bool ApplicationValid = (pgm_read_word_near(0) != 0xFFFF); @@ -161,17 +199,16 @@ void Application_Jump_Check(void) if (JumpToApplication && ApplicationValid) { /* Turn off the watchdog */ - MCUSR &= ~(1 << WDRF); wdt_disable(); - /* Clear the boot key and jump to the user application */ - MagicBootKey = 0; - // cppcheck-suppress constStatement ((void (*)(void))0x0000)(); } } + +static volatile bool stayinbootloader; + /** Main program entry point. This routine configures the hardware required by the bootloader, then continuously * runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start * the loaded application code. @@ -188,8 +225,32 @@ int main(void) GlobalInterruptEnable(); /* Run the USB management task while the bootloader is supposed to be running */ + stayinbootloader = false; + + uint16_t i = 0; while (RunBootloader || WaitForExit) - USB_USBTask(); + { + USB_USBTask(); + + if (!stayinbootloader) + { + Delay_MS(1); + if (i++ > 5000) + { + if (pgm_read_word_near(0) != 0xFFFF) + break; + else + i = 0; + } + } + else + { + i = 0; + } + } + + /* Wait a short time to end all USB transactions and then disconnect */ + _delay_us(1000); /* Reset configured hardware back to their original states for the user application */ ResetHardware(); @@ -256,6 +317,8 @@ void EVENT_USB_Device_ControlRequest(void) return; } +stayinbootloader = true; + /* Activity - toggle indicator LEDs */ LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2); @@ -351,7 +414,7 @@ void EVENT_USB_Device_ControlRequest(void) } /* Write the next word into the current flash page */ - boot_page_fill(CurrFlashAddress.Long, Endpoint_Read_16_LE()); + BootloaderAPI_FillWord(CurrFlashAddress.Long, Endpoint_Read_16_LE()); /* Adjust counters */ WordsInFlashPage += 1; @@ -361,8 +424,7 @@ void EVENT_USB_Device_ControlRequest(void) if ((WordsInFlashPage == (SPM_PAGESIZE >> 1)) || !(WordsRemaining)) { /* Commit the flash page to memory */ - boot_page_write(CurrFlashPageStartAddress); - boot_spm_busy_wait(); + BootloaderAPI_WritePage(CurrFlashPageStartAddress); /* Check if programming incomplete */ if (WordsRemaining) @@ -371,17 +433,13 @@ void EVENT_USB_Device_ControlRequest(void) WordsInFlashPage = 0; /* Erase next page's temp buffer */ - boot_page_erase(CurrFlashAddress.Long); - boot_spm_busy_wait(); + BootloaderAPI_ErasePage(CurrFlashAddress.Long); } } } /* Once programming complete, start address equals the end address */ StartAddr = EndAddr; - - /* Re-enable the RWW section of flash */ - boot_rww_enable(); } else // Write EEPROM { @@ -400,7 +458,7 @@ void EVENT_USB_Device_ControlRequest(void) } /* Read the byte from the USB interface and write to to the EEPROM */ - eeprom_write_byte((uint8_t*)StartAddr, Endpoint_Read_8()); + eeprom_update_byte((uint8_t*)StartAddr, Endpoint_Read_8()); /* Adjust counters */ StartAddr++; @@ -691,8 +749,7 @@ static void ProcessMemProgCommand(void) } CurrFlashAddress = {.Words = {StartAddr, Flash64KBPage}}; /* Erase the current page's temp buffer */ - boot_page_erase(CurrFlashAddress.Long); - boot_spm_busy_wait(); + BootloaderAPI_ErasePage(CurrFlashAddress.Long); } /* Set the state so that the next DNLOAD requests reads in the firmware */ @@ -782,28 +839,16 @@ static void ProcessWriteCommand(void) else // Start via jump { /* Set the flag to terminate the bootloader at next opportunity if a valid application has been loaded */ - if (pgm_read_word_near(0) == 0xFFFF) + if (pgm_read_word_near(0) != 0xFFFF) RunBootloader = false; } } } else if (IS_TWOBYTE_COMMAND(SentCommand.Data, 0x00, 0xFF)) // Erase flash { - uint32_t CurrFlashAddress = 0; - /* Clear the application section of flash */ - while (CurrFlashAddress < (uint32_t)BOOT_START_ADDR) - { - boot_page_erase(CurrFlashAddress); - boot_spm_busy_wait(); - boot_page_write(CurrFlashAddress); - boot_spm_busy_wait(); - - CurrFlashAddress += SPM_PAGESIZE; - } - - /* Re-enable the RWW section of flash as writing to the flash locks it out */ - boot_rww_enable(); + for (uint32_t CurrFlashAddress = 0; CurrFlashAddress < (uint32_t)BOOT_START_ADDR; CurrFlashAddress += SPM_PAGESIZE) + BootloaderAPI_ErasePage(CurrFlashAddress); /* Memory has been erased, reset the security bit so that programming/reading is allowed */ IsSecure = false; @@ -857,4 +902,3 @@ static void ProcessReadCommand(void) DFU_Status = errADDRESS; } } -