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/XMEGANVM.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c') diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c index 7ca0c5e8a9..b6b039aa80 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c @@ -183,7 +183,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 true; + return (TimeoutMSRemaining != 0); } /** Reads memory from the target's memory spaces. @@ -215,10 +215,10 @@ bool XMEGANVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16 /* Send a LD command with indirect access and postincrement to read out the bytes */ XPROGTarget_SendByte(PDI_CMD_LD | (PDI_POINTER_INDIRECT_PI << 2) | PDI_DATSIZE_1BYTE); - while (ReadSize--) + while (ReadSize-- && TimeoutMSRemaining) *(ReadBuffer++) = XPROGTarget_ReceiveByte(); - return true; + return (TimeoutMSRemaining != 0); } /** Writes byte addressed memory to the target's memory spaces. -- cgit v1.2.3