introduce new feature: BOOTLOADER_LOOPCYCLES_TIMEOUT

[pub/USBaspLoader.git] / firmware / main.c

diff --git a/firmware/main.c b/firmware/main.c
index 8114dda..98703f9 100644 (file)
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -112,8 +112,25 @@ typedef union longConverter{
 }longConverter_t;
 
 
 }longConverter_t;
 
 

-#if BOOTLOADER_CAN_EXIT
-static volatile unsigned char  stayinloader = 0xfe;
+#if (BOOTLOADER_CAN_EXIT)
+#      if (BOOTLOADER_LOOPCYCLES_TIMEOUT)
+#              if (BOOTLOADER_LOOPCYCLES_TIMEOUT < 256)
+#                      if ((HAVE_UNPRECISEWAIT))
+volatile register uint8_t timeout_remaining __asm__("r2");
+#                      else
+static volatile uint8_t timeout_remaining;
+#                      endif
+#              else
+static volatile uint16_t timeout_remaining;
+#              endif
+#      endif
+#      if ((HAVE_UNPRECISEWAIT))
+/* here we have to assume we need to optimize for every byte */
+#define __REGISTER_stayinloader_initialValue 0xfe
+volatile register uint8_t stayinloader __asm__("r17");
+#      else
+static volatile uint8_t stayinloader = 0xfe;
+#      endif

 #endif
 
 static longConverter_t         currentAddress; /* in bytes */
 #endif
 
 static longConverter_t         currentAddress; /* in bytes */


@@ -196,6 +213,18 @@ static const uchar  signatureBytes[4] = {
 
 /* ------------------------------------------------------------------------ */
 
 
 /* ------------------------------------------------------------------------ */
 

+#if (__REGISTER_stayinloader_initialValue)
+/* need to put it after libc init - otherwise it fucks up the register */
+void __attribute__ ((section(".init8"),naked,used,no_instrument_function)) __REGISTER_stayinloader_initialValue_INITIALIZATION(void);
+void __REGISTER_stayinloader_initialValue_INITIALIZATION(void) {
+  asm volatile (
+    "ldi       %[silreg]       ,       %[silval]\n\t"
+    : [silreg]         "=a" (stayinloader)
+    : [silval]         "M"  (__REGISTER_stayinloader_initialValue)
+  );
+}
+#endif
+

 #if (HAVE_BOOTLOADERENTRY_FROMSOFTWARE)
 void __attribute__ ((section(".init3"),naked,used,no_instrument_function)) __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void);
 void __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void) {
 #if (HAVE_BOOTLOADERENTRY_FROMSOFTWARE)
 void __attribute__ ((section(".init3"),naked,used,no_instrument_function)) __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void);
 void __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void) {


@@ -407,7 +436,7 @@ defined (__AVR_ATmega2561__)
 #   endif
       }
 #endif
 #   endif
       }
 #endif

-#if (HAVE_BOOTLOADER_HIDDENEXITCOMMAND)
+#if ((HAVE_BOOTLOADER_HIDDENEXITCOMMAND) && (BOOTLOADER_CAN_EXIT))

 #      if ((HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0xac) && \
            (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x20) && (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x28) && \
            (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x40) && (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x48) && \
 #      if ((HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0xac) && \
            (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x20) && (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x28) && \
            (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x40) && (HAVE_BOOTLOADER_HIDDENEXITCOMMAND != 0x48) && \


@@ -464,7 +493,12 @@ static uchar    replyBuffer[4];
     }else if(rq->bRequest == USBASP_FUNC_DISCONNECT){
 
 #if BOOTLOADER_CAN_EXIT
     }else if(rq->bRequest == USBASP_FUNC_DISCONNECT){
 
 #if BOOTLOADER_CAN_EXIT

+#      if (BOOTLOADER_LOOPCYCLES_TIMEOUT)
+      timeout_remaining = BOOTLOADER_LOOPCYCLES_TIMEOUT;
+      stayinloader         = (0xfe);
+#      else

       stayinloader        &= (0xfe);
       stayinloader        &= (0xfe);

+#      endif

 #endif
     }else{
         /* ignore: others, but could be USBASP_FUNC_CONNECT */
 #endif
     }else{
         /* ignore: others, but could be USBASP_FUNC_CONNECT */


@@ -703,6 +737,10 @@ static void initForUsbConnectivity(void)
 
 int __attribute__((__noreturn__)) main(void)
 {
 
 int __attribute__((__noreturn__)) main(void)
 {

+#if ((BOOTLOADER_LOOPCYCLES_TIMEOUT) && (BOOTLOADER_CAN_EXIT))
+    uint16_t __loopscycles;
+    timeout_remaining = BOOTLOADER_LOOPCYCLES_TIMEOUT;
+#endif

     /* initialize  */
     bootLoaderInit();
     odDebugInit();
     /* initialize  */
     bootLoaderInit();
     odDebugInit();


@@ -727,6 +765,13 @@ int __attribute__((__noreturn__)) main(void)
        MCUCSR = 0;       /* clear all reset flags for next time */
         initForUsbConnectivity();
         do{
        MCUCSR = 0;       /* clear all reset flags for next time */
         initForUsbConnectivity();
         do{

+#if ((BOOTLOADER_LOOPCYCLES_TIMEOUT) && (BOOTLOADER_CAN_EXIT))
+       __loopscycles++;
+       if (!(__loopscycles)) {
+         if(timeout_remaining) timeout_remaining--;
+         else                  stayinloader&=0xf1;
+       }
+#endif

             usbPoll();
 #if BOOTLOADER_CAN_EXIT
 #if USE_EXCESSIVE_ASSEMBLER
             usbPoll();
 #if BOOTLOADER_CAN_EXIT
 #if USE_EXCESSIVE_ASSEMBLER