diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2018-03-15 12:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 12:51:14 +0100 |
| commit | 3add406135c78d44ebc38d810b22af5da19cd296 (patch) | |
| tree | fd42297388ca04dc8ff202e40d491b73ff4c21d6 /os/hal/src | |
| parent | 345e218afd4f8009729dddc6eb541d8ec6a91565 (diff) | |
| parent | dabdfca04e5f470d1eb83f72f18269bd294031b6 (diff) | |
| download | ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.gz ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.bz2 ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.zip | |
Merge branch 'master' into update_tests
Diffstat (limited to 'os/hal/src')
| -rw-r--r-- | os/hal/src/hal_ee24xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/hal/src/hal_ee24xx.c b/os/hal/src/hal_ee24xx.c index 632ffbb..164530e 100644 --- a/os/hal/src/hal_ee24xx.c +++ b/os/hal/src/hal_ee24xx.c @@ -105,7 +105,7 @@ static systime_t calc_timeout(I2CDriver *i2cp, size_t txbytes, size_t rxbytes) { tmo = ((txbytes + rxbytes + 1) * bitsinbyte * 1000); tmo /= EEPROM_I2C_CLOCK; tmo += 10; /* some additional milliseconds to be safer */ - return MS2ST(tmo); + return TIME_MS2I(tmo); } /** |