diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-01 13:39:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-01 13:39:04 +0000 |
| commit | 25ac76a2517a23510831fa8a849585747f04d688 (patch) | |
| tree | 834ac63cbc1d483d12305f65a1b376b1241eebfd /Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | |
| parent | 89f16f5d7f411f31f85bc289fadcd7b15980303d (diff) | |
| download | lufa-25ac76a2517a23510831fa8a849585747f04d688.tar.gz lufa-25ac76a2517a23510831fa8a849585747f04d688.tar.bz2 lufa-25ac76a2517a23510831fa8a849585747f04d688.zip | |
Reverted AVRISP-MKII clone project watchdog based command timeout patch in favour of a hardware timer, to allow for use in devices with WDTRST fuse programmed.
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 b8832372f..df0374dea 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 (TimeoutExpired) + if (!(TimeoutTicksRemaining)) 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 (TimeoutExpired) + if (!(TimeoutTicksRemaining)) return false; /* Check to see if the BUSY flag is still set */ @@ -182,14 +182,14 @@ bool TINYNVM_ReadMemory(const uint16_t ReadAddress, /* Send the address of the location to read from */ TINYNVM_SendPointerAddress(ReadAddress); - while (ReadSize-- && !(TimeoutExpired)) + while (ReadSize-- && TimeoutTicksRemaining) { /* Read the byte of data from the target */ XPROGTarget_SendByte(TPI_CMD_SLD | TPI_POINTER_INDIRECT_PI); *(ReadBuffer++) = XPROGTarget_ReceiveByte(); } - return (TimeoutExpired == false); + return (TimeoutTicksRemaining > 0); } /** Writes word addressed memory to the target's memory spaces. |