projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged from external project:
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
i2c_avr.c
diff --git
a/bertos/cpu/avr/drv/i2c_avr.c
b/bertos/cpu/avr/drv/i2c_avr.c
index fe3a4eb18aa32358f6096cc4362930e198440915..61a5bdea16d64b61f93df4990c79f4643c8a5172 100644
(file)
--- a/
bertos/cpu/avr/drv/i2c_avr.c
+++ b/
bertos/cpu/avr/drv/i2c_avr.c
@@
-92,7
+92,7
@@
bool i2c_start_w(uint8_t id)
ticks_t start = timer_clock();
while (i2c_start())
{
ticks_t start = timer_clock();
while (i2c_start())
{
- TWDR = id & ~
READ_
BIT;
+ TWDR = id & ~
I2C_READ
BIT;
TWCR = BV(TWINT) | BV(TWEN);
WAIT_TWI_READY;
TWCR = BV(TWINT) | BV(TWEN);
WAIT_TWI_READY;
@@
-125,7
+125,7
@@
bool i2c_start_r(uint8_t id)
{
if (i2c_start())
{
{
if (i2c_start())
{
- TWDR = id |
READ_
BIT;
+ TWDR = id |
I2C_READ
BIT;
TWCR = BV(TWINT) | BV(TWEN);
WAIT_TWI_READY;
TWCR = BV(TWINT) | BV(TWEN);
WAIT_TWI_READY;