diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-01 13:39:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-04-01 13:39:04 +0000 |
| commit | 25ac76a2517a23510831fa8a849585747f04d688 (patch) | |
| tree | 834ac63cbc1d483d12305f65a1b376b1241eebfd /Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | |
| parent | 89f16f5d7f411f31f85bc289fadcd7b15980303d (diff) | |
| download | lufa-25ac76a2517a23510831fa8a849585747f04d688.tar.gz lufa-25ac76a2517a23510831fa8a849585747f04d688.tar.bz2 lufa-25ac76a2517a23510831fa8a849585747f04d688.zip | |
Reverted AVRISP-MKII clone project watchdog based command timeout patch in favour of a hardware timer, to allow for use in devices with WDTRST fuse programmed.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index e2b230166..b77c18058 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -254,7 +254,7 @@ uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte) TCNT1 = 0; TCCR1B = ((1 << WGM12) | (1 << CS11)); - while (SoftSPI_BitsRemaining && !(TimeoutExpired)); + while (SoftSPI_BitsRemaining && TimeoutTicksRemaining); TCCR1B = 0; return SoftSPI_Data; @@ -296,9 +296,9 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void) ISPTarget_SendByte(0x00); ISPTarget_SendByte(0x00); } - while ((ISPTarget_ReceiveByte() & 0x01) && !(TimeoutExpired)); + while ((ISPTarget_ReceiveByte() & 0x01) && TimeoutTicksRemaining); - return (TimeoutExpired) ? STATUS_RDY_BSY_TOUT : STATUS_CMD_OK; + return (TimeoutTicksRemaining > 0) ? STATUS_CMD_OK : STATUS_RDY_BSY_TOUT; } /** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the @@ -348,10 +348,10 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, ISPTarget_SendByte(PollAddress >> 8); ISPTarget_SendByte(PollAddress & 0xFF); } - while ((ISPTarget_TransferByte(0x00) == PollValue) && !(TimeoutExpired)); + while ((ISPTarget_TransferByte(0x00) == PollValue) && TimeoutTicksRemaining); - if (TimeoutExpired) - ProgrammingStatus = STATUS_CMD_TOUT; + if (!(TimeoutTicksRemaining)) + ProgrammingStatus = STATUS_CMD_TOUT; break; case PROG_MODE_WORD_READYBUSY_MASK: |