#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[] =\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 uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
-{\r
- uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
-\r
- if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
- SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
- \r
- return SPIMaskFromSCKDuration[SCKDuration];\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
-\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)
{
uint8_t V2Command = Endpoint_Read_Byte();\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
Endpoint_ClearOUT();\r
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
\r
- // TODO: Check for extended address\r
+ if (CurrentAddress & (1UL << 31))\r
+ V2Protocol_LoadExtendedAddress();\r
\r
Endpoint_Write_Byte(CMD_LOAD_ADDRESS);\r
Endpoint_Write_Byte(STATUS_CMD_OK);\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
+ 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
\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
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
Endpoint_Write_Byte(V2Command);\r
Endpoint_Write_Byte(STATUS_CMD_OK);\r
- Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte]);\r
+ Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte - 1]);\r
Endpoint_Write_Byte(STATUS_CMD_OK);\r
Endpoint_ClearIN();\r
}\r
projects / pub / USBasp.git / blobdiff