From 9a1560dc050f79fd189838a87ce623e79ff48677 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 30 Apr 2010 08:33:21 +0000 Subject: Make sure that long reads are aborted early if the connection times out while waiting on more bytes in the AVRISP MKII clone project. --- Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7b9ff09148..acd6b651cc 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c @@ -164,14 +164,14 @@ bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_ /* Send the address of the location to read from */ TINYNVM_SendPointerAddress(ReadAddress); - while (ReadSize--) + while (ReadSize-- && TimeoutMSRemaining) { /* Read the byte of data from the target */ XPROGTarget_SendByte(TPI_CMD_SLD | TPI_POINTER_INDIRECT_PI); *(ReadBuffer++) = XPROGTarget_ReceiveByte(); } - return true; + return (TimeoutMSRemaining != 0); } /** Writes word addressed memory to the target's memory spaces. -- cgit v1.2.3