X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/eee252603be67c539f9986cde76454f756e55d95..refs/heads/ProMicro:/Bootloaders/HID/BootloaderHID.c

diff --git a/Bootloaders/HID/BootloaderHID.c b/Bootloaders/HID/BootloaderHID.c
index 5081762ae..8973bd812 100644
--- a/Bootloaders/HID/BootloaderHID.c
+++ b/Bootloaders/HID/BootloaderHID.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2021.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  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
@@ -58,7 +58,13 @@ void Application_Jump_Check(void)
 	/* If the reset source was the bootloader and the key is correct, clear it and jump to the application */
 	if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
 	{
+		/* 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)();
 	}
@@ -78,6 +84,9 @@ int main(void)
 	while (RunBootloader)
 	  USB_USBTask();
 
+	/* Wait a short time to end all USB transactions and then disconnect */
+	_delay_us(1000);
+
 	/* Disconnect from the host - USB interface will be reset later along with the AVR */
 	USB_Detach();
 
@@ -97,6 +106,9 @@ static void SetupHardware(void)
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
+
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);
 	MCUCR = (1 << IVSEL);
@@ -143,6 +155,10 @@ void EVENT_USB_Device_ControlRequest(void)
 			uint16_t PageAddress = Endpoint_Read_16_LE();
 			#endif
 
+			/* Determine if the given page address is correctly aligned to the
+			   start of a flash page. */
+			bool PageAddressIsAligned = !(PageAddress & (SPM_PAGESIZE - 1));
+
 			/* Check if the command is a program page command, or a start application command */
 			#if (FLASHEND > 0xFFFF)
 			if ((uint16_t)(PageAddress >> 8) == COMMAND_STARTAPPLICATION)
@@ -152,11 +168,14 @@ void EVENT_USB_Device_ControlRequest(void)
 			{
 				RunBootloader = false;
 			}
-			else
+			else if ((PageAddress < BOOT_START_ADDR) && PageAddressIsAligned)
 			{
 				/* Erase the given FLASH page, ready to be programmed */
-				boot_page_erase(PageAddress);
-				boot_spm_busy_wait();
+				ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+				{
+					boot_page_erase(PageAddress);
+					boot_spm_busy_wait();
+				}
 
 				/* Write each of the FLASH page's bytes in sequence */
 				for (uint8_t PageWord = 0; PageWord < (SPM_PAGESIZE / 2); PageWord++)
@@ -173,8 +192,11 @@ void EVENT_USB_Device_ControlRequest(void)
 				}
 
 				/* Write the filled FLASH page to memory */
-				boot_page_write(PageAddress);
-				boot_spm_busy_wait();
+				ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+				{
+					boot_page_write(PageAddress);
+					boot_spm_busy_wait();
+				}
 
 				/* Re-enable RWW section */
 				boot_rww_enable();