From de804c94d5c897a2d93584a852a91df531dac07e Mon Sep 17 00:00:00 2001 From: batt Date: Mon, 6 Oct 2008 17:21:53 +0000 Subject: [PATCH 1/1] Merged from external project: ********** r22412 | batt | 2008-10-03 12:46:25 +0200 (Fri, 03 Oct 2008) | 1 line Rename READ_BIT to I2C_READBIT. ********** git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1875 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/avr/drv/i2c_avr.c | 4 ++-- bertos/drv/i2c.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bertos/cpu/avr/drv/i2c_avr.c b/bertos/cpu/avr/drv/i2c_avr.c index fe3a4eb1..61a5bdea 100644 --- 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()) { - TWDR = id & ~READ_BIT; + TWDR = id & ~I2C_READBIT; TWCR = BV(TWINT) | BV(TWEN); WAIT_TWI_READY; @@ -125,7 +125,7 @@ bool i2c_start_r(uint8_t id) { if (i2c_start()) { - TWDR = id | READ_BIT; + TWDR = id | I2C_READBIT; TWCR = BV(TWINT) | BV(TWEN); WAIT_TWI_READY; diff --git a/bertos/drv/i2c.h b/bertos/drv/i2c.h index b4098d0e..f09ec44f 100644 --- a/bertos/drv/i2c.h +++ b/bertos/drv/i2c.h @@ -40,7 +40,7 @@ #include -#define READ_BIT BV(0) +#define I2C_READBIT BV(0) void i2c_init(void); bool i2c_start_w(uint8_t id); -- 2.25.1