aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/Peripheral/AVR8
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-01-15 19:34:35 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-01-15 19:34:35 +0000
commit730db924c92de6db6c3115325984f740ef300dd4 (patch)
tree64b1e52a7acf72eef41d1fd12e5e9717682d943c /LUFA/Drivers/Peripheral/AVR8
parentf51c87b9160dd89810bac7579246ae14f61e0a8b (diff)
downloadlufa-730db924c92de6db6c3115325984f740ef300dd4.tar.gz
lufa-730db924c92de6db6c3115325984f740ef300dd4.tar.bz2
lufa-730db924c92de6db6c3115325984f740ef300dd4.zip
Fixed bug in the TWI peripheral driver for the AVR8 devices causing incorrect failure codes to be returned in some cases (thanks to Peter K).
Diffstat (limited to 'LUFA/Drivers/Peripheral/AVR8')
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
index 9cfad9af4..e7629d5b7 100644
--- a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
+++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
@@ -45,7 +45,7 @@ uint8_t TWI_StartTransmission(const uint8_t SlaveAddress,
TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN));
TimeoutRemaining = (TimeoutMS * 100);
- while (TimeoutRemaining-- && !(BusCaptured))
+ while (TimeoutRemaining && !(BusCaptured))
{
if (TWCR & (1 << TWINT))
{
@@ -65,6 +65,7 @@ uint8_t TWI_StartTransmission(const uint8_t SlaveAddress,
}
_delay_us(10);
+ TimeoutRemaining--;
}
if (!(TimeoutRemaining))
@@ -77,12 +78,13 @@ uint8_t TWI_StartTransmission(const uint8_t SlaveAddress,
TWCR = ((1 << TWINT) | (1 << TWEN));
TimeoutRemaining = (TimeoutMS * 100);
- while (TimeoutRemaining--)
+ while (TimeoutRemaining)
{
if (TWCR & (1 << TWINT))
break;
_delay_us(10);
+ TimeoutRemaining--;
}
if (!(TimeoutRemaining))