Switch to hardware delays and timeouts via a hardware timer in the V2 Protocol handler.

[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 b2064fc..f9b4427 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
@@ -78,22 +78,58 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
 \r
 void V2Protocol_DelayMS(uint8_t MS)\r
 {\r
-       while (MS--)\r
-         _delay_ms(1);\r
+       TCNT0  = 0;\r
+       while (TCNT0 < MS);\r
 }\r
 \r
-uint8_t V2Protocol_WaitForProgrammingComplete(uint16_t PollAddress, uint8_t ProgrammingMode)\r
+uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
+                                       uint8_t DelayMS, bool IsFlashMemory, uint8_t ReadMemCommand)\r
 {\r
-       // TODO\r
+       uint8_t ProgrammingStatus = STATUS_CMD_OK;\r
 \r
-       return STATUS_CMD_OK;\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
+                       if (IsFlashMemory && (PollAddress & 0x01))\r
+                       {\r
+                               ReadMemCommand |= READ_WRITE_ODD_BYTE_MASK;\r
+                               PollAddress >>= 1;\r
+                       }\r
+\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
+       }\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
        \r
+       TCNT0  = 0;\r
+       \r
        do\r
        {\r
                SPI_SendByte(0xF0);\r
@@ -101,13 +137,11 @@ uint8_t V2Protocol_WaitWhileTargetBusy(void)
 \r
                SPI_SendByte(0x00);\r
                ResponseByte = SPI_ReceiveByte();\r
-\r
-               V2Protocol_DelayMS(1);\r
        }\r
-       while ((ResponseByte & 0x01) && (TimeoutMS--));\r
+       while ((ResponseByte & 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