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 /include/usb_mux.h | |
| 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 'include/usb_mux.h')
| -rw-r--r-- | include/usb_mux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/usb_mux.h b/include/usb_mux.h index 94e2d6dbac..8351bdfe28 100644 --- a/include/usb_mux.h +++ b/include/usb_mux.h @@ -27,7 +27,7 @@ typedef uint8_t mux_state_t; */ #define MUX_PORT_AND_ADDR(port, addr) ((port << 8) | (addr & 0xFF)) #define MUX_PORT(port) (usb_muxes[port].port_addr >> 8) -#define MUX_ADDR__7bf(port) (usb_muxes[port].port_addr & 0xFF) +#define MUX_ADDR(port) (usb_muxes[port].port_addr & 0xFF) /* Mux state attributes */ /* TODO: Directly use USB_PD_MUX_* everywhere and remove these 3 defines */ @@ -143,21 +143,21 @@ extern struct usb_mux usb_muxes[]; static inline int mux_write(int port, int reg, int val) { return usb_muxes[port].flags & USB_MUX_FLAG_NOT_TCPC - ? i2c_write8__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), reg, val) + ? i2c_write8(MUX_PORT(port), MUX_ADDR(port), reg, val) : tcpc_write(port, reg, val); } static inline int mux_read(int port, int reg, int *val) { return usb_muxes[port].flags & USB_MUX_FLAG_NOT_TCPC - ? i2c_read8__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), reg, val) + ? i2c_read8(MUX_PORT(port), MUX_ADDR(port), reg, val) : tcpc_read(port, reg, val); } static inline int mux_write16(int port, int reg, int val) { return usb_muxes[port].flags & USB_MUX_FLAG_NOT_TCPC - ? i2c_write16__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), + ? i2c_write16(MUX_PORT(port), MUX_ADDR(port), reg, val) : tcpc_write16(port, reg, val); } @@ -165,7 +165,7 @@ static inline int mux_write16(int port, int reg, int val) static inline int mux_read16(int port, int reg, int *val) { return usb_muxes[port].flags & USB_MUX_FLAG_NOT_TCPC - ? i2c_read16__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), + ? i2c_read16(MUX_PORT(port), MUX_ADDR(port), reg, val) : tcpc_read16(port, reg, val); } |