Make sure that long reads are aborted early if the connection times out while waiting on more bytes in the AVRISP MKII clone project.

This commit is contained in:
Dean Camera 2010-04-30 08:33:21 +00:00
parent ceb16ee24f
commit 9a1560dc05
3 changed files with 8 additions and 5 deletions

View file

@ -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.