ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes to the AVRISP command timeout system so that it should no longer lock up while processing command no matter what the conditions.

Browse source
This commit is contained in:
Dean Camera 2010-02-21 06:26:33 +00:00
parent 12a01ed72d
commit e322f14620
8 changed files with 58 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
View file

@ -112,7 +112,6 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
const uint8_t DelayMS, const uint8_t ReadMemCommand)
{
uint8_t ProgrammingStatus = STATUS_CMD_OK;
uint8_t TimeoutMSRemaining = 100;
/* Determine method of Programming Complete check */
switch (ProgrammingMode & ~(PROG_MODE_PAGED_WRITES_MASK | PROG_MODE_COMMIT_PAGE_MASK))
@ -148,6 +147,9 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
break;
}
if (ProgrammingStatus == STATUS_CMD_OK)
TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
return ProgrammingStatus;
}
@ -158,8 +160,6 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
*/
uint8_t ISPTarget_WaitWhileTargetBusy(void)
{
uint8_t TimeoutMSRemaining = 100;
do
{
/* Manage software timeout */
@ -175,7 +175,15 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
}
while ((SPI_ReceiveByte() & 0x01) && TimeoutMSRemaining);
return ((TimeoutMSRemaining) ? STATUS_CMD_OK : STATUS_RDY_BSY_TOUT);
if (TimeoutMSRemaining)
{
TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
return STATUS_CMD_OK;
}
else
{
return STATUS_RDY_BSY_TOUT;
}
}
/** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the