You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2019/01/08 13:11:17 UTC
[mynewt-core] 02/06: hw/util/i2cn: Fix parameter type
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 1547d9519d516aa32789fe7add52dfa0e2815de0
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon Jan 7 11:16:14 2019 +0100
hw/util/i2cn: Fix parameter type
OS ticks should be always os_time_t to avoid confusion.
---
hw/util/i2cn/include/i2cn/i2cn.h | 4 ++--
hw/util/i2cn/src/i2cn.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/util/i2cn/include/i2cn/i2cn.h b/hw/util/i2cn/include/i2cn/i2cn.h
index 78d76ef..9e7aa08 100644
--- a/hw/util/i2cn/include/i2cn/i2cn.h
+++ b/hw/util/i2cn/include/i2cn/i2cn.h
@@ -44,7 +44,7 @@ extern "C" {
* HAL_I2C_ERR_[...] code on failure.
*/
int i2cn_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timeout, uint8_t last_op, int retries);
+ os_time_t timeout, uint8_t last_op, int retries);
/**
* @brief Writes to an I2C slave, retrying the specified number of times on
@@ -62,7 +62,7 @@ int i2cn_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
* HAL_I2C_ERR_[...] code on failure.
*/
int i2cn_master_write(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timeout, uint8_t last_op, int retries);
+ os_time_t timeout, uint8_t last_op, int retries);
#ifdef __cplusplus
}
diff --git a/hw/util/i2cn/src/i2cn.c b/hw/util/i2cn/src/i2cn.c
index 2322e1f..2ec1113 100644
--- a/hw/util/i2cn/src/i2cn.c
+++ b/hw/util/i2cn/src/i2cn.c
@@ -22,7 +22,7 @@
int
i2cn_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timeout, uint8_t last_op, int retries)
+ os_time_t timeout, uint8_t last_op, int retries)
{
int rc = 0;
int i;
@@ -44,7 +44,7 @@ i2cn_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
int
i2cn_master_write(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timeout, uint8_t last_op, int retries)
+ os_time_t timeout, uint8_t last_op, int retries)
{
int rc = 0;
int i;