#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[MAX_SPI_SETTINGS] =\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 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
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_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_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
- break; \r
+ break;\r
default:\r
V2Protocol_Command_Unknown(V2Command);\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
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_ClearOUT();\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(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
- uint8_t ParamID = Endpoint_Read_Byte();\r
- uint8_t ParamValue = Endpoint_Read_Byte();\r
+ uint8_t ParamID = Endpoint_Read_Byte();\r
+ uint8_t ParamValue;\r
+ \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(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
\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
+ 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
+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
+\r
+ uint8_t ResponseStatus = STATUS_CMD_FAILED;\r
+ \r
+ CurrentAddress = 0;\r
+\r
+ V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS); \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
+ 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
+ ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);\r
+ }\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
+ {\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
+ 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
+\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_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
+ if (Write_Memory_Params.ProgrammingMode & PROG_MODE_PAGED_WRITES_MASK)\r
+ {\r
+ for (uint16_t CurrentByte = 0; CurrentByte < Write_Memory_Params.BytesToWrite; CurrentByte++)\r
+ {\r
+ if ((V2Command == CMD_READ_FLASH_ISP) && (CurrentByte & 0x01))\r
+ Write_Memory_Params.ProgrammingCommands[0] ^= READ_WRITE_ODD_BYTE_MASK;\r
+ \r
+ SPI_SendByte(Write_Memory_Params.ProgrammingCommands[0]);\r
+ SPI_SendByte(CurrentAddress >> 8);\r
+ SPI_SendByte(CurrentAddress & 0xFF);\r
+ SPI_SendByte(Endpoint_Read_Byte());\r
+ \r
+ // TODO - Correct Polling\r
+\r
+ if (((V2Command == CMD_PROGRAM_FLASH_ISP) && (CurrentByte & 0x01)) || (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(CurrentAddress >> 8);\r
+ SPI_SendByte(CurrentAddress & 0xFF);\r
+ SPI_SendByte(0x00);\r
+ }\r
+ }\r
+ else\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
+ 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
+ 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
+ \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
+\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 - 1]);\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
+\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
- 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
- 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
- Endpoint_WaitUntilReady();\r
\r
Endpoint_Write_Byte(CMD_SPI_MULTI);\r
Endpoint_Write_Byte(STATUS_CMD_OK);\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
- 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
}\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
- 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
} \r
\r
Endpoint_Write_Byte(STATUS_CMD_OK);\r
- Endpoint_ClearIN(); \r
+ Endpoint_ClearIN();\r
}\r
projects / pub / USBasp.git / blobdiff