projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up excessive whitespace at the end of each line using the wspurify tool made...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Peripheral
/
TWI.c
diff --git
a/LUFA/Drivers/Peripheral/TWI.c
b/LUFA/Drivers/Peripheral/TWI.c
index
b8aec48
..
64f8475
100644
(file)
--- a/
LUFA/Drivers/Peripheral/TWI.c
+++ b/
LUFA/Drivers/Peripheral/TWI.c
@@
-1,6
+1,6
@@
/*
Copyright (C) Dean Camera, 2010.
/*
Copyright (C) Dean Camera, 2010.
-
+
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
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;
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))
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:
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;
}
}
continue;
default:
TWCR = (1 << TWEN);
return false;
}
}
-
+
_delay_us(10);
}
_delay_us(10);
}
-
+
if (!(BusCaptured))
{
TWCR = (1 << TWEN);
return false;
}
if (!(BusCaptured))
{
TWCR = (1 << TWEN);
return false;
}
-
+
TWDR = SlaveAddress;
TWCR = ((1 << TWINT) | (1 << TWEN));
TWDR = SlaveAddress;
TWCR = ((1 << TWINT) | (1 << TWEN));
-
+
TimeoutRemaining = (TimeoutMS * 100);
while (TimeoutRemaining--)
{
if (TWCR & (1 << TWINT))
break;
TimeoutRemaining = (TimeoutMS * 100);
while (TimeoutRemaining--)
{
if (TWCR & (1 << TWINT))
break;
-
+
_delay_us(10);
}
_delay_us(10);
}
-
+
if (!(TimeoutRemaining))
return false;
if (!(TimeoutRemaining))
return false;
@@
-72,3
+72,4
@@
bool TWI_StartTransmission(const uint8_t SlaveAddress,
}
}
}
}
}
}
+