Changed AVRISP-MKII project to use the Watchdog interrupt for command timeouts, to reduce CPU usage and free timer 0 for other uses in the future.

This commit is contained in:
Dean Camera 2011-01-22 17:48:06 +00:00
parent ef44b8c036
commit 26017b68b0
10 changed files with 37 additions and 35 deletions

View file

@ -80,7 +80,7 @@ bool XMEGANVM_WaitWhileNVMBusBusy(void)
uint8_t StatusRegister = XPROGTarget_ReceiveByte();
/* We might have timed out waiting for the status register read response, check here */
if (!(TimeoutTicksRemaining))
if (TimeoutExpired)
return false;
/* Check the status register read response to see if the NVM bus is enabled */
@ -109,7 +109,7 @@ bool XMEGANVM_WaitWhileNVMControllerBusy(void)
uint8_t StatusRegister = XPROGTarget_ReceiveByte();
/* We might have timed out waiting for the status register read response, check here */
if (!(TimeoutTicksRemaining))
if (TimeoutExpired)
return false;
/* Check to see if the BUSY flag is still set */
@ -204,7 +204,7 @@ bool XMEGANVM_GetMemoryCRC(const uint8_t CRCCommand, uint32_t* const CRCDest)
for (uint8_t i = 0; i < XMEGA_CRC_LENGTH; i++)
((uint8_t*)CRCDest)[i] = XPROGTarget_ReceiveByte();
return (TimeoutTicksRemaining != 0);
return (TimeoutExpired == false);
}
/** Reads memory from the target's memory spaces.
@ -236,10 +236,10 @@ bool XMEGANVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16
/* Send a LD command with indirect access and post-increment to read out the bytes */
XPROGTarget_SendByte(PDI_CMD_LD | (PDI_POINTER_INDIRECT_PI << 2) | PDI_DATSIZE_1BYTE);
while (ReadSize-- && TimeoutTicksRemaining)
while (ReadSize-- && !(TimeoutExpired))
*(ReadBuffer++) = XPROGTarget_ReceiveByte();
return (TimeoutTicksRemaining != 0);
return (TimeoutExpired == false);
}
/** Writes byte addressed memory to the target's memory spaces.