diff options
author | Dean Camera <[email protected]> | 2011-01-22 17:48:06 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2011-01-22 17:48:06 +0000 |
commit | 26017b68b0632c91e71eb29e87ca94670425e081 (patch) | |
tree | 111734f4a05e27e4cfb33779ab8d949388aaee4c /Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | |
parent | ef44b8c036daf4806a369dfdcd5adf72cf85b824 (diff) | |
download | qmk_firmware-26017b68b0632c91e71eb29e87ca94670425e081.tar.gz qmk_firmware-26017b68b0632c91e71eb29e87ca94670425e081.zip |
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.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c')
-rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c index 0322a6ec2e..49d5766085 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c @@ -85,7 +85,7 @@ bool TINYNVM_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 */ @@ -110,7 +110,7 @@ bool TINYNVM_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 */ @@ -176,14 +176,14 @@ bool TINYNVM_ReadMemory(const uint16_t ReadAddress, /* Send the address of the location to read from */ TINYNVM_SendPointerAddress(ReadAddress); - while (ReadSize-- && TimeoutTicksRemaining) + while (ReadSize-- && !(TimeoutExpired)) { /* Read the byte of data from the target */ XPROGTarget_SendByte(TPI_CMD_SLD | TPI_POINTER_INDIRECT_PI); *(ReadBuffer++) = XPROGTarget_ReceiveByte(); } - return (TimeoutTicksRemaining != 0); + return (TimeoutExpired == false); } /** Writes word addressed memory to the target's memory spaces. |