diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-13 11:26:03 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-13 11:26:03 +0000 |
commit | 666c0fa4c31b2c9f7f02f6d0e09551e24dc4680c (patch) | |
tree | 6fd57a5b9cd741895fbaf55f6c56708d521d7748 /Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c | |
parent | 03130342451003093e654edc5b031718d544e9ba (diff) | |
download | lufa-666c0fa4c31b2c9f7f02f6d0e09551e24dc4680c.tar.gz lufa-666c0fa4c31b2c9f7f02f6d0e09551e24dc4680c.tar.bz2 lufa-666c0fa4c31b2c9f7f02f6d0e09551e24dc4680c.zip |
Remove the timeout period extension code from the AVRISP project, as no single command should ever exceed the maximum timeout period. Extend timeout period to 1 second per command, so that an accidental timeout will never occur.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c')
-rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c index 2ce11a8ee..d6e02fa2b 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c @@ -76,7 +76,7 @@ void ISPProtocol_EnterISPMode(void) /* Continuously attempt to synchronize with the target until either the number of attempts specified * by the host has exceeded, or the the device sends back the expected response values */ - while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED) && TimeoutMSRemaining) + while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED) && TimeoutTicksRemaining) { uint8_t ResponseBytes[4]; @@ -552,13 +552,8 @@ void ISPProtocol_SPIMulti(void) */ void ISPProtocol_DelayMS(uint8_t DelayMS) { - while (DelayMS-- && TimeoutMSRemaining) - { - if (TimeoutMSRemaining) - TimeoutMSRemaining--; - - _delay_ms(1); - } + while (DelayMS-- && TimeoutTicksRemaining) + _delay_ms(1); } #endif
\ No newline at end of file |