AVRISP programmer project now has a more robust timeout system, allowing for a doubli...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 9b3154f..5e2241d 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -8,6 +8,16 @@
   *\r
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX\r
   *\r
+  *  <b>New:</b>\r
+  *  - (None)\r
+  *\r
+  *  <b>Changed:</b>\r
+  *  - AVRISP programmer project now has a more robust timeout system, allowing for a doubling of the software USART speed\r
+  *    for PDI and TPI programming\r
+  *\r
+  *  <b>Fixed:</b>\r
+  *  - (None)\r
+  *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r
   *  <b>New:</b>\r

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 169b787..2623640 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -13,6 +13,7 @@
  * \section Sec_MigrationXXXXXX Migrating from 100219 to XXXXXX\r
  *\r
  * \section Sec_Migration100219 Migrating from 091223 to 100219\r
+ *    - (None)\r
  *\r
  *  <b>Non-USB Library Components</b>\r
  *    - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models,\r

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
index 8d8f200..cea42ea 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.c
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -42,14 +42,6 @@ uint32_t CurrentAddress;
 /** Flag to indicate that the next read/write operation must update the device's current address */\r
 bool MustSetAddress;\r
 \r
-\r
-/** ISR for the management of the command execution timeout counter */\r
-ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
-{\r
-       if (TimeoutMSRemaining)\r
-         TimeoutMSRemaining--;\r
-}\r
-\r
 /** Initializes the hardware and software associated with the V2 protocol command handling. */\r
 void V2Protocol_Init(void)\r
 {\r
@@ -76,10 +68,6 @@ void V2Protocol_ProcessCommand(void)
 {\r
        uint8_t V2Command = Endpoint_Read_Byte();\r
        \r
-       /* Set total command processing timeout value, enable timeout management interrupt */\r
-       TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
-       TIMSK0 |= (1 << OCIE0A);\r
-\r
        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r
@@ -139,9 +127,6 @@ void V2Protocol_ProcessCommand(void)
                        V2Protocol_UnknownCommand(V2Command);\r
                        break;\r
        }\r
-               \r
-       /* Disable timeout management interrupt once processing has completed */\r
-       TIMSK0 &= ~(1 << OCIE0A);\r
 \r
        Endpoint_WaitUntilReady();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);\r

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index d67fb3d..97fea47 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -64,12 +64,6 @@
                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */\r
                #define PROGRAMMER_ID              "AVRISP_MK2"\r
                \r
-               /** Timeout period for each issued command from the host before it is aborted */\r
-               #define COMMAND_TIMEOUT_MS         200\r
-               \r
-               /** Command timeout counter register, GPIOR for speed */\r
-               #define TimeoutMSRemaining         GPIOR0\r
-               \r
                /** MUX mask for the VTARGET ADC channel number */\r
                #define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)\r
 \r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index 0ab2975..428469d 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -77,14 +77,19 @@ static void TINYNVM_SendWriteNVMRegister(const uint8_t Address)
 bool TINYNVM_WaitWhileNVMBusBusy(void)\r
 {\r
        /* Poll the STATUS register to check to see if NVM access has been enabled */\r
+       uint8_t TimeoutMSRemaining = 100;\r
        while (TimeoutMSRemaining)\r
        {\r
                /* Send the SLDCS command to read the TPI STATUS register to see the NVM bus is active */\r
                XPROGTarget_SendByte(TPI_CMD_SLDCS | TPI_STATUS_REG);\r
                if (XPROGTarget_ReceiveByte() & TPI_STATUS_NVM)\r
+                 return true;\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
                {\r
-                       TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
-                       return true;\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
                }\r
        }\r
 \r
@@ -99,6 +104,7 @@ bool TINYNVM_WaitWhileNVMBusBusy(void)
 bool TINYNVM_WaitWhileNVMControllerBusy(void)\r
 {\r
        /* Poll the STATUS register to check to see if NVM access has been enabled */\r
+       uint8_t TimeoutMSRemaining = 100;\r
        while (TimeoutMSRemaining)\r
        {\r
                /* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */\r
@@ -106,9 +112,13 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
 \r
                /* Check to see if the BUSY flag is still set */\r
                if (!(XPROGTarget_ReceiveByte() & (1 << 7)))\r
+                 return true;\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
                {\r
-                       TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
-                       return true;\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
                }\r
        }\r
 \r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index fc98cfc..6ef59db 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -72,14 +72,19 @@ static void XMEGANVM_SendNVMRegAddress(const uint8_t Register)
 bool XMEGANVM_WaitWhileNVMBusBusy(void)\r
 {\r
        /* Poll the STATUS register to check to see if NVM access has been enabled */\r
+       uint8_t TimeoutMSRemaining = 100;\r
        while (TimeoutMSRemaining)\r
        {\r
                /* Send the LDCS command to read the PDI STATUS register to see the NVM bus is active */\r
                XPROGTarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG);\r
                if (XPROGTarget_ReceiveByte() & PDI_STATUS_NVM)\r
+                 return true;\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
                {\r
-                       TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
-                       return true;\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
                }\r
        }\r
        \r
@@ -94,6 +99,7 @@ bool XMEGANVM_WaitWhileNVMBusBusy(void)
 bool XMEGANVM_WaitWhileNVMControllerBusy(void)\r
 {\r
        /* Poll the NVM STATUS register while the NVM controller is busy */\r
+       uint8_t TimeoutMSRemaining = 100;\r
        while (TimeoutMSRemaining)\r
        {\r
                /* Send a LDS command to read the NVM STATUS register to check the BUSY flag */\r
@@ -102,9 +108,13 @@ bool XMEGANVM_WaitWhileNVMControllerBusy(void)
                \r
                /* Check to see if the BUSY flag is still set */\r
                if (!(XPROGTarget_ReceiveByte() & (1 << 7)))\r
+                 return true;\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
                {\r
-                       TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
-                       return true;\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
                }\r
        }\r
        \r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index e77d77b..45c1d22 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -49,50 +49,59 @@ volatile uint16_t           SoftUSART_Data;
 #define SoftUSART_BitCount  GPIOR2\r
 \r
 \r
-/** ISR to manage the PDI software USART when bit-banged PDI USART mode is selected. */\r
+/** ISR to manage the rising edge of the PDI/TPI software USART when bit-banged 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
-       /* 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
-               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
+       /* 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
-               SoftUSART_Data >>= 1;\r
-               SoftUSART_BitCount--;\r
-       }\r
-       else\r
-       {\r
-               /* If at falling clock edge and we are in receive mode, abort */\r
-               if (!IsSending)\r
-                 return;\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
-               /* 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
+       SoftUSART_Data >>= 1;\r
+       SoftUSART_BitCount--;\r
+}\r
 \r
-               SoftUSART_Data >>= 1;\r
-               SoftUSART_BitCount--;\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
+\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
+\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
 }\r
 \r
 /** ISR to manage the TPI software USART when bit-banged TPI USART mode is selected. */\r
@@ -172,7 +181,9 @@ void XPROGTarget_EnableTargetPDI(void)
 \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
+       TCCR1C  = (1 << FOC1B);\r
        TIMSK1  = (1 << OCIE1A);\r
 #endif\r
 \r
@@ -240,6 +251,10 @@ 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
+       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
        _delay_ms(1);\r
@@ -250,7 +265,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
@@ -270,6 +285,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
@@ -332,12 +350,31 @@ 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
+       uint8_t TimeoutMSRemaining = 100;\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
+       uint8_t TimeoutMSRemaining = 100;\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
        /* Throw away the parity and stop bits to leave only the data (start bit is already discarded) */\r
        return (uint8_t)SoftUSART_Data;\r
@@ -431,7 +468,16 @@ 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
+       uint8_t TimeoutMSRemaining = 100;\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
        IsSending = false;\r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index bc2953d..d08a8b6 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -81,7 +81,7 @@
                #endif\r
                \r
                /** Number of cycles between each clock when software USART mode is used */\r
-               #define BITS_BETWEEN_USART_CLOCKS  200\r
+               #define BITS_BETWEEN_USART_CLOCKS  100\r
                \r
                /** Total number of bits in a single USART frame */\r
                #define BITS_IN_USART_FRAME        12\r