X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/a1b608ddabc6afd936ebb2cb6182906addeb38c2..03d7fb03bd07d75f0f2d6a9e4b731d09b44cfb37:/Bootloaders/DFU/BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index ec8f0fa66..acd029643 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -45,8 +45,9 @@ static bool IsSecure = SECURE_MODE;
 /** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run
  *  via a soft reset. When cleared, the bootloader will abort, the USB interface will shut down and the application
  *  jumped to via an indirect jump to location 0x0000 (or other location specified by the host).
+ *  Use volatile to prevent compiler to do optimization, because we change this variable from interrupt context.
  */
-static bool RunBootloader = true;
+static volatile bool RunBootloader = true;
 
 /** Flag to indicate if the bootloader is waiting to exit. When the host requests the bootloader to exit and
  *  jump to the application address it specifies, it sends two sequential commands which must be properly
@@ -55,6 +56,21 @@ static bool RunBootloader = true;
  */
 static bool WaitForExit = false;
 
+/** Minimum time in seconds stay forced into bootloader mode before application will be started. This especially
+ *  helpful if the application does not support any update or reflashing or jumping back into bootloader. It prevents
+ *  to brick the device if now ISP programmer is available.
+ */
+#ifndef BL_TIME
+#define BL_TIME 5 /* seconds */
+#endif
+
+/** Minimum time ticks stay in bootloader before application is started or negative value to prevent leaving
+ *  bootloader. Timer 1 is a 16 bit timer, which overflows after 65536 cycles if it is load with zero. The
+ *  timer 1 prescaler is programmed to divide by 64 and the prescaler engine uses a clock_div_1 divisor, means
+ *  no divisor of the CPU clock frequency F_CPU.
+ */
+static int8_t ForceBootloaderTime = ((BL_TIME) > 0) ? (F_CPU / 64 * (BL_TIME) / 65536 + 1) : -1;
+
 /** Current DFU state machine state, one of the values in the DFU_State_t enum. */
 static uint8_t DFU_State = dfuIDLE;
 
@@ -206,9 +222,6 @@ void Application_Jump_Check(void)
 	}
 }
 
-
-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.
@@ -225,36 +238,8 @@ int main(void)
 	GlobalInterruptEnable();
 
 	/* Run the USB management task while the bootloader is supposed to be running */
-	/*if bit_is_clear(PINB,PB5)	// PB5 is Digital 9 on Arduino Pro Micro
-	{
-		loop_until_bit_is_set(PINB,PB5);
-
-		while ((RunBootloader || WaitForExit) && bit_is_set(PINB,PB5))
-			USB_USBTask();
-
-		loop_until_bit_is_clear(PINB,PB5);
-	}*/
-
-	stayinbootloader = false;
-
-	uint16_t i = 0;
 	while (RunBootloader || WaitForExit)
-	{
-		USB_USBTask();
-
-		if (!stayinbootloader)
-		{
-			_delay_ms(1);
-			if (i++ > 5000)
-			{
-				break;
-			}
-		}
-		else
-		{
-			i = 0;
-		}
-	}
+	  USB_USBTask();
 
 	/* Wait a short time to end all USB transactions and then disconnect */
 	_delay_us(1000);
@@ -286,6 +271,7 @@ static void SetupHardware(void)
 
 	/* Bootloader active LED toggle timer initialization */
 	TIMSK1 = (1 << TOIE1);
+	/* config timer 1 prescaler to F_CPU / clock_div_1 / 64 */
 	TCCR1B = ((1 << CS11) | (1 << CS10));
 }
 
@@ -309,6 +295,12 @@ static void ResetHardware(void)
 ISR(TIMER1_OVF_vect, ISR_BLOCK)
 {
 	LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2);
+	/* Count number for forced ticks not below zero */
+	if (ForceBootloaderTime > 0)
+	  ForceBootloaderTime--;
+	/* check if it is time to leave the bootloader and a valid application exists */
+	if ((ForceBootloaderTime == 0) && (pgm_read_word_near(0) != 0xFFFF))
+	  RunBootloader = false;
 }
 
 /** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
@@ -324,7 +316,8 @@ void EVENT_USB_Device_ControlRequest(void)
 		return;
 	}
 
-stayinbootloader = true;
+	/* prevent counter to reach zero */
+	ForceBootloaderTime = -1;
 
 	/* Activity - toggle indicator LEDs */
 	LEDs_ToggleLEDs(LEDS_LED1 | LEDS_LED2);
@@ -846,7 +839,7 @@ 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;
 			}
 		}