diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-04-30 08:33:21 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-04-30 08:33:21 +0000 |
| commit | 9a1560dc050f79fd189838a87ce623e79ff48677 (patch) | |
| tree | 76a3aa9738ab22f0380e9429c38a2785899dedf5 /Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c | |
| parent | ceb16ee24f1e6add5e2ad0398369c24d2d868cd8 (diff) | |
| download | lufa-9a1560dc050f79fd189838a87ce623e79ff48677.tar.gz lufa-9a1560dc050f79fd189838a87ce623e79ff48677.tar.bz2 lufa-9a1560dc050f79fd189838a87ce623e79ff48677.zip | |
Make sure that long reads are aborted early if the connection times out while waiting on more bytes in the AVRISP MKII clone project.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c index 7ca0c5e8a..b6b039aa8 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.
|