summaryrefslogtreecommitdiff
path: root/chip/host/i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'chip/host/i2c.c')
-rw-r--r--chip/host/i2c.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/chip/host/i2c.c b/chip/host/i2c.c
index 5b863c1d41..c35f60f528 100644
--- a/chip/host/i2c.c
+++ b/chip/host/i2c.c
@@ -14,7 +14,7 @@
struct i2c_dev {
int port;
- uint16_t slave_addr_flags;
+ uint16_t periph_addr_flags;
int valid;
};
@@ -28,7 +28,7 @@ static void detach_init(void)
}
DECLARE_HOOK(HOOK_INIT, detach_init, HOOK_PRIO_FIRST);
-int test_detach_i2c(const int port, const uint16_t slave_addr_flags)
+int test_detach_i2c(const int port, const uint16_t periph_addr_flags)
{
int i;
@@ -40,20 +40,20 @@ int test_detach_i2c(const int port, const uint16_t slave_addr_flags)
return EC_ERROR_OVERFLOW;
detached_devs[i].port = port;
- detached_devs[i].slave_addr_flags = slave_addr_flags;
+ detached_devs[i].periph_addr_flags = periph_addr_flags;
detached_devs[i].valid = 1;
return EC_SUCCESS;
}
-int test_attach_i2c(const int port, const uint16_t slave_addr_flags)
+int test_attach_i2c(const int port, const uint16_t periph_addr_flags)
{
int i;
for (i = 0; i < MAX_DETACHED_DEV_COUNT; ++i)
if (detached_devs[i].valid &&
detached_devs[i].port == port &&
- detached_devs[i].slave_addr_flags == slave_addr_flags)
+ detached_devs[i].periph_addr_flags == periph_addr_flags)
break;
if (i == MAX_DETACHED_DEV_COUNT)
@@ -64,29 +64,29 @@ int test_attach_i2c(const int port, const uint16_t slave_addr_flags)
}
static int test_check_detached(const int port,
- const uint16_t slave_addr_flags)
+ const uint16_t periph_addr_flags)
{
int i;
for (i = 0; i < MAX_DETACHED_DEV_COUNT; ++i)
if (detached_devs[i].valid &&
detached_devs[i].port == port &&
- detached_devs[i].slave_addr_flags == slave_addr_flags)
+ detached_devs[i].periph_addr_flags == periph_addr_flags)
return 1;
return 0;
}
-int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
+int chip_i2c_xfer(const int port, const uint16_t periph_addr_flags,
const uint8_t *out, int out_size,
uint8_t *in, int in_size, int flags)
{
const struct test_i2c_xfer *p;
int rv;
- if (test_check_detached(port, slave_addr_flags))
+ if (test_check_detached(port, periph_addr_flags))
return EC_ERROR_UNKNOWN;
for (p = __test_i2c_xfer; p < __test_i2c_xfer_end; ++p) {
- rv = p->routine(port, slave_addr_flags,
+ rv = p->routine(port, periph_addr_flags,
out, out_size,
in, in_size, flags);
if (rv != EC_ERROR_INVAL)