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/mec1322/i2c.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/mec1322/i2c.c')
-rw-r--r-- | chip/mec1322/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c index 69344d8390..33b6c6242c 100644 --- a/chip/mec1322/i2c.c +++ b/chip/mec1322/i2c.c @@ -287,7 +287,7 @@ int chip_i2c_xfer(const int port, if (out_size) { if (send_start) { MEC1322_I2C_DATA(controller) = - (uint8_t)(I2C_GET_ADDR(slave_addr_flags) + (uint8_t)(I2C_STRIP_FLAGS(slave_addr_flags) << 1); /* Clock out the slave address, sending START bit */ @@ -332,7 +332,7 @@ int chip_i2c_xfer(const int port, CTRL_ENI; MEC1322_I2C_DATA(controller) = - (uint8_t)(I2C_GET_ADDR(slave_addr_flags) + (uint8_t)(I2C_STRIP_FLAGS(slave_addr_flags) << 1) | 0x01; |