Fixed incorrect comparison in the descriptor callback routine of the TeensyHID bootlo...

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

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
index b657758..1c53765 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
@@ -124,18 +124,11 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
                case PROG_MODE_PAGED_VALUE_MASK:\r
                        do\r
                        {\r
                case PROG_MODE_PAGED_VALUE_MASK:\r
                        do\r
                        {\r

-                               /* Manage software timeout */\r
-                               if (TIFR0 & (1 << OCF0A))\r
-                               {\r
-                                       TIFR0 |= (1 << OCF0A);\r
-                                       TimeoutMSRemaining--;\r
-                               }\r
-\r
-                               SPI_Send(ReadMemCommand);\r
-                               SPI_Send(PollAddress >> 8);\r
-                               SPI_Send(PollAddress & 0xFF);\r
+                               SPI_SendByte(ReadMemCommand);\r
+                               SPI_SendByte(PollAddress >> 8);\r
+                               SPI_SendByte(PollAddress & 0xFF);\r

                        }\r
                        }\r

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

 \r
                        if (!(TimeoutMSRemaining))\r
                         ProgrammingStatus = STATUS_CMD_TOUT;\r
 \r
                        if (!(TimeoutMSRemaining))\r
                         ProgrammingStatus = STATUS_CMD_TOUT;\r


@@ -162,18 +155,11 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
 {\r
        do\r
        {\r
 {\r
        do\r
        {\r

-               /* Manage software timeout */\r
-               if (TIFR0 & (1 << OCF0A))\r
-               {\r
-                       TIFR0 |= (1 << OCF0A);\r
-                       TimeoutMSRemaining--;\r
-               }       \r
-\r
-               SPI_Send(0xF0);\r
-               SPI_Send(0x00);\r
-               SPI_Send(0x00);\r
+               SPI_SendByte(0xF0);\r
+               SPI_SendByte(0x00);\r
+               SPI_SendByte(0x00);\r

        }\r
        }\r

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

 \r
        if (TimeoutMSRemaining)\r
        {\r
 \r
        if (TimeoutMSRemaining)\r
        {\r


@@ -192,10 +178,10 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
  */\r
 void ISPTarget_LoadExtendedAddress(void)\r
 {\r
  */\r
 void ISPTarget_LoadExtendedAddress(void)\r
 {\r

-       SPI_Send(LOAD_EXTENDED_ADDRESS_CMD);\r
-       SPI_Send(0x00);\r
-       SPI_Send((CurrentAddress & 0x00FF0000) >> 16);\r
-       SPI_Send(0x00); \r
+       SPI_SendByte(LOAD_EXTENDED_ADDRESS_CMD);\r
+       SPI_SendByte(0x00);\r
+       SPI_SendByte((CurrentAddress & 0x00FF0000) >> 16);\r
+       SPI_SendByte(0x00);     \r

 }\r
 \r
 #endif\r
 }\r
 \r
 #endif\r