diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-19 05:17:41 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-19 05:17:41 +0000 |
| commit | ce8d0424b1a59bb2b0bd3ab8f69f4e4cf8c9930b (patch) | |
| tree | eaac9417ace4aef53a57a922828e421114a6a81e /Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | |
| parent | 04d40897cf98469b39f1d97208a51deb65f70bc5 (diff) | |
| download | lufa-ce8d0424b1a59bb2b0bd3ab8f69f4e4cf8c9930b.tar.gz lufa-ce8d0424b1a59bb2b0bd3ab8f69f4e4cf8c9930b.tar.bz2 lufa-ce8d0424b1a59bb2b0bd3ab8f69f4e4cf8c9930b.zip | |
AVRISP programmer project now has a more robust timeout system, allowing for a doubling of the software USART speed for PDI and TPI programming.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c index 0ab297538..428469df7 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c @@ -77,14 +77,19 @@ static void TINYNVM_SendWriteNVMRegister(const uint8_t Address) bool TINYNVM_WaitWhileNVMBusBusy(void)
{
/* Poll the STATUS register to check to see if NVM access has been enabled */
+ uint8_t TimeoutMSRemaining = 100;
while (TimeoutMSRemaining)
{
/* Send the SLDCS command to read the TPI STATUS register to see the NVM bus is active */
XPROGTarget_SendByte(TPI_CMD_SLDCS | TPI_STATUS_REG);
if (XPROGTarget_ReceiveByte() & TPI_STATUS_NVM)
+ return true;
+
+ /* Manage software timeout */
+ if (TIFR0 & (1 << OCF0A))
{
- TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
- return true;
+ TIFR0 |= (1 << OCF0A);
+ TimeoutMSRemaining--;
}
}
@@ -99,6 +104,7 @@ bool TINYNVM_WaitWhileNVMBusBusy(void) bool TINYNVM_WaitWhileNVMControllerBusy(void)
{
/* Poll the STATUS register to check to see if NVM access has been enabled */
+ uint8_t TimeoutMSRemaining = 100;
while (TimeoutMSRemaining)
{
/* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */
@@ -106,9 +112,13 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void) /* Check to see if the BUSY flag is still set */
if (!(XPROGTarget_ReceiveByte() & (1 << 7)))
+ return true;
+
+ /* Manage software timeout */
+ if (TIFR0 & (1 << OCF0A))
{
- TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
- return true;
+ TIFR0 |= (1 << OCF0A);
+ TimeoutMSRemaining--;
}
}
|