diff options
Diffstat (limited to 'platforms/avr/drivers/i2c_master.c')
| -rw-r--r-- | platforms/avr/drivers/i2c_master.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c index c1a7b5f72d..524494c99d 100644 --- a/platforms/avr/drivers/i2c_master.c +++ b/platforms/avr/drivers/i2c_master.c @@ -64,7 +64,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {      uint16_t timeout_timer = timer_read();      while (!(TWCR & (1 << TWINT))) { -        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) { +        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {              return I2C_STATUS_TIMEOUT;          }      } @@ -81,7 +81,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {      timeout_timer = timer_read();      while (!(TWCR & (1 << TWINT))) { -        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) { +        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {              return I2C_STATUS_TIMEOUT;          }      } @@ -102,7 +102,7 @@ i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {      i2c_status_t status;      do {          status = i2c_start_impl(address, time_slice); -    } while ((status < 0) && ((timeout == I2C_TIMEOUT_INFINITE) || (timer_elapsed(timeout_timer) < timeout))); +    } while ((status < 0) && ((timeout == I2C_TIMEOUT_INFINITE) || (timer_elapsed(timeout_timer) <= timeout)));      return status;  } @@ -114,7 +114,7 @@ i2c_status_t i2c_write(uint8_t data, uint16_t timeout) {      uint16_t timeout_timer = timer_read();      while (!(TWCR & (1 << TWINT))) { -        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) { +        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {              return I2C_STATUS_TIMEOUT;          }      } @@ -132,7 +132,7 @@ int16_t i2c_read_ack(uint16_t timeout) {      uint16_t timeout_timer = timer_read();      while (!(TWCR & (1 << TWINT))) { -        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) { +        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {              return I2C_STATUS_TIMEOUT;          }      } @@ -147,7 +147,7 @@ int16_t i2c_read_nack(uint16_t timeout) {      uint16_t timeout_timer = timer_read();      while (!(TWCR & (1 << TWINT))) { -        if ((timeout != I2C_TIMEOUT_INFINITE) && ((timer_read() - timeout_timer) >= timeout)) { +        if ((timeout != I2C_TIMEOUT_INFINITE) && (timer_elapsed(timeout_timer) > timeout)) {              return I2C_STATUS_TIMEOUT;          }      } | 
