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/nrf51 | |
| 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/nrf51')
| -rw-r--r-- | chip/nrf51/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/nrf51/i2c.c b/chip/nrf51/i2c.c index 09a4a210e6..ff23152c89 100644 --- a/chip/nrf51/i2c.c +++ b/chip/nrf51/i2c.c @@ -146,7 +146,7 @@ static int i2c_master_write(const int port, const uint16_t slave_addr_flags, int bytes_sent; int timeout = I2C_TIMEOUT; - NRF51_TWI_ADDRESS(port) = I2C_GET_ADDR(slave_addr_flags); + NRF51_TWI_ADDRESS(port) = I2C_STRIP_FLAGS(slave_addr_flags); /* Clear the sent bit */ NRF51_TWI_TXDSENT(port) = 0; @@ -192,7 +192,7 @@ static int i2c_master_read(const int port, const uint16_t slave_addr_flags, int curr_byte; int timeout = I2C_TIMEOUT; - NRF51_TWI_ADDRESS(port) = I2C_GET_ADDR(slave_addr_flags); + NRF51_TWI_ADDRESS(port) = I2C_STRIP_FLAGS(slave_addr_flags); if (size == 1) /* Last byte: stop after this one. */ NRF51_PPI_TEP(i2c_ppi_chan[port]) = |