Added V2Protocol handlers to the AVRISP project to enter/exit programming mode, and...

[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 e55a700..c31fd0e 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -40,7 +40,7 @@ uint32_t CurrentAddress;
 \r
 \r
 /* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
 \r
 \r
 /* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r

-static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =\r
+static const uint8_t SPIMaskFromSCKDuration[] =\r

        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r
        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r


@@ -52,14 +52,14 @@ static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =
                #endif\r
        };\r
 \r
                #endif\r
        };\r
 \r

-static void V2Protocol_ReconfigureSPI(void)\r
+static uint8_t V2Protocol_GetSPIPrescalerMask(void)\r

 {\r
        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r
 {\r
        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r

-       if (SCKDuration >= MAX_SPI_SETTINGS)\r
-         SCKDuration = (MAX_SPI_SETTINGS - 1);\r
+       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
+         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r

          \r
          \r

-       SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);    \r
+       return SPIMaskFromSCKDuration[SCKDuration];\r

 }\r
 \r
 static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
 }\r
 \r
 static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r


@@ -77,6 +77,35 @@ static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
                RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
        }\r
 }\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)
 {
 
 void V2Protocol_ProcessCommand(void)
 {


@@ -94,9 +123,28 @@ 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_ENTER_PROGMODE_ISP:\r
+                       V2Protocol_Command_EnterISPMode();\r
+                       break;\r
+               case CMD_LEAVE_PROGMODE_ISP:\r
+                       V2Protocol_Command_LeaveISPMode();\r
+                       break;\r
+               case CMD_CHIP_ERASE_ISP:\r
+                       V2Protocol_Command_ChipErase();\r
+                       break;\r
+               case CMD_READ_FUSE_ISP:\r
+               case CMD_READ_LOCK_ISP:\r
+               case CMD_READ_SIGNATURE_ISP:\r
+               case CMD_READ_OSCCAL_ISP:\r
+                       V2Protocol_Command_ReadFuseLockSigOSCCAL(V2Command);\r
+                       break;\r
+               case CMD_PROGRAM_FUSE_ISP:\r
+               case CMD_PROGRAM_LOCK_ISP:\r
+                       V2Protocol_Command_WriteFuseLock(V2Command);\r
+                       break;\r

                case CMD_SPI_MULTI:\r
                        V2Protocol_Command_SPIMulti();\r
                case CMD_SPI_MULTI:\r
                        V2Protocol_Command_SPIMulti();\r

-                       break;          \r
+                       break;\r

                default:\r
                        V2Protocol_Command_Unknown(V2Command);\r
                        break;\r
                default:\r
                        V2Protocol_Command_Unknown(V2Command);\r
                        break;\r


@@ -132,38 +180,40 @@ static void V2Protocol_Command_SignOn(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
 \r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
 \r

-       V2Protocol_ReconfigureSPI();\r
-       CurrentAddress = 0;\r
-\r

        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r

-       Endpoint_Write_Byte(PROGRAMMER_ID_LEN);\r
-       Endpoint_Write_Stream_LE(PROGRAMMER_ID, PROGRAMMER_ID_LEN);\r
+       Endpoint_Write_Byte(sizeof(PROGRAMMER_ID) - 1);\r
+       Endpoint_Write_Stream_LE(PROGRAMMER_ID, (sizeof(PROGRAMMER_ID) - 1));\r

        Endpoint_ClearIN();\r
 }\r
 \r
 static void V2Protocol_Command_GetSetParam(uint8_t V2Command)\r
 {\r
        Endpoint_ClearIN();\r
 }\r
 \r
 static void V2Protocol_Command_GetSetParam(uint8_t V2Command)\r
 {\r

-       uint8_t ParamID    = Endpoint_Read_Byte();\r
-       uint8_t ParamValue = Endpoint_Read_Byte();\r
+       struct\r
+       {\r
+               uint8_t ParamID;\r
+               uint8_t ParamValue;\r
+       } Get_Set_Param_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Get_Set_Param_Params, sizeof(Get_Set_Param_Params));\r

 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r

-       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);\r
+       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(Get_Set_Param_Params.ParamID);\r

        \r
        Endpoint_Write_Byte(V2Command);\r
        \r
        if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r
        \r
        Endpoint_Write_Byte(V2Command);\r
        \r
        if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
        {\r
                Endpoint_Write_Byte(STATUS_CMD_OK);\r

-               V2Params_SetParameterValue(ParamID, ParamValue);\r
+               V2Params_SetParameterValue(Get_Set_Param_Params.ParamID, Get_Set_Param_Params.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(ParamID));\r
+               Endpoint_Write_Byte(V2Params_GetParameterValue(Get_Set_Param_Params.ParamID));\r

        }\r
        else\r
        {       \r
        }\r
        else\r
        {       \r


@@ -175,25 +225,194 @@ 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

-       CurrentAddress = Endpoint_Read_DWord_LE();\r
+       Endpoint_Read_Stream_LE(&CurrentAddress, sizeof(CurrentAddress));\r

 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r

+       \r
+       // TODO: Check for extended address\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_EnterISPMode(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t TimeoutMS;\r
+               uint8_t PinStabDelayMS;\r
+               uint8_t ExecutionDelayMS;\r
+               uint8_t SynchLoops;\r
+               uint8_t ByteDelay;\r
+               uint8_t PollValue;\r
+               uint8_t PollIndex;\r
+               uint8_t EnterProgBytes[4];\r
+       } Enter_ISP_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params));\r
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\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
+       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
+         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
+\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
+               \r
+       while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
+       {\r
+               uint8_t ResponseBytes[4];\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
+                       \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
+               }\r
+               \r
+               if (ResponseBytes[Enter_ISP_Params.PollIndex] == Enter_ISP_Params.PollValue)\r
+                 ResponseStatus = STATUS_CMD_OK;\r
+       }\r
+\r
+       Endpoint_Write_Byte(CMD_ENTER_PROGMODE_ISP);\r
+       Endpoint_Write_Byte(ResponseStatus);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_LeaveISPMode(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t PreDelayMS;\r
+               uint8_t PostDelayMS;\r
+       } Leave_ISP_Params;\r
+\r
+       Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params));\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
+       SPI_ShutDown();\r
+       V2Protocol_DelayMS(Leave_ISP_Params.PostDelayMS);\r
+\r
+       Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_ChipErase(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t EraseDelayMS;\r
+               uint8_t PollMethod;\r
+               uint8_t EraseCommandBytes[4];\r
+       } Erase_Chip_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params));\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
+       if (Erase_Chip_Params.PollMethod == 0)\r
+         V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);\r
+       else\r
+         ResponseStatus = V2Protocol_WaitWhileTargetBusy();\r
+         \r
+       Endpoint_Write_Byte(CMD_CHIP_ERASE_ISP);\r
+       Endpoint_Write_Byte(ResponseStatus);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint8_t RetByte;\r
+               uint8_t ReadCommandBytes[4];\r
+       } Read_FuseLockSigOSCCAL_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params));\r
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       uint8_t ResponseBytes[4];\r
+               \r
+       for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
+         ResponseBytes[RByte] = SPI_TransferByte(Read_FuseLockSigOSCCAL_Params.ReadCommandBytes[RByte]);\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(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint8_t WriteCommandBytes[4];\r
+       } Write_FuseLockSig_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params));\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
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r

 static void V2Protocol_Command_SPIMulti(void)\r
 {\r
 static void V2Protocol_Command_SPIMulti(void)\r
 {\r

-       uint8_t TxBytes     = Endpoint_Read_Byte();\r
-       uint8_t RxBytes     = Endpoint_Read_Byte();\r
-       uint8_t RxStartAddr = Endpoint_Read_Byte();\r
-       uint8_t TxData[255];\r
+       struct\r
+       {\r
+               uint8_t TxBytes;\r
+               uint8_t RxBytes;\r
+               uint8_t RxStartAddr;\r
+               uint8_t TxData[255];\r
+       } SPI_Multi_Params;\r

        \r
        \r

-       Endpoint_Read_Stream_LE(TxData, TxBytes);\r
+       Endpoint_Read_Stream_LE(&SPI_Multi_Params, sizeof(SPI_Multi_Params) -\r
+                                                  sizeof(SPI_Multi_Params.TxData));\r
+       Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes);\r

        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r


@@ -206,10 +425,10 @@ static void V2Protocol_Command_SPIMulti(void)
        uint8_t CurrRxPos = 0;\r
 \r
        /* Write out bytes to transmit until the start of the bytes to receive is met */\r
        uint8_t CurrRxPos = 0;\r
 \r
        /* Write out bytes to transmit until the start of the bytes to receive is met */\r

-       while (CurrTxPos < RxStartAddr)\r
+       while (CurrTxPos < SPI_Multi_Params.RxStartAddr)\r

        {\r
        {\r

-               if (CurrTxPos < TxBytes)\r
-                 SPI_SendByte(TxData[CurrTxPos]);\r
+               if (CurrTxPos < SPI_Multi_Params.TxBytes)\r
+                 SPI_SendByte(SPI_Multi_Params.TxData[CurrTxPos]);\r

                else\r
                  SPI_SendByte(0);\r
                \r
                else\r
                  SPI_SendByte(0);\r
                \r


@@ -217,10 +436,10 @@ static void V2Protocol_Command_SPIMulti(void)
        }\r
 \r
        /* Transmit remaining bytes with padding as needed, read in response bytes */\r
        }\r
 \r
        /* Transmit remaining bytes with padding as needed, read in response bytes */\r

-       while (CurrRxPos < RxBytes)\r
+       while (CurrRxPos < SPI_Multi_Params.RxBytes)\r

        {\r
        {\r

-               if (CurrTxPos < TxBytes)\r
-                 Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos++]));\r
+               if (CurrTxPos < SPI_Multi_Params.TxBytes)\r
+                 Endpoint_Write_Byte(SPI_TransferByte(SPI_Multi_Params.TxData[CurrTxPos++]));\r

                else\r
                  Endpoint_Write_Byte(SPI_ReceiveByte());\r
                \r
                else\r
                  Endpoint_Write_Byte(SPI_ReceiveByte());\r
                \r


@@ -228,5 +447,5 @@ static void V2Protocol_Command_SPIMulti(void)
        }       \r
        \r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        }       \r
        \r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r

-       Endpoint_ClearIN();     \r
+       Endpoint_ClearIN();\r

 }\r
 }\r