Added const where possible to the source functions in the Projects directory.

[pub/USBasp.git] / Projects / AVRISP / Lib / ISP / ISPTarget.c

diff --git a/Projects/AVRISP/Lib/ISP/ISPTarget.c b/Projects/AVRISP/Lib/ISP/ISPTarget.c
index e99e3e5..29cb18e 100644 (file)
--- a/Projects/AVRISP/Lib/ISP/ISPTarget.c
+++ b/Projects/AVRISP/Lib/ISP/ISPTarget.c
@@ -122,26 +122,15 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
                        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
-                       TIFR0 = (1 << OCF1A);\r
-                       \r
-                       uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;\r
-\r

                        do\r
                        {\r
                                SPI_SendByte(ReadMemCommand);\r
                                SPI_SendByte(PollAddress >> 8);\r
                                SPI_SendByte(PollAddress & 0xFF);\r
                        do\r
                        {\r
                                SPI_SendByte(ReadMemCommand);\r
                                SPI_SendByte(PollAddress >> 8);\r
                                SPI_SendByte(PollAddress & 0xFF);\r

-\r
-                               if (TIFR0 & (1 << OCF1A))\r
-                               {\r
-                                       TIFR0 = (1 << OCF1A);\r
-                                       TimeoutMS--;\r
-                               }\r

                        }\r
                        }\r

-                       while ((SPI_TransferByte(0x00) != PollValue) && TimeoutMS);\r
+                       while ((SPI_TransferByte(0x00) != PollValue) && TimeoutMSRemaining);\r

 \r
 \r

-                       if (!(TimeoutMS))\r
+                       if (!(TimeoutMSRemaining))\r

                         ProgrammingStatus = STATUS_CMD_TOUT;\r
                        \r
                        break;          \r
                         ProgrammingStatus = STATUS_CMD_TOUT;\r
                        \r
                        break;          \r


@@ -161,27 +150,16 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
  */\r
 uint8_t ISPTarget_WaitWhileTargetBusy(void)\r
 {\r
  */\r
 uint8_t ISPTarget_WaitWhileTargetBusy(void)\r
 {\r

-       TCNT0 = 0;\r
-       TIFR0 = (1 << OCF1A);\r
-                       \r
-       uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;\r
-       \r

        do\r
        {\r
                SPI_SendByte(0xF0);\r
                SPI_SendByte(0x00);\r
 \r
                SPI_SendByte(0x00);\r
        do\r
        {\r
                SPI_SendByte(0xF0);\r
                SPI_SendByte(0x00);\r
 \r
                SPI_SendByte(0x00);\r

-\r
-               if (TIFR0 & (1 << OCF1A))\r
-               {\r
-                       TIFR0 = (1 << OCF1A);\r
-                       TimeoutMS--;\r
-               }\r

        }\r
        }\r

-       while ((SPI_ReceiveByte() & 0x01) && TimeoutMS);\r
+       while ((SPI_ReceiveByte() & 0x01) && TimeoutMSRemaining);\r

 \r
 \r

-       if (!(TimeoutMS))\r
+       if (!(TimeoutMSRemaining))\r

          return STATUS_RDY_BSY_TOUT;\r
        else\r
          return STATUS_CMD_OK;\r
          return STATUS_RDY_BSY_TOUT;\r
        else\r
          return STATUS_CMD_OK;\r