#define INCLUDE_FROM_V2PROTOCOL_C\r
#include "V2Protocol.h"\r
\r
-ParameterItem_t ParameterTable[] EEMEM = \r
+/* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
+static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =\r
{\r
- { .ParameterID = PARAM_BUILD_NUMBER_LOW,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_BUILD_NUMBER_HIGH,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_HW_VER,\r
- .ParameterValue = 0x01 },\r
- { .ParameterID = PARAM_SW_MAJOR,\r
- .ParameterValue = 0x01 },\r
- { .ParameterID = PARAM_SW_MINOR,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_VTARGET,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_SCK_DURATION,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_RESET_POLARITY,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_STATUS_TGT_CONN,\r
- .ParameterValue = 0x00 },\r
- { .ParameterID = PARAM_DISCHARGEDELAY,\r
- .ParameterValue = 0x00 },\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 void V2Protocol_ReconfigureSPI(void)\r
+{\r
+ uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
+\r
+ if (SCKDuration >= MAX_SPI_SETTINGS)\r
+ SCKDuration = (MAX_SPI_SETTINGS - 1);\r
+ \r
+ SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true); \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
void V2Protocol_ProcessCommand(void)
{
uint8_t V2Command = Endpoint_Read_Byte();\r
\r
- printf("COMMAND %d\r\n", V2Command);\r
-\r
switch (V2Command)\r
{\r
case CMD_SIGN_ON:\r
- V2Protocol_ProcessCmdSignOn();\r
+ V2Protocol_Command_SignOn();\r
break;\r
case CMD_SET_PARAMETER:\r
- V2Protocol_ProcessCmdSetParam();\r
- break;\r
case CMD_GET_PARAMETER:\r
- V2Protocol_ProcessCmdGetParam();\r
+ V2Protocol_Command_GetSetParam(V2Command);\r
break;\r
+ case CMD_SPI_MULTI:\r
+ V2Protocol_Command_SPIMulti();\r
+ break; \r
default:\r
- Endpoint_ClearOUT();\r
- Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
- Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
- Endpoint_ClearIN();\r
+ V2Protocol_Command_Unknown(V2Command);\r
break;\r
}\r
\r
- /* Reset Endpoint direction to OUT ready for next command */\r
+ printf("COMMAND 0x%02x\r\n", V2Command);\r
+\r
+ Endpoint_WaitUntilReady(); \r
Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
-}\r
+}
\r
-static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID)\r
-{\r
- for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)\r
+static void V2Protocol_Command_Unknown(uint8_t V2Command)\r
+{ \r
+ while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)\r
{\r
- if (ParamID == eeprom_read_byte(&ParameterTable[TableIndex].ParameterID))\r
- return &ParameterTable[TableIndex];\r
+ Endpoint_ClearOUT();\r
+ while (!(Endpoint_IsOUTReceived()));\r
}\r
- \r
- return NULL;\r
-}
+\r
+ Endpoint_ClearOUT();\r
+ Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+\r
+ Endpoint_Write_Byte(V2Command);\r
+ Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
+ Endpoint_ClearIN();\r
+}\r
-static void V2Protocol_ProcessCmdSignOn(void)\r
+static void V2Protocol_Command_SignOn(void)\r
{\r
Endpoint_ClearOUT();\r
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
- \r
+ Endpoint_WaitUntilReady();\r
+\r
+ V2Protocol_ReconfigureSPI();\r
+\r
Endpoint_Write_Byte(CMD_SIGN_ON);\r
Endpoint_Write_Byte(STATUS_CMD_OK);\r
Endpoint_Write_Byte(PROGRAMMER_ID_LEN);\r
Endpoint_ClearIN();\r
}\r
\r
-static void V2Protocol_ProcessCmdSetParam(void)\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
\r
- ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);\r
- \r
Endpoint_ClearOUT();\r
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-\r
- if (ParameterItem != NULL)\r
+ Endpoint_WaitUntilReady();\r
+ \r
+ uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);\r
+ \r
+ Endpoint_Write_Byte(V2Command);\r
+ \r
+ if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
{\r
- eeprom_write_byte(&ParameterItem->ParameterValue, ParamValue);\r
-\r
- Endpoint_Write_Byte(CMD_SET_PARAMETER);\r
- Endpoint_Write_Byte(STATUS_CMD_OK); \r
+ Endpoint_Write_Byte(STATUS_CMD_OK);\r
+ V2Params_SetParameterValue(ParamID, ParamValue);\r
}\r
- else\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
+ }\r
+ else\r
+ { \r
Endpoint_Write_Byte(STATUS_CMD_FAILED);\r
}\r
\r
Endpoint_ClearIN();\r
}\r
\r
-static void V2Protocol_ProcessCmdGetParam(void)\r
+static void V2Protocol_Command_SPIMulti(void)\r
{\r
- uint8_t ParamID = Endpoint_Read_Byte();\r
-\r
- ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);\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
+ \r
+ Endpoint_Read_Stream_LE(TxData, TxBytes);\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
- if (ParameterItem != NULL)\r
- {\r
- Endpoint_Write_Byte(CMD_GET_PARAMETER);\r
- Endpoint_Write_Byte(STATUS_CMD_OK);\r
- Endpoint_Write_Byte(eeprom_read_byte(&ParameterItem->ParameterValue)); \r
- }\r
- else\r
+ uint8_t CurrTxPos = 0;\r
+ uint8_t CurrRxPos = 0;\r
+\r
+ while (CurrTxPos < RxStartAddr)\r
{\r
- Endpoint_Write_Byte(STATUS_CMD_FAILED);\r
+ if (CurrTxPos < TxBytes)\r
+ SPI_SendByte(TxData[CurrTxPos]);\r
+ else\r
+ SPI_SendByte(0);\r
+ \r
+ CurrTxPos++;\r
}\r
\r
+ while (CurrRxPos < RxBytes)\r
+ {\r
+ if (CurrTxPos < TxBytes)\r
+ Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos++]));\r
+ else\r
+ Endpoint_Write_Byte(SPI_ReceiveByte());\r
+ \r
+ CurrRxPos++;\r
+ } \r
+ \r
+ Endpoint_Write_Byte(STATUS_CMD_OK);\r
Endpoint_ClearIN(); \r
}\r
projects / pub / USBasp.git / blobdiff