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 d259917..e23885b 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
@@ -40,7 +40,7 @@ uint32_t CurrentAddress;
 \r
 uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
 {\r
 \r
 uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
 {\r

-       static const uint8_t SPIMaskFromSCKDuration[] =\r
+       static const uint8_t SPIMaskFromSCKDuration[TOTAL_PROGRAMMING_SPEEDS] =\r

        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r
        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r


@@ -76,12 +76,6 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-void V2Protocol_DelayMS(uint8_t MS)\r
-{\r
-       TCNT0  = 0;\r
-       while (TCNT0 < MS);\r
-}\r
-\r

 uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
                                        uint8_t DelayMS, uint8_t ReadMemCommand)\r
 {\r
 uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,\r
                                        uint8_t DelayMS, uint8_t ReadMemCommand)\r
 {\r


@@ -96,7 +90,7 @@ uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAdd
                        break;\r
                case PROG_MODE_WORD_VALUE_MASK:\r
                case PROG_MODE_PAGED_VALUE_MASK:\r
                        break;\r
                case PROG_MODE_WORD_VALUE_MASK:\r
                case PROG_MODE_PAGED_VALUE_MASK:\r

-                       TCNT0  = 0;\r
+                       TCNT0 = 0;\r

 \r
                        do\r
                        {\r
 \r
                        do\r
                        {\r


@@ -121,7 +115,7 @@ uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAdd
 \r
 uint8_t V2Protocol_WaitWhileTargetBusy(void)\r
 {\r
 \r
 uint8_t V2Protocol_WaitWhileTargetBusy(void)\r
 {\r

-       TCNT0  = 0;\r
+       TCNT0 = 0;\r

        \r
        do\r
        {\r
        \r
        do\r
        {\r