summaryrefslogtreecommitdiff
path: root/chip/nrf51
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2015-05-22 17:17:47 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-05-27 19:40:00 +0000
commit1b2f6b64510c061ddabd8d6a3d5e01fc71a68712 (patch)
treea1564c27d1bce516e8ab4433aeff30b7526124fe /chip/nrf51
parent315afdff429f08dd91193883348bc74e4f9edfb1 (diff)
downloadchrome-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/nrf51')
-rw-r--r--chip/nrf51/i2c.c4
1 files changed, 2 insertions, 2 deletions
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;