Finished preliminary AVRISP project - all V2 protocol commands now work correctly...

[pub/USBasp.git] / Projects / Incomplete / AVRISP / Lib / V2ProtocolTarget.c

diff --git a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
index 7bcf0be..e23885b 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
@@ -36,24 +36,22 @@
 #include "V2ProtocolTarget.h"\r
 \r
 /** Current memory address for FLASH/EEPROM memory read/write commands */\r
-uint32_t CurrentAddress;\r
+uint32_t CurrentAddress;       \r
 \r
-/** Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
-static const uint8_t SPIMaskFromSCKDuration[] =\r
+uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
+{\r
+       static const uint8_t SPIMaskFromSCKDuration[TOTAL_PROGRAMMING_SPEEDS] =\r
        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r
                #endif\r
                SPI_SPEED_FCPU_DIV_2, SPI_SPEED_FCPU_DIV_4, SPI_SPEED_FCPU_DIV_8,\r
                SPI_SPEED_FCPU_DIV_16, SPI_SPEED_FCPU_DIV_32, SPI_SPEED_FCPU_DIV_64\r
-               #if (F_CPU == 16000000)                                                                         \r
+               #if (F_CPU == 16000000)\r
                , SPI_SPEED_FCPU_DIV_128\r
                #endif\r
        };\r
-       \r
 \r
-uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
-{\r
        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r
        if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
@@ -73,36 +71,63 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
        }\r
        else\r
        {\r
-               RESET_LINE_PORT &= ~RESET_LINE_MASK;    \r
+               RESET_LINE_PORT &= ~RESET_LINE_MASK;\r
                RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
        }\r
 }\r
 \r
-void V2Protocol_DelayMS(uint8_t MS)\r
+uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
+                                       uint8_t DelayMS, uint8_t ReadMemCommand)\r
 {\r
-       while (MS--)\r
-         _delay_ms(1);\r
+       uint8_t ProgrammingStatus = STATUS_CMD_OK;\r
+\r
+       /* Determine method of Programming Complete check */\r
+       switch (ProgrammingMode & ~(PROG_MODE_PAGED_WRITES_MASK | PROG_MODE_COMMIT_PAGE_MASK))\r
+       {\r
+               case PROG_MODE_WORD_TIMEDELAY_MASK:\r
+               case PROG_MODE_PAGED_TIMEDELAY_MASK:\r
+                       V2Protocol_DelayMS(DelayMS);\r
+                       break;\r
+               case PROG_MODE_WORD_VALUE_MASK:\r
+               case PROG_MODE_PAGED_VALUE_MASK:\r
+                       TCNT0 = 0;\r
+\r
+                       do\r
+                       {\r
+                               SPI_SendByte(ReadMemCommand);\r
+                               SPI_SendByte(PollAddress >> 8);\r
+                               SPI_SendByte(PollAddress & 0xFF);                               \r
+                       }\r
+                       while ((SPI_TransferByte(0x00) != PollValue) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));\r
+\r
+                       if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)\r
+                        ProgrammingStatus = STATUS_RDY_BSY_TOUT;\r
+                       \r
+                       break;          \r
+               case PROG_MODE_WORD_READYBUSY_MASK:\r
+               case PROG_MODE_PAGED_READYBUSY_MASK:\r
+                       ProgrammingStatus = V2Protocol_WaitWhileTargetBusy();\r
+                       break;\r
+       }\r
+\r
+       return ProgrammingStatus;\r
 }\r
 \r
 uint8_t V2Protocol_WaitWhileTargetBusy(void)\r
 {\r
-       uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;\r
-       uint8_t ResponseByte;\r
+       TCNT0 = 0;\r
        \r
        do\r
        {\r
-               V2Protocol_DelayMS(1);\r
-       \r
                SPI_SendByte(0xF0);\r
                SPI_SendByte(0x00);\r
 \r
                SPI_SendByte(0x00);\r
-               ResponseByte = SPI_ReceiveByte();\r
        }\r
-       while ((ResponseByte & 0x01) && (TimeoutMS--));\r
+       while ((SPI_ReceiveByte() & 0x01) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));\r
 \r
-       if (!(TimeoutMS))\r
-         return STATUS_CMD_TOUT;\r
+       if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)\r
+         return STATUS_RDY_BSY_TOUT;\r
        else\r
          return STATUS_CMD_OK;\r
 }\r