diff options
author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-22 17:17:47 -0700 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-27 19:40:00 +0000 |
commit | 1b2f6b64510c061ddabd8d6a3d5e01fc71a68712 (patch) | |
tree | a1564c27d1bce516e8ab4433aeff30b7526124fe /chip | |
parent | 315afdff429f08dd91193883348bc74e4f9edfb1 (diff) | |
download | chrome-ec-1b2f6b64510c061ddabd8d6a3d5e01fc71a68712.tar.gz |
i2c: Make i2c_xfer a wrapper function to chip_i2c_xfer
i2c_xfer was previously implemented at the chip-level, but now we want
to add some global retry logic. Rename the chip-level i2c_xfer functions
to chip_i2c_xfer and add a new global wrapper function i2c_xfer.
BUG=chrome-os-partner:39613
TEST=Run "battery" from EC console on Cyan, verify that values + strings
are correctly printed.
BRANCH=None
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: If37c85cc3cf94fd53feb6931553e10c30ad6cad6
Reviewed-on: https://chromium-review.googlesource.com/272939
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r-- | chip/lm4/i2c.c | 8 | ||||
-rw-r--r-- | chip/mec1322/i2c.c | 16 | ||||
-rw-r--r-- | chip/npcx/i2c.c | 4 | ||||
-rw-r--r-- | chip/nrf51/i2c.c | 4 | ||||
-rw-r--r-- | chip/stm32/i2c-stm32f.c | 4 | ||||
-rw-r--r-- | chip/stm32/i2c-stm32f0.c | 4 | ||||
-rw-r--r-- | chip/stm32/i2c-stm32l.c | 6 |
7 files changed, 23 insertions, 23 deletions
diff --git a/chip/lm4/i2c.c b/chip/lm4/i2c.c index 5f3b9bfc74..72d02d2043 100644 --- a/chip/lm4/i2c.c +++ b/chip/lm4/i2c.c @@ -106,8 +106,8 @@ int i2c_do_work(int port) /* * Error after starting; abort transfer. Ignore errors at * start because arbitration and timeout errors are taken care - * of in i2c_xfer(), and slave ack failures will automatically - * clear once we send a start condition. + * of in chip_i2c_xfer(), and slave ack failures will + * automatically clear once we send a start condition. */ pd->err = EC_ERROR_UNKNOWN; return 0; @@ -168,8 +168,8 @@ int i2c_do_work(int port) return 0; } -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, - uint8_t *in, int in_size, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, + uint8_t *in, int in_size, int flags) { struct i2c_port_data *pd = pdata + port; uint32_t reg_mcs = LM4_I2C_MCS(port); diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c index e7254a01f9..e80d6cb5f8 100644 --- a/chip/mec1322/i2c.c +++ b/chip/mec1322/i2c.c @@ -212,8 +212,8 @@ static inline void push_in_buf(uint8_t **in, uint8_t val, int skip) } } -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, - uint8_t *in, int in_size, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, + uint8_t *in, int in_size, int flags) { int i; int controller; @@ -267,11 +267,11 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, for (i = 0; i < out_size; ++i) { if (wait_byte_done(controller)) - goto err_i2c_xfer; + goto err_chip_i2c_xfer; MEC1322_I2C_DATA(controller) = out[i]; } if (wait_byte_done(controller)) - goto err_i2c_xfer; + goto err_chip_i2c_xfer; /* * Send STOP bit if the stop flag is on, and caller @@ -302,12 +302,12 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, for (i = 0; i < bytes_to_read; ++i) { if (wait_byte_done(controller)) - goto err_i2c_xfer; + goto err_chip_i2c_xfer; push_in_buf(&in, MEC1322_I2C_DATA(controller), skip); skip = 0; } if (wait_byte_done(controller)) - goto err_i2c_xfer; + goto err_chip_i2c_xfer; if (send_stop) { /* @@ -317,7 +317,7 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, MEC1322_I2C_CTRL(controller) = CTRL_ESO | CTRL_ENI; push_in_buf(&in, MEC1322_I2C_DATA(controller), skip); if (wait_byte_done(controller)) - goto err_i2c_xfer; + goto err_chip_i2c_xfer; /* Send STOP */ MEC1322_I2C_CTRL(controller) = @@ -339,7 +339,7 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, return EC_ERROR_UNKNOWN; return EC_SUCCESS; -err_i2c_xfer: +err_chip_i2c_xfer: /* Send STOP and return error */ MEC1322_I2C_CTRL(controller) = CTRL_PIN | CTRL_ESO | CTRL_STO | CTRL_ACK; diff --git a/chip/npcx/i2c.c b/chip/npcx/i2c.c index a8002d7573..03b48c2864 100644 --- a/chip/npcx/i2c.c +++ b/chip/npcx/i2c.c @@ -374,8 +374,8 @@ DECLARE_IRQ(NPCX_IRQ_SMB4, i2c3_interrupt, 2); /*****************************************************************************/ /* IC specific low-level driver */ -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, - uint8_t *in, int in_size, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, + uint8_t *in, int in_size, int flags) { volatile struct i2c_status *p_status = i2c_stsobjs + port; diff --git a/chip/nrf51/i2c.c b/chip/nrf51/i2c.c index 6ef109ea0e..668f4c6863 100644 --- a/chip/nrf51/i2c.c +++ b/chip/nrf51/i2c.c @@ -243,8 +243,8 @@ static int i2c_master_read(int port, int slave_addr, uint8_t *data, int size) return EC_SUCCESS; } -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, - uint8_t *in, int in_bytes, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, + uint8_t *in, int in_bytes, int flags) { int rv = EC_SUCCESS; diff --git a/chip/stm32/i2c-stm32f.c b/chip/stm32/i2c-stm32f.c index 75d1587c76..1fab9c3b7c 100644 --- a/chip/stm32/i2c-stm32f.c +++ b/chip/stm32/i2c-stm32f.c @@ -703,8 +703,8 @@ static int i2c_master_receive(int port, int slave_addr, uint8_t *data, return wait_until_stop_sent(port); } -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, - uint8_t *in, int in_bytes, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, + uint8_t *in, int in_bytes, int flags) { int rv; diff --git a/chip/stm32/i2c-stm32f0.c b/chip/stm32/i2c-stm32f0.c index b1b530e600..1dfe7d9b36 100644 --- a/chip/stm32/i2c-stm32f0.c +++ b/chip/stm32/i2c-stm32f0.c @@ -358,8 +358,8 @@ DECLARE_IRQ(IRQ_SLAVE, i2c2_event_interrupt, 2); /*****************************************************************************/ /* Interface */ -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, - uint8_t *in, int in_bytes, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, + uint8_t *in, int in_bytes, int flags) { int rv = EC_SUCCESS; int i; diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c index 510c138410..90fe7aa0d7 100644 --- a/chip/stm32/i2c-stm32l.c +++ b/chip/stm32/i2c-stm32l.c @@ -165,8 +165,8 @@ static void i2c_init_port(const struct i2c_port_t *p) /*****************************************************************************/ /* Interface */ -int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, - uint8_t *in, int in_bytes, int flags) +int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, + uint8_t *in, int in_bytes, int flags) { int started = (flags & I2C_XFER_START) ? 0 : 1; int rv = EC_SUCCESS; @@ -302,7 +302,7 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_bytes, */ if (rv == I2C_ERROR_FAILED_START) { const struct i2c_port_t *p = i2c_ports; - CPRINTS("i2c_xfer start error; " + CPRINTS("chip_i2c_xfer start error; " "unwedging and resetting i2c %d", port); i2c_unwedge(port); |