diff options
| author | Yuval Peress <peress@chromium.org> | 2020-10-30 13:16:22 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-02 19:15:23 +0000 |
| commit | 13323e77ff91a85154cfa5f504ed4609fb8cbfc7 (patch) | |
| tree | 81709bca853db34a2eeb18a691514d0ba1ece1f8 /chip/stm32/i2c-stm32l4.c | |
| parent | f0e84c2df23995c61f7690a47f30f259bcde940e (diff) | |
| download | chrome-ec-13323e77ff91a85154cfa5f504ed4609fb8cbfc7.tar.gz | |
Replace I2C_GET_ADDR with I2C_STRIP_FLAGS
The new I2C_STRIP_FLAGS macro was added to avoid conflict with
Zephyr's macro. This CL performs the migration to that new API.
BRANCH=none
BUG=b:172067439
TEST=make runtests -j and built for various boards: eve, volteer,
arcada_ish, atlas, hatch, kohaku, nocturne, samus, and scarlet
Change-Id: I0583b647435db96ec268f186252b367bdc4118a6
Signed-off-by: Yuval Peress <peress@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2511097
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'chip/stm32/i2c-stm32l4.c')
| -rw-r--r-- | chip/stm32/i2c-stm32l4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c index 615b25f208..58e19ad968 100644 --- a/chip/stm32/i2c-stm32l4.c +++ b/chip/stm32/i2c-stm32l4.c @@ -307,7 +307,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags, const uint8_t *out, int out_bytes, uint8_t *in, int in_bytes, int flags) { - int addr_8bit = I2C_GET_ADDR(slave_addr_flags) << 1; + int addr_8bit = I2C_STRIP_FLAGS(slave_addr_flags) << 1; int rv = EC_SUCCESS; int i; int xfer_start = flags & I2C_XFER_START; @@ -458,7 +458,7 @@ void i2c_init(void) | STM32_I2C_CR1_ADDRIE | STM32_I2C_CR1_STOPIE | STM32_I2C_CR1_NACKIE; STM32_I2C_OAR1(I2C_PORT_EC) = 0x8000 - | (I2C_GET_ADDR(CONFIG_HOSTCMD_I2C_ADDR_FLAGS) << 1); + | (I2C_STRIP_FLAGS(CONFIG_HOSTCMD_I2C_ADDR_FLAGS) << 1); task_enable_irq(IRQ_SLAVE); #endif } |