X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/a8871c7fba73307226bd13e2cad4c840c850e6f1..5a4def747897c1c6ffbe465506d846c7c686d3e9:/LUFA/Drivers/Peripheral/TWI.c?ds=sidebyside diff --git a/LUFA/Drivers/Peripheral/TWI.c b/LUFA/Drivers/Peripheral/TWI.c index b8aec4852..64f847544 100644 --- a/LUFA/Drivers/Peripheral/TWI.c +++ b/LUFA/Drivers/Peripheral/TWI.c @@ -1,6 +1,6 @@ /* Copyright (C) Dean Camera, 2010. - + dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ @@ -15,7 +15,7 @@ bool TWI_StartTransmission(const uint8_t SlaveAddress, bool BusCaptured = false; uint16_t TimeoutRemaining; - TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN)); + TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN)); TimeoutRemaining = (TimeoutMS * 100); while (TimeoutRemaining-- && !(BusCaptured)) @@ -29,35 +29,35 @@ bool TWI_StartTransmission(const uint8_t SlaveAddress, BusCaptured = true; break; case TW_MT_ARB_LOST: - TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN)); + TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN)); continue; default: TWCR = (1 << TWEN); return false; } } - + _delay_us(10); } - + if (!(BusCaptured)) { TWCR = (1 << TWEN); return false; } - + TWDR = SlaveAddress; TWCR = ((1 << TWINT) | (1 << TWEN)); - + TimeoutRemaining = (TimeoutMS * 100); while (TimeoutRemaining--) { if (TWCR & (1 << TWINT)) break; - + _delay_us(10); } - + if (!(TimeoutRemaining)) return false; @@ -72,3 +72,4 @@ bool TWI_StartTransmission(const uint8_t SlaveAddress, } } } +