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 45c1d22..85a7504 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -49,59 +49,53 @@ volatile uint16_t           SoftUSART_Data;
 #define SoftUSART_BitCount  GPIOR2\r
 \r
 \r
-/** ISR to manage the rising edge of the PDI/TPI software USART when bit-banged USART mode is selected. */\r
+/** ISR to manage the PDI software USART when bit-banged PDI USART mode is selected. */\r
 ISR(TIMER1_COMPA_vect, ISR_BLOCK)\r
 {\r
        /* Toggle CLOCK pin in a single cycle (see AVR datasheet) */\r
        BITBANG_PDICLOCK_PIN |= BITBANG_PDICLOCK_MASK;\r
-       TIFR1 |= (1 << OCF1B);\r
-       TIMSK1 = (1 << OCIE1B);\r
 \r
        /* If not sending or receiving, just exit */\r
        if (!(SoftUSART_BitCount))\r
          return;\r
 \r
-       /* If at rising clock edge and we are in send mode, abort */\r
-       if (IsSending)\r
-         return;\r
-         \r
-       /* 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
-       /* 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
-         ((uint8_t*)&SoftUSART_Data)[1] |= (1 << (BITS_IN_USART_FRAME - 9));\r
-\r
-       SoftUSART_Data >>= 1;\r
-       SoftUSART_BitCount--;\r
-}\r
+       if (BITBANG_PDICLOCK_PORT & BITBANG_PDICLOCK_MASK)\r
+       {\r
+               /* If at rising clock edge and we are in send mode, abort */\r
+               if (IsSending)\r
+                 return;\r
+                 \r
+               /* 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
-/** ISR to manage the falling edge of the PDI/TPI software USART when bit-banged USART mode is selected. */\r
-ISR(TIMER1_COMPB_vect, ISR_BLOCK)\r
-{\r
-       /* Toggle CLOCK pin in a single cycle (see AVR datasheet) */\r
-       BITBANG_PDICLOCK_PIN |= BITBANG_PDICLOCK_MASK;\r
-       TIFR1 |= (1 << OCF1A);\r
-       TIMSK1 = (1 << OCIE1A);\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
+                 ((uint8_t*)&SoftUSART_Data)[1] |= (1 << (BITS_IN_USART_FRAME - 9));\r
 \r
-       /* If not sending or receiving, just exit */\r
-       if (!(SoftUSART_BitCount))\r
-         return;\r
+               SoftUSART_Data >>= 1;\r
+               SoftUSART_BitCount--;\r
+       }\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
+               /* If at falling clock edge and we are in receive mode, abort */\r
+               if (!IsSending)\r
+                 return;\r
 \r
-       /* Set the data line to the next bit value */\r
-       if (((uint8_t*)&SoftUSART_Data)[0] & 0x01)\r
-         BITBANG_PDIDATA_PORT |=  BITBANG_PDIDATA_MASK;\r
-       else\r
-         BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;                  \r
+               /* Set the data line to the next bit value */\r
+               if (((uint8_t*)&SoftUSART_Data)[0] & 0x01)\r
+                 BITBANG_PDIDATA_PORT |=  BITBANG_PDIDATA_MASK;\r
+               else\r
+                 BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;                  \r
 \r
-       SoftUSART_Data >>= 1;\r
-       SoftUSART_BitCount--;\r
+               SoftUSART_Data >>= 1;\r
+               SoftUSART_BitCount--;   \r
+       }\r
 }\r
 \r
 /** ISR to manage the TPI software USART when bit-banged TPI USART mode is selected. */\r
@@ -183,7 +177,6 @@ void XPROGTarget_EnableTargetPDI(void)
        OCR1A   = BITS_BETWEEN_USART_CLOCKS;\r
        OCR1B   = BITS_BETWEEN_USART_CLOCKS;\r
        TCCR1B  = (1 << WGM12) | (1 << CS10);\r
-       TCCR1C  = (1 << FOC1B);\r
        TIMSK1  = (1 << OCIE1A);\r
 #endif\r
 \r
@@ -253,7 +246,6 @@ void XPROGTarget_DisableTargetPDI(void)
 #else\r
        /* Turn off software USART management timer */\r
        TCCR1B = 0;\r
-       TCCR1C = 0;\r
 \r
        /* Set /RESET high for a one millisecond to ensure target device is restarted */\r
        BITBANG_PDICLOCK_PORT |= BITBANG_PDICLOCK_MASK;\r
@@ -350,7 +342,6 @@ uint8_t XPROGTarget_ReceiveByte(void)
 \r
 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Wait until a byte has been received before reading */\r
-       uint8_t TimeoutMSRemaining = 100;\r
        while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining)\r
        {\r
                /* Manage software timeout */\r
@@ -365,7 +356,6 @@ uint8_t XPROGTarget_ReceiveByte(void)
 #else\r
        /* Wait until a byte has been received before reading */\r
        SoftUSART_BitCount = BITS_IN_USART_FRAME;\r
-       uint8_t TimeoutMSRemaining = 100;\r
        while (SoftUSART_BitCount && TimeoutMSRemaining)\r
        {\r
                /* Manage software timeout */\r
@@ -376,6 +366,9 @@ uint8_t XPROGTarget_ReceiveByte(void)
                }\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
 #endif\r
@@ -468,7 +461,6 @@ static void XPROGTarget_SetRxMode(void)
        }\r
        \r
        /* Wait until DATA line has been pulled up to idle by the target */\r
-       uint8_t TimeoutMSRemaining = 100;\r
        while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining)\r
        {\r
                /* Manage software timeout */\r
@@ -480,6 +472,9 @@ static void XPROGTarget_SetRxMode(void)
        }       \r
 #endif\r
 \r
+    if (TimeoutMSRemaining)\r
+         TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
+\r
        IsSending = false;\r
 }\r
 \r