You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/19 22:39:54 UTC
[2/4] incubator-mynewt-core git commit: nrf52xxx hal i2c;
updated arguments for read()/write().
nrf52xxx hal i2c; updated arguments for read()/write().
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/98371913
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/98371913
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/98371913
Branch: refs/heads/develop
Commit: 98371913fe5a1793678b9887ff712e17c2802b13
Parents: 1e83698
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Oct 19 15:32:45 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Oct 19 15:36:24 2016 -0700
----------------------------------------------------------------------
hw/mcu/nordic/nrf51xxx/src/hal_i2c.c | 4 ++--
hw/mcu/nordic/nrf52xxx/src/hal_i2c.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/98371913/hw/mcu/nordic/nrf51xxx/src/hal_i2c.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_i2c.c b/hw/mcu/nordic/nrf51xxx/src/hal_i2c.c
index 583b498..b2d929d 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_i2c.c
@@ -111,7 +111,7 @@ err:
int
hal_i2c_master_write(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timo)
+ uint32_t timo, uint8_t last_op)
{
struct nrf51_hal_i2c *i2c;
int rc;
@@ -131,7 +131,7 @@ err:
int
hal_i2c_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timo)
+ uint32_t timo, uint8_t last_op)
{
struct nrf51_hal_i2c *i2c;
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/98371913/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
index 3b7b670..f6dd221 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
@@ -111,7 +111,7 @@ err:
int
hal_i2c_master_write(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timo)
+ uint32_t timo, uint8_t last_op)
{
struct nrf52_hal_i2c *i2c;
int rc;
@@ -131,7 +131,7 @@ err:
int
hal_i2c_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
- uint32_t timo)
+ uint32_t timo, uint8_t last_op)
{
struct nrf52_hal_i2c *i2c;
int rc;