From 25ac76a2517a23510831fa8a849585747f04d688 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 1 Apr 2012 13:39:04 +0000 Subject: 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. --- Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c') 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. -- cgit v1.2.3