diff options
Diffstat (limited to 'chip/g/i2cm.c')
| -rw-r--r-- | chip/g/i2cm.c | 14 |
1 files changed, 7 insertions, 7 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; |