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

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

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
index 16a1a07..2c29669 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -52,6 +52,9 @@ void V2Protocol_ProcessCommand(void)
                case CMD_LOAD_ADDRESS:\r
                        V2Protocol_Command_LoadAddress();\r
                        break;\r
+               case CMD_RESET_PROTECTION:\r
+                       V2Protocol_Command_ResetProtection();\r
+                       break;\r
                case CMD_ENTER_PROGMODE_ISP:\r
                        V2Protocol_Command_EnterISPMode();\r
                        break;\r
@@ -168,6 +171,16 @@ static void V2Protocol_Command_LoadAddress(void)
        Endpoint_ClearIN();\r
 }\r
 \r
+static void V2Protocol_Command_ResetProtection(void)\r
+{\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       \r
+       Endpoint_Write_Byte(CMD_RESET_PROTECTION);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();     \r
+}\r
+\r
 static void V2Protocol_Command_EnterISPMode(void)\r
 {\r
        struct\r
@@ -208,7 +221,7 @@ static void V2Protocol_Command_EnterISPMode(void)
                }\r
                \r
                /* Check if polling disabled, or if the polled value matches the expected value */\r
-               if (!Enter_ISP_Params.PollIndex || (ResponseBytes[Enter_ISP_Params.PollIndex - 1] == Enter_ISP_Params.PollValue))\r
+               if (!(Enter_ISP_Params.PollIndex) || (ResponseBytes[Enter_ISP_Params.PollIndex - 1] == Enter_ISP_Params.PollValue))\r
                {\r
                        ResponseStatus = STATUS_CMD_OK;\r
                }\r
@@ -264,6 +277,8 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
        \r
        uint8_t  ProgrammingStatus = STATUS_CMD_OK;     \r
        uint16_t PollAddress       = 0;\r
+       uint8_t  PollValue         = (V2Command == CMD_PROGRAM_FLASH_ISP) ? Write_Memory_Params.PollValue1 :\r
+                                                                           Write_Memory_Params.PollValue2;\r
        \r
        if (Write_Memory_Params.ProgrammingMode & PROG_MODE_PAGED_WRITES_MASK)\r
        {\r
@@ -281,11 +296,11 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
                        SPI_SendByte(CurrentAddress & 0xFF);\r
                        SPI_SendByte(ByteToWrite);\r
                        \r
-                       if (!(PollAddress))\r
+                       if (!(PollAddress) && (ByteToWrite != PollValue))\r
                        {\r
-                               if ((ByteToWrite != Write_Memory_Params.PollValue1) && (V2Command == CMD_PROGRAM_FLASH_ISP))\r
+                               if (V2Command == CMD_PROGRAM_FLASH_ISP)\r
                                  PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte);\r
-                               else if ((ByteToWrite != Write_Memory_Params.PollValue2) && (V2Command == CMD_PROGRAM_EEPROM_ISP))\r
+                               else\r
                                  PollAddress = (CurrentAddress & 0xFFFF);                              \r
                        }\r
 \r
@@ -309,7 +324,9 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
                        }\r
                }\r
                \r
-               ProgrammingStatus = V2Protocol_WaitForProgrammingComplete(PollAddress, Write_Memory_Params.ProgrammingMode);\r
+               ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,\r
+                                                                      Write_Memory_Params.DelayMS, (V2Command == CMD_READ_FLASH_ISP),\r
+                                                                      Write_Memory_Params.ProgrammingCommands[2]);\r
        }\r
        else\r
        {\r
@@ -327,15 +344,20 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
                        SPI_SendByte(CurrentAddress & 0xFF);\r
                        SPI_SendByte(ByteToWrite);\r
                        \r
-                       if ((ByteToWrite != Write_Memory_Params.PollValue1) && (V2Command == CMD_PROGRAM_FLASH_ISP))\r
-                         PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte);\r
-                       else if ((ByteToWrite != Write_Memory_Params.PollValue2) && (V2Command == CMD_PROGRAM_EEPROM_ISP))\r
-                         PollAddress = (CurrentAddress & 0xFFFF);\r
-\r
-                       ProgrammingStatus = V2Protocol_WaitForProgrammingComplete(PollAddress, Write_Memory_Params.ProgrammingMode);\r
-\r
+                       if (ByteToWrite != PollValue)\r
+                       {\r
+                               if (V2Command == CMD_PROGRAM_FLASH_ISP)\r
+                                 PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte);\r
+                               else\r
+                                 PollAddress = (CurrentAddress & 0xFFFF);\r
+                       }\r
+                       \r
                        if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP))\r
                          CurrentAddress++;\r
+                       \r
+                       ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,\r
+                                                                          Write_Memory_Params.DelayMS, (V2Command == CMD_READ_FLASH_ISP),\r
+                                                                          Write_Memory_Params.ProgrammingCommands[2]);\r
                          \r
                        if (ProgrammingStatus != STATUS_CMD_OK)\r
                          break;\r
@@ -390,7 +412,17 @@ static void V2Protocol_Command_ReadMemory(uint8_t V2Command)
        }\r
 \r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
+\r
+       bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());\r
        Endpoint_ClearIN();\r
+       \r
+       /* Ensure last packet is a short packet to terminate the transfer */\r
+       if (IsEndpointFull)\r
+       {\r
+               Endpoint_WaitUntilReady();      \r
+               Endpoint_ClearIN();\r
+               Endpoint_WaitUntilReady();      \r
+       }\r
 }\r
 \r
 static void V2Protocol_Command_ChipErase(void)\r
@@ -412,7 +444,7 @@ static void V2Protocol_Command_ChipErase(void)
        for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++)\r
          SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]);\r
 \r
-       if (Erase_Chip_Params.PollMethod == 0)\r
+       if (!(Erase_Chip_Params.PollMethod))\r
          V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);\r
        else\r
          ResponseStatus = V2Protocol_WaitWhileTargetBusy();\r