aboutsummaryrefslogtreecommitdiff
path: root/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2011-01-22 17:48:06 +0000
committerDean Camera <[email protected]>2011-01-22 17:48:06 +0000
commit26017b68b0632c91e71eb29e87ca94670425e081 (patch)
tree111734f4a05e27e4cfb33779ab8d949388aaee4c /Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
parentef44b8c036daf4806a369dfdcd5adf72cf85b824 (diff)
downloadqmk_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/XMEGANVM.c')
-rw-r--r--Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index eb9d063068..b1fea59922 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -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.