aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/include/hal_i2c.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
commit6bbfd2126f0cd20c733b78682d322250d8223d93 (patch)
tree9f9856ad4e17aeee3dba156e5211eb0579061844 /os/hal/include/hal_i2c.h
parent97442e7faaed76d0da347c96df3da2122e033bd1 (diff)
parent5596d3e69e0d1c7c9a7b07f9bf83416d2c25cd8b (diff)
downloadChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.gz
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.bz2
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.zip
Reintegrated RT5 point1 branch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10833 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include/hal_i2c.h')
-rw-r--r--os/hal/include/hal_i2c.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/include/hal_i2c.h b/os/hal/include/hal_i2c.h
index c9c8409cb..379c56308 100644
--- a/os/hal/include/hal_i2c.h
+++ b/os/hal/include/hal_i2c.h
@@ -145,11 +145,11 @@ extern "C" {
i2caddr_t addr,
const uint8_t *txbuf, size_t txbytes,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout);
+ sysinterval_t timeout);
msg_t i2cMasterReceiveTimeout(I2CDriver *i2cp,
i2caddr_t addr,
uint8_t *rxbuf, size_t rxbytes,
- systime_t timeout);
+ sysinterval_t timeout);
#if I2C_USE_MUTUAL_EXCLUSION == TRUE
void i2cAcquireBus(I2CDriver *i2cp);
void i2cReleaseBus(I2CDriver *i2cp);