Remove dual ISR for software PDI mode, use a single ISR instead to reduce code comple...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XPROGTarget.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 843bf5a..85a7504 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -59,7 +59,6 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        if (!(SoftUSART_BitCount))\r
          return;\r
 \r
-       /* Check to see if we are at a rising or falling edge of the clock */\r
        if (BITBANG_PDICLOCK_PORT & BITBANG_PDICLOCK_MASK)\r
        {\r
                /* If at rising clock edge and we are in send mode, abort */\r
@@ -69,7 +68,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
                /* Wait for the start bit when receiving */\r
                if ((SoftUSART_BitCount == BITS_IN_USART_FRAME) && (BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK))\r
                  return;\r
-       \r
+\r
                /* Shift in the bit one less than the frame size in position, so that the start bit will eventually\r
                 * be discarded leaving the data to be byte-aligned for quick access (subtract 9 as we are ORing to the MSB) */\r
                if (BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK)\r
@@ -80,6 +79,10 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        }\r
        else\r
        {\r
+               /* If not sending or receiving, just exit */\r
+               if (!(SoftUSART_BitCount))\r
+                 return;\r
+\r
                /* If at falling clock edge and we are in receive mode, abort */\r
                if (!IsSending)\r
                  return;\r
@@ -91,7 +94,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
                  BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;                  \r
 \r
                SoftUSART_Data >>= 1;\r
-               SoftUSART_BitCount--;\r
+               SoftUSART_BitCount--;   \r
        }\r
 }\r
 \r
@@ -152,11 +155,9 @@ void XPROGTarget_EnableTargetPDI(void)
        DDRD |=  (1 << 5) | (1 << 3);\r
        DDRD &= ~(1 << 2);\r
        \r
-       /* Set DATA line high for at least 90ns to disable /RESET functionality (note: too long will enable it again,\r
-        * so a fixed number of NOPs are used here */\r
+       /* Set DATA line high for at least 90ns to disable /RESET functionality */\r
        PORTD |= (1 << 3);\r
-       asm volatile ("NOP"::);\r
-       asm volatile ("NOP"::);\r
+       _delay_us(1);\r
        \r
        /* Set up the synchronous USART for XMEGA communications - \r
           8 data bits, even parity, 2 stop bits */\r
@@ -168,14 +169,13 @@ void XPROGTarget_EnableTargetPDI(void)
        BITBANG_PDIDATA_DDR  |= BITBANG_PDIDATA_MASK;\r
        BITBANG_PDICLOCK_DDR |= BITBANG_PDICLOCK_MASK;\r
        \r
-       /* Set DATA line high for at least 90ns to disable /RESET functionality (note: too long will enable it again,\r
-        * so a fixed number of NOPs are used here */\r
+       /* Set DATA line high for at least 90ns to disable /RESET functionality */\r
        BITBANG_PDIDATA_PORT |= BITBANG_PDIDATA_MASK;\r
-       asm volatile ("NOP"::);\r
-       asm volatile ("NOP"::);\r
+       _delay_us(1);\r
 \r
        /* Fire timer compare channel A ISR to manage the software USART */\r
        OCR1A   = BITS_BETWEEN_USART_CLOCKS;\r
+       OCR1B   = BITS_BETWEEN_USART_CLOCKS;\r
        TCCR1B  = (1 << WGM12) | (1 << CS10);\r
        TIMSK1  = (1 << OCIE1A);\r
 #endif\r
@@ -193,7 +193,7 @@ void XPROGTarget_EnableTargetTPI(void)
        /* Set /RESET line low for at least 400ns to enable TPI functionality */\r
        AUX_LINE_DDR  |=  AUX_LINE_MASK;\r
        AUX_LINE_PORT &= ~AUX_LINE_MASK;\r
-       _delay_ms(1);\r
+       _delay_us(1);\r
 \r
 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Set Tx and XCK as outputs, Rx as input */\r
@@ -244,6 +244,9 @@ void XPROGTarget_DisableTargetPDI(void)
        DDRD  &= ~((1 << 5) | (1 << 3));\r
        PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2));\r
 #else\r
+       /* Turn off software USART management timer */\r
+       TCCR1B = 0;\r
+\r
        /* Set /RESET high for a one millisecond to ensure target device is restarted */\r
        BITBANG_PDICLOCK_PORT |= BITBANG_PDICLOCK_MASK;\r
        _delay_ms(1);\r
@@ -254,7 +257,7 @@ void XPROGTarget_DisableTargetPDI(void)
        \r
        /* Tristate DATA and CLOCK lines */\r
        BITBANG_PDIDATA_PORT  &= ~BITBANG_PDIDATA_MASK;\r
-       BITBANG_PDICLOCK_PORT &= ~BITBANG_PDICLOCK_MASK;\r
+       BITBANG_PDICLOCK_PORT &= ~BITBANG_PDICLOCK_MASK;        \r
 #endif\r
 }\r
 \r
@@ -274,6 +277,9 @@ void XPROGTarget_DisableTargetTPI(void)
        DDRD  &= ~((1 << 5) | (1 << 3));\r
        PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2));\r
 #else\r
+       /* Turn off software USART management timer */\r
+       TCCR1B = 0;\r
+\r
        /* Set DATA and CLOCK lines to inputs */\r
        BITBANG_TPIDATA_DDR   &= ~BITBANG_TPIDATA_MASK;\r
        BITBANG_TPICLOCK_DDR  &= ~BITBANG_TPICLOCK_MASK;\r
@@ -336,12 +342,32 @@ uint8_t XPROGTarget_ReceiveByte(void)
 \r
 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Wait until a byte has been received before reading */\r
-       while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining);\r
+       while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining)\r
+       {\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
+               {\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
+               }       \r
+       }\r
+       \r
        return UDR1;\r
 #else\r
        /* Wait until a byte has been received before reading */\r
        SoftUSART_BitCount = BITS_IN_USART_FRAME;\r
-       while (SoftUSART_BitCount && TimeoutMSRemaining);\r
+       while (SoftUSART_BitCount && TimeoutMSRemaining)\r
+       {\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
+               {\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
+               }\r
+       }\r
+\r
+       if (TimeoutMSRemaining)\r
+         TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
 \r
        /* Throw away the parity and stop bits to leave only the data (start bit is already discarded) */\r
        return (uint8_t)SoftUSART_Data;\r
@@ -435,9 +461,20 @@ static void XPROGTarget_SetRxMode(void)
        }\r
        \r
        /* Wait until DATA line has been pulled up to idle by the target */\r
-       while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining);\r
+       while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining)\r
+       {\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
+               {\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
+               }\r
+       }       \r
 #endif\r
 \r
+    if (TimeoutMSRemaining)\r
+         TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
+\r
        IsSending = false;\r
 }\r
 \r