diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-20 22:33:48 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-20 22:33:48 +0000 |
| commit | 37c9ba7fa980472406625973f0ee32719b5a8997 (patch) | |
| tree | 0db6f97496255b576cb150068f904b23b4554cb5 /Projects/AVRISP/Lib | |
| parent | 8b7565956380c558bb309732c1d7d2cb58b193ea (diff) | |
| download | lufa-37c9ba7fa980472406625973f0ee32719b5a8997.tar.gz lufa-37c9ba7fa980472406625973f0ee32719b5a8997.tar.bz2 lufa-37c9ba7fa980472406625973f0ee32719b5a8997.zip | |
Fixed AVRISP project timeouts not checking for the correct timeout period (thanks to Carl Ott).
Diffstat (limited to 'Projects/AVRISP/Lib')
| -rw-r--r-- | Projects/AVRISP/Lib/ISPTarget.c | 28 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/NVMTarget.c | 13 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/PDITarget.c | 13 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/V2Protocol.h | 11 |
4 files changed, 55 insertions, 10 deletions
diff --git a/Projects/AVRISP/Lib/ISPTarget.c b/Projects/AVRISP/Lib/ISPTarget.c index fbe8ad31c..ce364c6cc 100644 --- a/Projects/AVRISP/Lib/ISPTarget.c +++ b/Projects/AVRISP/Lib/ISPTarget.c @@ -123,16 +123,25 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1 case PROG_MODE_WORD_VALUE_MASK:
case PROG_MODE_PAGED_VALUE_MASK:
TCNT0 = 0;
+ TIFR0 = (1 << OCF1A);
+
+ uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;
do
{
SPI_SendByte(ReadMemCommand);
SPI_SendByte(PollAddress >> 8);
- SPI_SendByte(PollAddress & 0xFF);
+ SPI_SendByte(PollAddress & 0xFF);
+
+ if (TIFR0 & (1 << OCF1A))
+ {
+ TIFR0 = (1 << OCF1A);
+ TimeoutMS--;
+ }
}
- while ((SPI_TransferByte(0x00) != PollValue) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));
+ while ((SPI_TransferByte(0x00) != PollValue) && TimeoutMS);
- if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)
+ if (!(TimeoutMS))
ProgrammingStatus = STATUS_CMD_TOUT;
break;
@@ -153,6 +162,9 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1 uint8_t ISPTarget_WaitWhileTargetBusy(void)
{
TCNT0 = 0;
+ TIFR0 = (1 << OCF1A);
+
+ uint8_t TimeoutMS = TARGET_BUSY_TIMEOUT_MS;
do
{
@@ -160,10 +172,16 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void) SPI_SendByte(0x00);
SPI_SendByte(0x00);
+
+ if (TIFR0 & (1 << OCF1A))
+ {
+ TIFR0 = (1 << OCF1A);
+ TimeoutMS--;
+ }
}
- while ((SPI_ReceiveByte() & 0x01) && (TCNT0 < TARGET_BUSY_TIMEOUT_MS));
+ while ((SPI_ReceiveByte() & 0x01) && TimeoutMS);
- if (TCNT0 >= TARGET_BUSY_TIMEOUT_MS)
+ if (!(TimeoutMS))
return STATUS_RDY_BSY_TOUT;
else
return STATUS_CMD_OK;
diff --git a/Projects/AVRISP/Lib/NVMTarget.c b/Projects/AVRISP/Lib/NVMTarget.c index 00312d513..adf213bb4 100644 --- a/Projects/AVRISP/Lib/NVMTarget.c +++ b/Projects/AVRISP/Lib/NVMTarget.c @@ -72,9 +72,12 @@ void NVMTarget_SendAddress(const uint32_t AbsoluteAddress) bool NVMTarget_WaitWhileNVMControllerBusy(void)
{
TCNT0 = 0;
-
+ TIFR0 = (1 << OCF1A);
+
+ uint8_t TimeoutMS = PDI_NVM_TIMEOUT_MS;
+
/* Poll the NVM STATUS register while the NVM controller is busy */
- while (TCNT0 < NVM_BUSY_TIMEOUT_MS)
+ while (TimeoutMS)
{
/* Send a LDS command to read the NVM STATUS register to check the BUSY flag */
PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_4BYTES << 2));
@@ -83,6 +86,12 @@ bool NVMTarget_WaitWhileNVMControllerBusy(void) /* Check to see if the BUSY flag is still set */
if (!(PDITarget_ReceiveByte() & (1 << 7)))
return true;
+
+ if (TIFR0 & (1 << OCF1A))
+ {
+ TIFR0 = (1 << OCF1A);
+ TimeoutMS--;
+ }
}
return false;
diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c index df01497f6..29bb33985 100644 --- a/Projects/AVRISP/Lib/PDITarget.c +++ b/Projects/AVRISP/Lib/PDITarget.c @@ -311,14 +311,23 @@ void PDITarget_SendBreak(void) bool PDITarget_WaitWhileNVMBusBusy(void)
{
TCNT0 = 0;
-
+ TIFR0 = (1 << OCF1A);
+
+ uint8_t TimeoutMS = PDI_NVM_TIMEOUT_MS;
+
/* Poll the STATUS register to check to see if NVM access has been enabled */
- while (TCNT0 < PDI_NVM_TIMEOUT_MS)
+ while (TimeoutMS)
{
/* Send the LDCS command to read the PDI STATUS register to see the NVM bus is active */
PDITarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG);
if (PDITarget_ReceiveByte() & PDI_STATUS_NVM)
return true;
+
+ if (TIFR0 & (1 << OCF1A))
+ {
+ TIFR0 = (1 << OCF1A);
+ TimeoutMS--;
+ }
}
return false;
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h index 5f996eadd..1777e0fe1 100644 --- a/Projects/AVRISP/Lib/V2Protocol.h +++ b/Projects/AVRISP/Lib/V2Protocol.h @@ -70,7 +70,16 @@ static inline void V2Protocol_DelayMS(uint8_t DelayMS)
{
TCNT0 = 0;
- while (TCNT0 < DelayMS);
+ TIFR0 = (1 << OCF1A);
+
+ while (DelayMS)
+ {
+ if (TIFR0 & (1 << OCF1A))
+ {
+ TIFR0 = (1 << OCF1A);
+ DelayMS--;
+ }
+ }
} /* External Variables: */
|