reduce wait time in DebugWIRE before disable interrupt

In previous implementaion, the DebugWIRE func waited 2ms to for all USB transactions to complete. Now it waits 100us, if there is USB transactions, it waits for another 100us. If there is no USB transactions for 100us, the function will proceeed.
ryanplusplus · Nov 10, 2018 · a0d1b6f · a0d1b6f
1 parent 86be876
commit a0d1b6f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/usbtiny/main.c b/usbtiny/main.c
@@ -1930,7 +1930,15 @@ int main(void) {
         // bit flag, and is arranged so that sending a 33 (send break and read pulse widths)
         // will abort a pending wait.
 
-        if (dwState & 0x34) {_delay_ms(2);} // Allow USB transfer to complete before
+        if (dwState & 0x34) {
+          uchar usbInterruptCountPrev, usbInterruptCountNow; 
+          usbInterruptCountNow = usbInterruptCount; //usbInterruptCount got increased in every USB interrupt
+          do {
+            usbInterruptCountPrev=usbInterruptCountNow;
+            _delay_us(100);
+            usbInterruptCountNow = usbInterruptCount;
+            } while( usbInterruptCountPrev!= usbInterruptCountNow);
+          } // Allow USB transfer to complete before
                                             // any action that may disable interrupts
 
         if (dwState & 0x01) {cbi(PORTB, 5); sbi(DDRB, 5); _delay_ms(100);}

diff --git a/usbtiny/usbdrv/asmcommon.inc b/usbtiny/usbdrv/asmcommon.inc
@@ -99,6 +99,9 @@ doReturn:
     sbrc    YL, USB_INTR_PENDING_BIT;[50] check whether data is already arriving
     rjmp    waitForJ            ;[51] save the pops and pushes -- a new interrupt is already pending
 sofError:
+    lds     YL, usbInterruptCount   ;POP_RETI restore YL & SREG
+    inc     YL
+    sts     usbInterruptCount, YL
     POP_RETI                    ;macro call
     reti
 

diff --git a/usbtiny/usbdrv/usbdrv.c b/usbtiny/usbdrv/usbdrv.c
@@ -31,6 +31,7 @@ uchar       usbCurrentTok;      /* last token received or endpoint number for la
 uchar       usbRxToken;         /* token for data we received; or endpont number for last OUT */
 volatile uchar usbTxLen = USBPID_NAK;   /* number of bytes to transmit with next IN token or handshake token */
 uchar       usbTxBuf[USB_BUFSIZE];/* data to transmit with next IN, free if usbTxLen contains handshake token */
+volatile uchar  usbInterruptCount;    /* incremented by assembler module every USB interrupt */
 #if USB_COUNT_SOF
 volatile uchar  usbSofCount;    /* incremented by assembler module every SOF */
 #endif

diff --git a/usbtiny/usbdrv/usbdrv.h b/usbtiny/usbdrv/usbdrv.h
@@ -337,6 +337,9 @@ extern uchar    usbConfiguration;
  * You may want to reflect the "configured" status with a LED on the device or
  * switch on high power parts of the circuit only if the device is configured.
  */
+extern volatile uchar   usbInterruptCount;
+/* This variable is incremented on every USB interrupt.
+ */
 #if USB_COUNT_SOF
 extern volatile uchar   usbSofCount;
 /* This variable is incremented on every SOF packet. It is only available if