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/usb_mux | |
| 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/usb_mux')
| -rw-r--r-- | driver/usb_mux/it5205.c | 4 | ||||
| -rw-r--r-- | driver/usb_mux/it5205.h | 4 | ||||
| -rw-r--r-- | driver/usb_mux/pi3usb30532.c | 6 | ||||
| -rw-r--r-- | driver/usb_mux/ps874x.c | 6 |
4 files changed, 8 insertions, 12 deletions
diff --git a/driver/usb_mux/it5205.c b/driver/usb_mux/it5205.c index 745a341591..9a6f71dade 100644 --- a/driver/usb_mux/it5205.c +++ b/driver/usb_mux/it5205.c @@ -16,12 +16,12 @@ static int it5205_read(int port, uint8_t reg, int *val) { - return i2c_read8__7bf(I2C_PORT_USB_MUX, MUX_ADDR__7bf(port), reg, val); + return i2c_read8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); } static int it5205_write(int port, uint8_t reg, uint8_t val) { - return i2c_write8__7bf(I2C_PORT_USB_MUX, MUX_ADDR__7bf(port), reg, val); + return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); } struct mux_chip_id_t { diff --git a/driver/usb_mux/it5205.h b/driver/usb_mux/it5205.h index 02d389ad36..9e9c4ccfcc 100644 --- a/driver/usb_mux/it5205.h +++ b/driver/usb_mux/it5205.h @@ -9,8 +9,8 @@ #define __CROS_EC_IT5205_H /* I2C interface */ -#define IT5205_I2C_ADDR1__7bf (0x48) -#define IT5205_I2C_ADDR2__7bf (0x58) +#define IT5205_I2C_ADDR1_FLAGS 0x48 +#define IT5205_I2C_ADDR2_FLAGS 0x58 /* Chip ID registers */ #define IT5205_REG_CHIP_ID3 0x4 diff --git a/driver/usb_mux/pi3usb30532.c b/driver/usb_mux/pi3usb30532.c index 24f9cbd095..e5af1b90a6 100644 --- a/driver/usb_mux/pi3usb30532.c +++ b/driver/usb_mux/pi3usb30532.c @@ -20,8 +20,7 @@ static int pi3usb30532_read(int port, uint8_t reg, uint8_t *val) * Second byte read will be vendor ID. * Third byte read will be selection control. */ - res = i2c_read16__7bf(I2C_PORT_USB_MUX, - MUX_ADDR__7bf(port), + res = i2c_read16(I2C_PORT_USB_MUX, MUX_ADDR(port), 0, &read); if (res) return res; @@ -39,8 +38,7 @@ static int pi3usb30532_write(int port, uint8_t reg, uint8_t val) if (reg != PI3USB30532_REG_CONTROL) return EC_ERROR_UNKNOWN; - return i2c_write8__7bf(I2C_PORT_USB_MUX, - MUX_ADDR__7bf(port), + return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), 0, val); } diff --git a/driver/usb_mux/ps874x.c b/driver/usb_mux/ps874x.c index 73bb39bce5..db13180c1c 100644 --- a/driver/usb_mux/ps874x.c +++ b/driver/usb_mux/ps874x.c @@ -13,15 +13,13 @@ static inline int ps874x_read(int port, uint8_t reg, int *val) { - return i2c_read8__7bf(I2C_PORT_USB_MUX, - MUX_ADDR__7bf(port), + return i2c_read8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); } static inline int ps874x_write(int port, uint8_t reg, uint8_t val) { - return i2c_write8__7bf(I2C_PORT_USB_MUX, - MUX_ADDR__7bf(port), + return i2c_write8(I2C_PORT_USB_MUX, MUX_ADDR(port), reg, val); } |