projects / pub / lufa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated Benito project -- added hardware interrupt and software buffering for serial...
[pub/lufa.git] / Projects / Incomplete / AVRISP / Lib / V2Protocol.c
diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
index c31fd0e..8d14802 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -36,77 +36,6 @@
 #define  INCLUDE_FROM_V2PROTOCOL_C\r
 #include "V2Protocol.h"\r
 \r
 #define  INCLUDE_FROM_V2PROTOCOL_C\r
 #include "V2Protocol.h"\r
 \r
-uint32_t CurrentAddress;\r
-\r
-\r
-/* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
-static const uint8_t SPIMaskFromSCKDuration[] =\r
-       {\r
-               #if (F_CPU == 8000000)\r
-               SPI_SPEED_FCPU_DIV_2,\r
-               #endif\r
-               SPI_SPEED_FCPU_DIV_2, SPI_SPEED_FCPU_DIV_4, SPI_SPEED_FCPU_DIV_8,\r
-               SPI_SPEED_FCPU_DIV_16, SPI_SPEED_FCPU_DIV_32, SPI_SPEED_FCPU_DIV_64\r
-               #if (F_CPU == 16000000)                                                                         \r
-               , SPI_SPEED_FCPU_DIV_128\r
-               #endif\r
-       };\r
-\r
-static uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
-{\r
-       uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
-\r
-       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
-         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
-         \r
-       return SPIMaskFromSCKDuration[SCKDuration];\r
-}\r
-\r
-static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
-{\r
-       if (ResetTarget)\r
-       {\r
-               RESET_LINE_DDR  |= RESET_LINE_MASK;\r
-               \r
-               if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY)))\r
-                 RESET_LINE_PORT |= RESET_LINE_MASK;\r
-       }\r
-       else\r
-       {\r
-               RESET_LINE_PORT &= ~RESET_LINE_MASK;    \r
-               RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
-       }\r
-}\r
-\r
-static void V2Protocol_DelayMS(uint8_t MS)\r
-{\r
-       while (MS--)\r
-         _delay_ms(1);\r
-}\r
-\r
-static uint8_t V2Protocol_WaitWhileTargetBusy(void)\r
-{\r
-       uint8_t TimeoutMS = TARGET_BUST_TIMEOUT_MS;\r
-       uint8_t ResponseByte;\r
-       \r
-       do\r
-       {\r
-               V2Protocol_DelayMS(1);\r
-       \r
-               SPI_SendByte(0xF0);\r
-               SPI_SendByte(0x00);\r
-\r
-               SPI_SendByte(0x00);\r
-               ResponseByte = SPI_ReceiveByte();\r
-       }\r
-       while ((ResponseByte & 0x01) && (TimeoutMS--));\r
-\r
-       if (!(TimeoutMS))\r
-         return STATUS_CMD_TOUT;\r
-       else\r
-         return STATUS_CMD_OK;\r
-}\r
-
 void V2Protocol_ProcessCommand(void)
 {
        uint8_t V2Command = Endpoint_Read_Byte();\r
 void V2Protocol_ProcessCommand(void)
 {
        uint8_t V2Command = Endpoint_Read_Byte();\r
@@ -123,12 +52,23 @@ void V2Protocol_ProcessCommand(void)
                case CMD_LOAD_ADDRESS:\r
                        V2Protocol_Command_LoadAddress();\r
                        break;\r
                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
                case CMD_LEAVE_PROGMODE_ISP:\r
                        V2Protocol_Command_LeaveISPMode();\r
                        break;\r
                case CMD_ENTER_PROGMODE_ISP:\r
                        V2Protocol_Command_EnterISPMode();\r
                        break;\r
                case CMD_LEAVE_PROGMODE_ISP:\r
                        V2Protocol_Command_LeaveISPMode();\r
                        break;\r
+               case CMD_PROGRAM_FLASH_ISP:\r
+               case CMD_PROGRAM_EEPROM_ISP:\r
+                       V2Protocol_Command_ProgramMemory(V2Command);                    \r
+                       break;\r
+               case CMD_READ_FLASH_ISP:\r
+               case CMD_READ_EEPROM_ISP:\r
+                       V2Protocol_Command_ReadMemory(V2Command);\r
+                       break;\r
                case CMD_CHIP_ERASE_ISP:\r
                        V2Protocol_Command_ChipErase();\r
                        break;\r
                case CMD_CHIP_ERASE_ISP:\r
                        V2Protocol_Command_ChipErase();\r
                        break;\r
@@ -150,10 +90,8 @@ void V2Protocol_ProcessCommand(void)
                        break;\r
        }\r
        \r
                        break;\r
        }\r
        \r
-       printf("COMMAND 0x%02x\r\n", V2Command);\r
-\r
-       Endpoint_WaitUntilReady();      \r
-       Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);        
+       Endpoint_WaitUntilReady();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
 }
 \r
 static void V2Protocol_Command_Unknown(uint8_t V2Command)\r
 }
 \r
 static void V2Protocol_Command_Unknown(uint8_t V2Command)\r
@@ -167,7 +105,6 @@ static void V2Protocol_Command_Unknown(uint8_t V2Command)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
 \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
@@ -178,7 +115,6 @@ static void V2Protocol_Command_SignOn(void)
 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
 \r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
@@ -189,31 +125,28 @@ static void V2Protocol_Command_SignOn(void)
 \r
 static void V2Protocol_Command_GetSetParam(uint8_t V2Command)\r
 {\r
 \r
 static void V2Protocol_Command_GetSetParam(uint8_t V2Command)\r
 {\r
-       struct\r
-       {\r
-               uint8_t ParamID;\r
-               uint8_t ParamValue;\r
-       } Get_Set_Param_Params;\r
+       uint8_t ParamID = Endpoint_Read_Byte();\r
+       uint8_t ParamValue;\r
        \r
        \r
-       Endpoint_Read_Stream_LE(&Get_Set_Param_Params, sizeof(Get_Set_Param_Params));\r
+       if (V2Command == CMD_SET_PARAMETER)\r
+         ParamValue = Endpoint_Read_Byte();\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
-       \r
-       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(Get_Set_Param_Params.ParamID);\r
        \r
        Endpoint_Write_Byte(V2Command);\r
        \r
        \r
        Endpoint_Write_Byte(V2Command);\r
        \r
+       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);\r
+       \r
        if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r
        if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r
-               V2Params_SetParameterValue(Get_Set_Param_Params.ParamID, Get_Set_Param_Params.ParamValue);\r
+               V2Params_SetParameterValue(ParamID, ParamValue);\r
        }\r
        else if ((V2Command == CMD_GET_PARAMETER) && (ParamPrivs & PARAM_PRIV_READ))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r
        }\r
        else if ((V2Command == CMD_GET_PARAMETER) && (ParamPrivs & PARAM_PRIV_READ))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r
-               Endpoint_Write_Byte(V2Params_GetParameterValue(Get_Set_Param_Params.ParamID));\r
+               Endpoint_Write_Byte(V2Params_GetParameterValue(ParamID));\r
        }\r
        else\r
        {       \r
        }\r
        else\r
        {       \r
@@ -225,19 +158,29 @@ static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
 \r
 static void V2Protocol_Command_LoadAddress(void)\r
 {\r
 \r
 static void V2Protocol_Command_LoadAddress(void)\r
 {\r
-       Endpoint_Read_Stream_LE(&CurrentAddress, sizeof(CurrentAddress));\r
+       Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress));\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
        \r
        \r
-       // TODO: Check for extended address\r
+       if (CurrentAddress & (1UL << 31))\r
+         V2Protocol_LoadExtendedAddress();\r
 \r
        Endpoint_Write_Byte(CMD_LOAD_ADDRESS);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        Endpoint_ClearIN();\r
 }\r
 \r
 \r
        Endpoint_Write_Byte(CMD_LOAD_ADDRESS);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        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
 static void V2Protocol_Command_EnterISPMode(void)\r
 {\r
        struct\r
@@ -256,41 +199,37 @@ static void V2Protocol_Command_EnterISPMode(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
 \r
-       uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
        uint8_t ResponseStatus = STATUS_CMD_FAILED;\r
        uint8_t ResponseStatus = STATUS_CMD_FAILED;\r
-\r
-       Enter_ISP_Params.TimeoutMS -= Enter_ISP_Params.ExecutionDelayMS +\r
-                                     Enter_ISP_Params.PinStabDelayMS;\r
        \r
        CurrentAddress = 0;\r
 \r
        \r
        CurrentAddress = 0;\r
 \r
-       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
-         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
-\r
        V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);    \r
        V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);    \r
-       SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);\r
-       V2Protocol_ChangeTargetResetLine(true);\r
-       V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);\r
+       SPI_Init(V2Protocol_GetSPIPrescalerMask() | SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING | SPI_MODE_MASTER);\r
                \r
        while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
        {\r
                uint8_t ResponseBytes[4];\r
                \r
        while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
        {\r
                uint8_t ResponseBytes[4];\r
-               \r
+\r
+               V2Protocol_ChangeTargetResetLine(true);\r
+               V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);\r
+\r
                for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
                {\r
                for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
                {\r
-                       ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);\r
                        V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);\r
                        V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);\r
-                       \r
-                       if (Enter_ISP_Params.TimeoutMS >= Enter_ISP_Params.ByteDelay)\r
-                         Enter_ISP_Params.TimeoutMS -= Enter_ISP_Params.ByteDelay;\r
-                       else\r
-                         ResponseStatus = STATUS_CMD_TOUT;\r
+                       ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);\r
                }\r
                \r
                }\r
                \r
-               if (ResponseBytes[Enter_ISP_Params.PollIndex] == Enter_ISP_Params.PollValue)\r
-                 ResponseStatus = STATUS_CMD_OK;\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
+               {\r
+                       ResponseStatus = STATUS_CMD_OK;\r
+               }\r
+               else\r
+               {\r
+                       V2Protocol_ChangeTargetResetLine(false);\r
+                       V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);\r
+               }\r
        }\r
 \r
        Endpoint_Write_Byte(CMD_ENTER_PROGMODE_ISP);\r
        }\r
 \r
        Endpoint_Write_Byte(CMD_ENTER_PROGMODE_ISP);\r
@@ -310,7 +249,6 @@ static void V2Protocol_Command_LeaveISPMode(void)
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        V2Protocol_DelayMS(Leave_ISP_Params.PreDelayMS);\r
        V2Protocol_ChangeTargetResetLine(false);\r
 \r
        V2Protocol_DelayMS(Leave_ISP_Params.PreDelayMS);\r
        V2Protocol_ChangeTargetResetLine(false);\r
@@ -322,6 +260,185 @@ static void V2Protocol_Command_LeaveISPMode(void)
        Endpoint_ClearIN();\r
 }\r
 \r
        Endpoint_ClearIN();\r
 }\r
 \r
+static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint16_t BytesToWrite;\r
+               uint8_t  ProgrammingMode;\r
+               uint8_t  DelayMS;\r
+               uint8_t  ProgrammingCommands[3];\r
+               uint8_t  PollValue1;\r
+               uint8_t  PollValue2;\r
+       } Write_Memory_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Write_Memory_Params, sizeof(Write_Memory_Params));\r
+       Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite);\r
+       \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
+               uint16_t StartAddress = (CurrentAddress & 0xFFFF);\r
+       \r
+               /* Paged mode memory programming */\r
+               for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)\r
+               {\r
+                       bool    IsOddByte   = (CurrentByte & 0x01);\r
+                       uint8_t ByteToWrite = Endpoint_Read_Byte();\r
+               \r
+                       if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))\r
+                         Write_Memory_Params.ProgrammingCommands[0] ^= READ_WRITE_HIGH_BYTE_MASK;\r
+                         \r
+                       SPI_SendByte(Write_Memory_Params.ProgrammingCommands[0]);\r
+                       SPI_SendByte(CurrentAddress >> 8);\r
+                       SPI_SendByte(CurrentAddress & 0xFF);\r
+                       SPI_SendByte(ByteToWrite);\r
+                       \r
+                       if (!(PollAddress) && (ByteToWrite != PollValue))\r
+                       {\r
+                               if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))\r
+                                 Write_Memory_Params.ProgrammingCommands[2] |= READ_WRITE_HIGH_BYTE_MASK;\r
+                                 \r
+                               PollAddress = (CurrentAddress & 0xFFFF);                                \r
+                       }\r
+                               \r
+                       /* Check if the endpoint bank is currently empty */\r
+                       if (!(Endpoint_IsReadWriteAllowed()))\r
+                       {\r
+                               Endpoint_ClearOUT();\r
+                               Endpoint_WaitUntilReady();\r
+                       }                       \r
+\r
+                       if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP))\r
+                         CurrentAddress++;\r
+               }\r
+               \r
+               /* If the current page must be committed, send the PROGRAM PAGE command to the target */\r
+               if (Write_Memory_Params.ProgrammingMode & PROG_MODE_COMMIT_PAGE_MASK)\r
+               {\r
+                       SPI_SendByte(Write_Memory_Params.ProgrammingCommands[1]);\r
+                       SPI_SendByte(StartAddress >> 8);\r
+                       SPI_SendByte(StartAddress & 0xFF);\r
+                       SPI_SendByte(0x00);\r
+                       \r
+                       /* Check if polling is possible, if not switch to timed delay mode */\r
+                       if (!(PollAddress))\r
+                       {\r
+                               Write_Memory_Params.ProgrammingMode &= ~PROG_MODE_PAGED_VALUE_MASK;\r
+                               Write_Memory_Params.ProgrammingMode &= ~PROG_MODE_PAGED_TIMEDELAY_MASK;                         \r
+                       }\r
+\r
+                       ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,\r
+                                                                                                                          Write_Memory_Params.DelayMS, Write_Memory_Params.ProgrammingCommands[2]);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               /* Word/byte mode memory programming */\r
+               for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)\r
+               {\r
+                       bool    IsOddByte   = (CurrentByte & 0x01);\r
+                       uint8_t ByteToWrite = Endpoint_Read_Byte();\r
+               \r
+                       if (IsOddByte && (V2Command == CMD_READ_FLASH_ISP))\r
+                         Write_Memory_Params.ProgrammingCommands[0] ^= READ_WRITE_HIGH_BYTE_MASK;\r
+                         \r
+                       SPI_SendByte(Write_Memory_Params.ProgrammingCommands[0]);\r
+                       SPI_SendByte(CurrentAddress >> 8);\r
+                       SPI_SendByte(CurrentAddress & 0xFF);\r
+                       SPI_SendByte(ByteToWrite);\r
+                       \r
+                       if (ByteToWrite != PollValue)\r
+                       {\r
+                               if (IsOddByte && (V2Command == CMD_PROGRAM_FLASH_ISP))\r
+                                 Write_Memory_Params.ProgrammingCommands[2] |= READ_WRITE_HIGH_BYTE_MASK;\r
+                                 \r
+                               PollAddress = (CurrentAddress & 0xFFFF);\r
+                       }\r
+                       \r
+                       /* Check if the endpoint bank is currently empty */\r
+                       if (!(Endpoint_IsReadWriteAllowed()))\r
+                       {\r
+                               Endpoint_ClearOUT();\r
+                               Endpoint_WaitUntilReady();\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, Write_Memory_Params.ProgrammingCommands[2]);\r
+                         \r
+                       if (ProgrammingStatus != STATUS_CMD_OK)\r
+                         break;\r
+               }\r
+       }\r
+       \r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+\r
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(ProgrammingStatus);\r
+       \r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_ReadMemory(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint16_t BytesToRead;\r
+               uint8_t  ReadMemoryCommand;\r
+       } Read_Memory_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params));\r
+       Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);\r
+       \r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       \r
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       \r
+       for (uint16_t CurrentByte = 0; CurrentByte < Read_Memory_Params.BytesToRead; CurrentByte++)\r
+       {\r
+               if ((V2Command == CMD_READ_FLASH_ISP) && (CurrentByte & 0x01))\r
+                 Read_Memory_Params.ReadMemoryCommand ^= READ_WRITE_HIGH_BYTE_MASK;\r
+\r
+               SPI_SendByte(Read_Memory_Params.ReadMemoryCommand);\r
+               SPI_SendByte(CurrentAddress >> 8);\r
+               SPI_SendByte(CurrentAddress & 0xFF);\r
+               Endpoint_Write_Byte(SPI_ReceiveByte());\r
+               \r
+               /* Check if the endpoint bank is currently full */\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r
+               {\r
+                       Endpoint_ClearIN();\r
+                       Endpoint_WaitUntilReady();\r
+               }\r
+               \r
+               if (((V2Command == CMD_READ_FLASH_ISP) && (CurrentByte & 0x01)) || (V2Command == CMD_READ_EEPROM_ISP))\r
+                 CurrentAddress++;\r
+       }\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
 {\r
        struct\r
 static void V2Protocol_Command_ChipErase(void)\r
 {\r
        struct\r
@@ -335,14 +452,13 @@ static void V2Protocol_Command_ChipErase(void)
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
        \r
        uint8_t ResponseStatus = STATUS_CMD_OK;\r
        \r
        for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++)\r
          SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]);\r
 \r
        \r
        uint8_t ResponseStatus = STATUS_CMD_OK;\r
        \r
        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
          V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);\r
        else\r
          ResponseStatus = V2Protocol_WaitWhileTargetBusy();\r
@@ -364,7 +480,6 @@ static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        uint8_t ResponseBytes[4];\r
                \r
 \r
        uint8_t ResponseBytes[4];\r
                \r
@@ -373,7 +488,7 @@ static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)
                \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
                \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
-       Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte]);\r
+       Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte - 1]);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        Endpoint_ClearIN();\r
 }\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        Endpoint_ClearIN();\r
 }\r
@@ -389,7 +504,6 @@ static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        for (uint8_t SByte = 0; SByte < sizeof(Write_FuseLockSig_Params.WriteCommandBytes); SByte++)\r
          SPI_SendByte(Write_FuseLockSig_Params.WriteCommandBytes[SByte]);\r
 \r
        for (uint8_t SByte = 0; SByte < sizeof(Write_FuseLockSig_Params.WriteCommandBytes); SByte++)\r
          SPI_SendByte(Write_FuseLockSig_Params.WriteCommandBytes[SByte]);\r
@@ -416,7 +530,6 @@ static void V2Protocol_Command_SPIMulti(void)
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
        \r
        Endpoint_Write_Byte(CMD_SPI_MULTI);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        \r
        Endpoint_Write_Byte(CMD_SPI_MULTI);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
Lightweight USB Framework for AVRs