me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

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).

Browse Source
This commit is contained in:
Dean Camera
2013-01-15 19:34:35 +00:00
parent f51c87b916
commit 730db924c9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
View File

@@ -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))