Added V2 protocol handlers for the READ and WRITE memory commands in the AVRISP proje...

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
index 2feefc8..85e3a38 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -58,6 +58,14 @@ void V2Protocol_ProcessCommand(void)
                case CMD_LEAVE_PROGMODE_ISP:\r
                        V2Protocol_Command_LeaveISPMode();\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


@@ -185,13 +193,14 @@ static void V2Protocol_Command_EnterISPMode(void)
 \r
        V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);    \r
        SPI_Init(V2Protocol_GetSPIPrescalerMask() | SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING | SPI_MODE_MASTER);\r
 \r
        V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);    \r
        SPI_Init(V2Protocol_GetSPIPrescalerMask() | SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING | SPI_MODE_MASTER);\r

-       V2Protocol_ChangeTargetResetLine(true);\r
-       V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);\r

                \r
        while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
        {\r
                uint8_t ResponseBytes[4];\r
 \r
                \r
        while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
        {\r
                uint8_t ResponseBytes[4];\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
                        V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);\r
                for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
                {\r
                        V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);\r


@@ -200,7 +209,14 @@ static void V2Protocol_Command_EnterISPMode(void)
                \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
                /* 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

-                 ResponseStatus = STATUS_CMD_OK;\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


@@ -231,6 +247,87 @@ 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
+       uint8_t ProgrammingStatus = STATUS_CMD_OK;\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
+       for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)\r
+       {\r
+               // TODO - Read in programming data, write to device\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_ODD_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
+               CurrentAddress++;\r
+       }\r
+\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       \r
+       bool EndpointBankFull = Endpoint_IsReadWriteAllowed();\r
+       Endpoint_ClearIN();\r
+       \r
+       /* Ensure data transfer is terminated by a short packet if the last sent bank was completely full */\r
+       if (EndpointBankFull)\r
+       {\r
+               Endpoint_WaitUntilReady();\r
+               Endpoint_ClearIN();\r
+       }\r
+}\r
+\r

 static void V2Protocol_Command_ChipErase(void)\r
 {\r
        struct\r
 static void V2Protocol_Command_ChipErase(void)\r
 {\r
        struct\r

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
index 4b60b56..30d4043 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
@@ -46,6 +46,9 @@
 
        /* Macros: */
                #define PROGRAMMER_ID             "AVRISP_MK2"\r
 
        /* Macros: */
                #define PROGRAMMER_ID             "AVRISP_MK2"\r

+               \r
+               #define READ_WRITE_ODD_BYTE_MASK  (1 << 3)\r
+               #define TARGET_MODE_PAGE_MASK     (1 << 0)\r

 
        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
 
        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r


@@ -57,6 +60,8 @@
                        static void V2Protocol_Command_LoadAddress(void);\r
                        static void V2Protocol_Command_EnterISPMode(void);\r
                        static void V2Protocol_Command_LeaveISPMode(void);\r
                        static void V2Protocol_Command_LoadAddress(void);\r
                        static void V2Protocol_Command_EnterISPMode(void);\r
                        static void V2Protocol_Command_LeaveISPMode(void);\r

+                       static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);\r
+                       static void V2Protocol_Command_ReadMemory(uint8_t V2Command);\r

                        static void V2Protocol_Command_ChipErase(void);\r
                        static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
                        static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r
                        static void V2Protocol_Command_ChipErase(void);\r
                        static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
                        static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r

diff --git a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
index 7bcf0be..15ac3e5 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolTarget.c
@@ -36,24 +36,22 @@
 #include "V2ProtocolTarget.h"\r
 \r
 /** Current memory address for FLASH/EEPROM memory read/write commands */\r
 #include "V2ProtocolTarget.h"\r
 \r
 /** Current memory address for FLASH/EEPROM memory read/write commands */\r

-uint32_t CurrentAddress;\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
+uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
+{\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
        {\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
+               #if (F_CPU == 16000000)\r

                , SPI_SPEED_FCPU_DIV_128\r
                #endif\r
        };\r
                , SPI_SPEED_FCPU_DIV_128\r
                #endif\r
        };\r

-       \r

 \r
 \r

-uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
-{\r

        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r
        if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r
        if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r