Fixed AVRISP programmer demo -- can now connect to a target and read/write Sig/Lock...

[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 c31fd0e..dc6d3c6 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -150,10 +150,8 @@ void V2Protocol_ProcessCommand(void)
                        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
@@ -167,7 +165,6 @@ static void V2Protocol_Command_Unknown(uint8_t V2Command)
 \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
@@ -178,7 +175,6 @@ static void V2Protocol_Command_SignOn(void)
 {\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
@@ -189,31 +185,28 @@ static void V2Protocol_Command_SignOn(void)
 \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
-       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
-       Endpoint_WaitUntilReady();\r
-       \r
-       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(Get_Set_Param_Params.ParamID);\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
-               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
-               Endpoint_Write_Byte(V2Params_GetParameterValue(Get_Set_Param_Params.ParamID));\r
+               Endpoint_Write_Byte(V2Params_GetParameterValue(ParamID));\r
        }\r
        else\r
        {       \r
@@ -229,7 +222,6 @@ static void V2Protocol_Command_LoadAddress(void)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
        \r
        // TODO: Check for extended address\r
 \r
@@ -256,40 +248,28 @@ static void V2Protocol_Command_EnterISPMode(void)
 \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
+       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
                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
+                       ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);\r
                }\r
                \r
-               if (ResponseBytes[Enter_ISP_Params.PollIndex] == Enter_ISP_Params.PollValue)\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
 \r
@@ -310,7 +290,6 @@ static void V2Protocol_Command_LeaveISPMode(void)
        \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
@@ -335,7 +314,6 @@ static void V2Protocol_Command_ChipErase(void)
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
        \r
        uint8_t ResponseStatus = STATUS_CMD_OK;\r
        \r
@@ -364,7 +342,6 @@ static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-       Endpoint_WaitUntilReady();\r
 \r
        uint8_t ResponseBytes[4];\r
                \r
@@ -389,7 +366,6 @@ static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)
 \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
@@ -416,7 +392,6 @@ static void V2Protocol_Command_SPIMulti(void)
        \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