Commit 8cb8f1cf authored by Dean Camera's avatar Dean Camera
Browse files

Switch to hardware delays and timeouts via a hardware timer in the V2 Protocol handler.

More additions to the PROGRAM_FLASH_ISP and PROGRAM_EEPROM_ISP commands, although neither work correctly yet.

Added dummy RESET_PROTECTIONS handler to prevent the Atmel driver from crashing when the command returns an UNKNOWN_COMMAND error code.
parent 92adb00f
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
// TODO: Add reversed target connector checks // TODO: Add reversed target connector checks
// TODO: Add in software SPI for lower programming speeds below 125KHz // TODO: Add in software SPI for lower programming speeds below 125KHz
// TODO: Add in VTARGET detection // TODO: Add in VTARGET detection
// TODO: Add in software SPI for lower programming speeds
#include "AVRISP.h" #include "AVRISP.h"
...@@ -72,6 +73,11 @@ void SetupHardware(void) ...@@ -72,6 +73,11 @@ void SetupHardware(void)
/* Hardware Initialization */ /* Hardware Initialization */
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
/* Millisecond timer initialization for timeout checking */
OCR0A = ((F_CPU / 64) / 1000);
TCCR0A = (1 << WGM01);
TCCR0B = ((1 << CS01) | (1 << CS00));
} }
/** Event handler for the library USB Connection event. */ /** Event handler for the library USB Connection event. */
......
...@@ -52,6 +52,9 @@ void V2Protocol_ProcessCommand(void) ...@@ -52,6 +52,9 @@ void V2Protocol_ProcessCommand(void)
case CMD_LOAD_ADDRESS: case CMD_LOAD_ADDRESS:
V2Protocol_Command_LoadAddress(); V2Protocol_Command_LoadAddress();
break; break;
case CMD_RESET_PROTECTION:
V2Protocol_Command_ResetProtection();
break;
case CMD_ENTER_PROGMODE_ISP: case CMD_ENTER_PROGMODE_ISP:
V2Protocol_Command_EnterISPMode(); V2Protocol_Command_EnterISPMode();
break; break;
...@@ -168,6 +171,16 @@ static void V2Protocol_Command_LoadAddress(void) ...@@ -168,6 +171,16 @@ static void V2Protocol_Command_LoadAddress(void)
Endpoint_ClearIN(); Endpoint_ClearIN();
} }
static void V2Protocol_Command_ResetProtection(void)
{
Endpoint_ClearOUT();
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
Endpoint_Write_Byte(CMD_RESET_PROTECTION);
Endpoint_Write_Byte(STATUS_CMD_OK);
Endpoint_ClearIN();
}
static void V2Protocol_Command_EnterISPMode(void) static void V2Protocol_Command_EnterISPMode(void)
{ {
struct struct
...@@ -208,7 +221,7 @@ static void V2Protocol_Command_EnterISPMode(void) ...@@ -208,7 +221,7 @@ static void V2Protocol_Command_EnterISPMode(void)
} }
/* Check if polling disabled, or if the polled value matches the expected value */ /* Check if polling disabled, or if the polled value matches the expected value */
if (!Enter_ISP_Params.PollIndex || (ResponseBytes[Enter_ISP_Params.PollIndex - 1] == Enter_ISP_Params.PollValue)) if (!(Enter_ISP_Params.PollIndex) || (ResponseBytes[Enter_ISP_Params.PollIndex - 1] == Enter_ISP_Params.PollValue))
{ {
ResponseStatus = STATUS_CMD_OK; ResponseStatus = STATUS_CMD_OK;
} }
...@@ -264,6 +277,8 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command) ...@@ -264,6 +277,8 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
uint8_t ProgrammingStatus = STATUS_CMD_OK; uint8_t ProgrammingStatus = STATUS_CMD_OK;
uint16_t PollAddress = 0; uint16_t PollAddress = 0;
uint8_t PollValue = (V2Command == CMD_PROGRAM_FLASH_ISP) ? Write_Memory_Params.PollValue1 :
Write_Memory_Params.PollValue2;
if (Write_Memory_Params.ProgrammingMode & PROG_MODE_PAGED_WRITES_MASK) if (Write_Memory_Params.ProgrammingMode & PROG_MODE_PAGED_WRITES_MASK)
{ {
...@@ -281,11 +296,11 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command) ...@@ -281,11 +296,11 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
SPI_SendByte(CurrentAddress & 0xFF); SPI_SendByte(CurrentAddress & 0xFF);
SPI_SendByte(ByteToWrite); SPI_SendByte(ByteToWrite);
if (!(PollAddress)) if (!(PollAddress) && (ByteToWrite != PollValue))
{ {
if ((ByteToWrite != Write_Memory_Params.PollValue1) && (V2Command == CMD_PROGRAM_FLASH_ISP)) if (V2Command == CMD_PROGRAM_FLASH_ISP)
PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte); PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte);
else if ((ByteToWrite != Write_Memory_Params.PollValue2) && (V2Command == CMD_PROGRAM_EEPROM_ISP)) else
PollAddress = (CurrentAddress & 0xFFFF); PollAddress = (CurrentAddress & 0xFFFF);
} }
...@@ -309,7 +324,9 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command) ...@@ -309,7 +324,9 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
} }
} }
ProgrammingStatus = V2Protocol_WaitForProgrammingComplete(PollAddress, Write_Memory_Params.ProgrammingMode); ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,
Write_Memory_Params.DelayMS, (V2Command == CMD_READ_FLASH_ISP),
Write_Memory_Params.ProgrammingCommands[2]);
} }
else else
{ {
...@@ -327,15 +344,20 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command) ...@@ -327,15 +344,20 @@ static void V2Protocol_Command_ProgramMemory(uint8_t V2Command)
SPI_SendByte(CurrentAddress & 0xFF); SPI_SendByte(CurrentAddress & 0xFF);
SPI_SendByte(ByteToWrite); SPI_SendByte(ByteToWrite);
if ((ByteToWrite != Write_Memory_Params.PollValue1) && (V2Command == CMD_PROGRAM_FLASH_ISP)) if (ByteToWrite != PollValue)
PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte); {
else if ((ByteToWrite != Write_Memory_Params.PollValue2) && (V2Command == CMD_PROGRAM_EEPROM_ISP)) if (V2Command == CMD_PROGRAM_FLASH_ISP)
PollAddress = (CurrentAddress & 0xFFFF); PollAddress = (((CurrentAddress & 0xFFFF) << 1) | IsOddByte);
else
ProgrammingStatus = V2Protocol_WaitForProgrammingComplete(PollAddress, Write_Memory_Params.ProgrammingMode); PollAddress = (CurrentAddress & 0xFFFF);
}
if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP)) if (IsOddByte || (V2Command == CMD_PROGRAM_EEPROM_ISP))
CurrentAddress++; CurrentAddress++;
ProgrammingStatus = V2Protocol_WaitForProgComplete(Write_Memory_Params.ProgrammingMode, PollAddress, PollValue,
Write_Memory_Params.DelayMS, (V2Command == CMD_READ_FLASH_ISP),
Write_Memory_Params.ProgrammingCommands[2]);
if (ProgrammingStatus != STATUS_CMD_OK) if (ProgrammingStatus != STATUS_CMD_OK)
break; break;
...@@ -390,7 +412,17 @@ static void V2Protocol_Command_ReadMemory(uint8_t V2Command) ...@@ -390,7 +412,17 @@ static void V2Protocol_Command_ReadMemory(uint8_t V2Command)
} }
Endpoint_Write_Byte(STATUS_CMD_OK); Endpoint_Write_Byte(STATUS_CMD_OK);
bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());
Endpoint_ClearIN(); Endpoint_ClearIN();
/* Ensure last packet is a short packet to terminate the transfer */
if (IsEndpointFull)
{
Endpoint_WaitUntilReady();
Endpoint_ClearIN();
Endpoint_WaitUntilReady();
}
} }
static void V2Protocol_Command_ChipErase(void) static void V2Protocol_Command_ChipErase(void)
...@@ -412,7 +444,7 @@ static void V2Protocol_Command_ChipErase(void) ...@@ -412,7 +444,7 @@ static void V2Protocol_Command_ChipErase(void)
for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++) for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++)
SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]); SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]);
if (Erase_Chip_Params.PollMethod == 0) if (!(Erase_Chip_Params.PollMethod))
V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS); V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);
else else
ResponseStatus = V2Protocol_WaitWhileTargetBusy(); ResponseStatus = V2Protocol_WaitWhileTargetBusy();
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#define PROG_MODE_PAGED_TIMEDELAY_MASK (1 << 4) #define PROG_MODE_PAGED_TIMEDELAY_MASK (1 << 4)
#define PROG_MODE_PAGED_VALUE_MASK (1 << 5) #define PROG_MODE_PAGED_VALUE_MASK (1 << 5)
#define PROG_MODE_PAGED_READYBUSY_MASK (1 << 6) #define PROG_MODE_PAGED_READYBUSY_MASK (1 << 6)
#define PROG_MODE_COMMIT_PAGE_MASK (1 << 7) #define PROG_MODE_COMMIT_PAGE_MASK (1 << 7)
/* Function Prototypes: */ /* Function Prototypes: */
...@@ -67,6 +66,7 @@ ...@@ -67,6 +66,7 @@
static void V2Protocol_Command_SignOn(void); static void V2Protocol_Command_SignOn(void);
static void V2Protocol_Command_GetSetParam(uint8_t V2Command); static void V2Protocol_Command_GetSetParam(uint8_t V2Command);
static void V2Protocol_Command_LoadAddress(void); static void V2Protocol_Command_LoadAddress(void);
static void V2Protocol_Command_ResetProtection(void);
static void V2Protocol_Command_EnterISPMode(void); static void V2Protocol_Command_EnterISPMode(void);
static void V2Protocol_Command_LeaveISPMode(void); static void V2Protocol_Command_LeaveISPMode(void);
static void V2Protocol_Command_ProgramMemory(uint8_t V2Command); static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);
......
...@@ -63,7 +63,7 @@ static ParameterItem_t ParameterTable[] = ...@@ -63,7 +63,7 @@ static ParameterItem_t ParameterTable[] =
.ParamPrivellages = PARAM_PRIV_READ }, .ParamPrivellages = PARAM_PRIV_READ },
{ .ParamID = PARAM_VTARGET, { .ParamID = PARAM_VTARGET,
.ParamValue = 0x00, .ParamValue = 0x32,
.ParamPrivellages = PARAM_PRIV_READ }, .ParamPrivellages = PARAM_PRIV_READ },
{ .ParamID = PARAM_SCK_DURATION, { .ParamID = PARAM_SCK_DURATION,
......
...@@ -78,22 +78,58 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget) ...@@ -78,22 +78,58 @@ void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
void V2Protocol_DelayMS(uint8_t MS) void V2Protocol_DelayMS(uint8_t MS)
{ {
while (MS--) TCNT0 = 0;
_delay_ms(1); while (TCNT0 < MS);
} }
uint8_t V2Protocol_WaitForProgrammingComplete(uint16_t PollAddress, uint8_t ProgrammingMode) uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,
uint8_t DelayMS, bool IsFlashMemory, uint8_t ReadMemCommand)
{ {
// TODO uint8_t ProgrammingStatus = STATUS_CMD_OK;
return STATUS_CMD_OK; /* Determine method of Programming Complete check */
switch (ProgrammingMode & ~(PROG_MODE_PAGED_WRITES_MASK | PROG_MODE_COMMIT_PAGE_MASK))
{
case PROG_MODE_WORD_TIMEDELAY_MASK:
case PROG_MODE_PAGED_TIMEDELAY_MASK:
V2Protocol_DelayMS(DelayMS);
break;
case PROG_MODE_WORD_VALUE_MASK:
case PROG_MODE_PAGED_VALUE_MASK:
if (IsFlashMemory && (PollAddress & 0x01))
{
ReadMemCommand |= READ_WRITE_ODD_BYTE_MASK;
PollAddress >>= 1;
}
TCNT0 = 0;
do
{
SPI_SendByte(ReadMemCommand);
SPI_SendByte(PollAddress >> 8);
SPI_SendByte(PollAddress & 0xFF);
}
while ((SPI_TransferByte(0x00) != PollValue) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));
if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)
ProgrammingStatus = STATUS_RDY_BSY_TOUT;
break;
case PROG_MODE_WORD_READYBUSY_MASK:
case PROG_MODE_PAGED_READYBUSY_MASK:
ProgrammingStatus = V2Protocol_WaitWhileTargetBusy();
}
return ProgrammingStatus;
} }
uint8_t V2Protocol_WaitWhileTargetBusy(void) uint8_t V2Protocol_WaitWhileTargetBusy(void)
{ {
uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;
uint8_t ResponseByte; uint8_t ResponseByte;
TCNT0 = 0;
do do
{ {
SPI_SendByte(0xF0); SPI_SendByte(0xF0);
...@@ -101,13 +137,11 @@ uint8_t V2Protocol_WaitWhileTargetBusy(void) ...@@ -101,13 +137,11 @@ uint8_t V2Protocol_WaitWhileTargetBusy(void)
SPI_SendByte(0x00); SPI_SendByte(0x00);
ResponseByte = SPI_ReceiveByte(); ResponseByte = SPI_ReceiveByte();
V2Protocol_DelayMS(1);
} }
while ((ResponseByte & 0x01) && (TimeoutMS--)); while ((ResponseByte & 0x01) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));
if (!(TimeoutMS)) if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)
return STATUS_CMD_TOUT; return STATUS_RDY_BSY_TOUT;
else else
return STATUS_CMD_OK; return STATUS_CMD_OK;
} }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "V2ProtocolParams.h" #include "V2ProtocolParams.h"
/* Macros: */ /* Macros: */
#define TARGET_BUSY_TIMEOUT_MS 100 #define TARGET_BUSY_TIMEOUT_MS 200
/* External Variables: */ /* External Variables: */
extern uint32_t CurrentAddress; extern uint32_t CurrentAddress;
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
uint8_t V2Protocol_GetSPIPrescalerMask(void); uint8_t V2Protocol_GetSPIPrescalerMask(void);
void V2Protocol_ChangeTargetResetLine(bool ResetTarget); void V2Protocol_ChangeTargetResetLine(bool ResetTarget);
void V2Protocol_DelayMS(uint8_t MS); void V2Protocol_DelayMS(uint8_t MS);
uint8_t V2Protocol_WaitForProgrammingComplete(uint16_t PollAddress, uint8_t ProgrammingMode); uint8_t V2Protocol_WaitForProgComplete(uint8_t ProgrammingMode, uint16_t PollAddress, uint8_t PollValue,
uint8_t DelayMS, bool IsFlashMemory, uint8_t ReadMemCommand);
uint8_t V2Protocol_WaitWhileTargetBusy(void); uint8_t V2Protocol_WaitWhileTargetBusy(void);
void V2Protocol_LoadExtendedAddress(void); void V2Protocol_LoadExtendedAddress(void);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment