diff options
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/g/i2cm.c | 14 | ||||
| -rw-r--r-- | chip/host/i2c.c | 20 | ||||
| -rw-r--r-- | chip/lm4/i2c.c | 6 |
3 files changed, 20 insertions, 20 deletions
diff --git a/chip/g/i2cm.c b/chip/g/i2cm.c index 4959cdbba0..0496fa1a93 100644 --- a/chip/g/i2cm.c +++ b/chip/g/i2cm.c @@ -247,7 +247,7 @@ static int i2cm_poll_for_complete(int port) return EC_ERROR_TIMEOUT; } -static uint32_t i2cm_create_inst(int slave_addr_flags, int is_write, +static uint32_t i2cm_create_inst(int periph_addr_flags, int is_write, size_t size, uint32_t flags) { uint32_t inst = 0; @@ -258,7 +258,7 @@ static uint32_t i2cm_create_inst(int slave_addr_flags, int is_write, * to be included. */ inst |= INST_START; - inst |= INST_DEVADDRVAL(I2C_GET_ADDR(slave_addr_flags)); + inst |= INST_DEVADDRVAL(I2C_GET_ADDR(periph_addr_flags)); inst |= INST_RWDEVADDR; } @@ -276,7 +276,7 @@ static uint32_t i2cm_create_inst(int slave_addr_flags, int is_write, return inst; } -static int i2cm_execute_sequence(int port, int slave_addr_flags, +static int i2cm_execute_sequence(int port, int periph_addr_flags, const uint8_t *out, int out_size, uint8_t *in, int in_size, int flags) @@ -309,7 +309,7 @@ static int i2cm_execute_sequence(int port, int slave_addr_flags, seq_flags &= ~I2C_XFER_STOP; /* Build sequence instruction */ - inst = i2cm_create_inst(slave_addr_flags, is_write, + inst = i2cm_create_inst(periph_addr_flags, is_write, batch_size, seq_flags); /* If this is a write - copy data into the FIFO. */ @@ -353,7 +353,7 @@ static int i2cm_execute_sequence(int port, int slave_addr_flags, /* Perform an i2c transaction. */ -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) { @@ -376,14 +376,14 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags, if (out_size) { /* Process write before read. */ - rv = i2cm_execute_sequence(port, slave_addr_flags, out, + rv = i2cm_execute_sequence(port, periph_addr_flags, out, out_size, NULL, 0, flags); if (rv != EC_SUCCESS) return rv; } if (in_size) - rv = i2cm_execute_sequence(port, slave_addr_flags, + rv = i2cm_execute_sequence(port, periph_addr_flags, NULL, 0, in, in_size, flags); return rv; 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) diff --git a/chip/lm4/i2c.c b/chip/lm4/i2c.c index 7cd06c430f..2392182415 100644 --- a/chip/lm4/i2c.c +++ b/chip/lm4/i2c.c @@ -165,7 +165,7 @@ int i2c_do_work(int port) 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) { @@ -193,7 +193,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags, CPRINTS("I2C%d Addr:%02X bad status 0x%02x, SCL=%d, SDA=%d", port, - I2C_GET_ADDR(slave_addr_flags), + I2C_GET_ADDR(periph_addr_flags), reg_mcs, i2c_get_line_levels(port) & I2C_LINE_SCL_HIGH, i2c_get_line_levels(port) & I2C_LINE_SDA_HIGH); @@ -219,7 +219,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags, } /* Set slave address for transmit */ - LM4_I2C_MSA(port) = (I2C_GET_ADDR(slave_addr_flags) << 1) & 0xff; + LM4_I2C_MSA(port) = (I2C_GET_ADDR(periph_addr_flags) << 1) & 0xff; /* Enable interrupts */ pd->task_waiting = task_get_current(); |