diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2019-07-16 15:10:11 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-20 23:09:18 +0000 |
| commit | 473bd883b60fd5b00377766dae2bacad246de0d2 (patch) | |
| tree | 992d9f03104277934c22c869eceb634e2cf5f7ec /driver/bc12 | |
| parent | 053491b560d2c4e374bb739373d8ae25c41f6315 (diff) | |
| download | chrome-ec-473bd883b60fd5b00377766dae2bacad246de0d2.tar.gz | |
Remove __7b, __8b and __7bf
The extentions were added to make the compiler perform most
of the verification that the conversion was being done correctly
to remove 8bit addressing as the standard I2C/SPI address type.
Now that the compiler has verified the code, the extra
extentions are being removed
BUG=chromium:971296
BRANCH=none
TEST=make buildall -j
TEST=verify sensor functionality on arcada_ish
Change-Id: I36894f8bb9daefb5b31b5e91577708f6f9af2a4f
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1704792
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'driver/bc12')
| -rw-r--r-- | driver/bc12/pi3usb9201.c | 8 | ||||
| -rw-r--r-- | driver/bc12/pi3usb9201.h | 10 | ||||
| -rw-r--r-- | driver/bc12/pi3usb9281.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/driver/bc12/pi3usb9201.c b/driver/bc12/pi3usb9201.c index 2fdb9719a5..2ecc9e7419 100644 --- a/driver/bc12/pi3usb9201.c +++ b/driver/bc12/pi3usb9201.c @@ -62,15 +62,15 @@ static const struct bc12_status bc12_chg_limits[] = { static inline int raw_read8(int port, int offset, int *value) { - return i2c_read8__7bf(pi3usb2901_bc12_chips[port].i2c_port, - pi3usb2901_bc12_chips[port].i2c_addr__7bf, + return i2c_read8(pi3usb2901_bc12_chips[port].i2c_port, + pi3usb2901_bc12_chips[port].i2c_addr_flags, offset, value); } static inline int raw_write8(int port, int offset, int value) { - return i2c_write8__7bf(pi3usb2901_bc12_chips[port].i2c_port, - pi3usb2901_bc12_chips[port].i2c_addr__7bf, + return i2c_write8(pi3usb2901_bc12_chips[port].i2c_port, + pi3usb2901_bc12_chips[port].i2c_addr_flags, offset, value); } diff --git a/driver/bc12/pi3usb9201.h b/driver/bc12/pi3usb9201.h index ba379ffff3..3a94fdf5ad 100644 --- a/driver/bc12/pi3usb9201.h +++ b/driver/bc12/pi3usb9201.h @@ -6,10 +6,10 @@ /* PI3USB9201 USB BC 1.2 Charger Detector driver definitions */ /* I2C address */ -#define PI3USB9201_I2C_ADDR_0__7bf 0x5C -#define PI3USB9201_I2C_ADDR_1__7bf 0x5D -#define PI3USB9201_I2C_ADDR_2__7bf 0x5E -#define PI3USB9201_I2C_ADDR_3__7bf 0x5F +#define PI3USB9201_I2C_ADDR_0_FLAGS 0x5C +#define PI3USB9201_I2C_ADDR_1_FLAGS 0x5D +#define PI3USB9201_I2C_ADDR_2_FLAGS 0x5E +#define PI3USB9201_I2C_ADDR_3_FLAGS 0x5F #define PI3USB9201_REG_CTRL_1 0x0 #define PI3USB9201_REG_CTRL_2 0x1 @@ -33,7 +33,7 @@ struct pi3usb2901_config_t { const int i2c_port; - const int i2c_addr__7bf; + const int i2c_addr_flags; }; enum pi3usb9201_mode { diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c index 8d88d5a1e8..b0610f693b 100644 --- a/driver/bc12/pi3usb9281.c +++ b/driver/bc12/pi3usb9281.c @@ -24,7 +24,7 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) /* I2C address */ -#define PI3USB9281_I2C_ADDR__7bf (0x25) +#define PI3USB9281_I2C_ADDR_FLAGS 0x25 /* Delay values */ #define PI3USB9281_SW_RESET_DELAY 20 @@ -69,7 +69,7 @@ static uint8_t pi3usb9281_do_read(int port, uint8_t reg, int with_lock) if (with_lock) select_chip(port); - res = i2c_read8__7bf(chip->i2c_port, PI3USB9281_I2C_ADDR__7bf, + res = i2c_read8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, reg, &val); if (with_lock) @@ -100,7 +100,7 @@ static int pi3usb9281_do_write( if (with_lock) select_chip(port); - res = i2c_write8__7bf(chip->i2c_port, PI3USB9281_I2C_ADDR__7bf, + res = i2c_write8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, reg, val); if (with_lock) |