diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2019-06-25 12:44:16 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-19 21:11:02 +0000 |
| commit | d1a18f82ed831d4e640336ff5571f5fa64bc7b36 (patch) | |
| tree | c46aeb6136de1c27c66e3d5f662e9620161bef7b /include/usb_mux.h | |
| parent | 1f14229fa7e499dfcee07d17add187598ff0a46c (diff) | |
| download | chrome-ec-d1a18f82ed831d4e640336ff5571f5fa64bc7b36.tar.gz | |
Use 7bit I2C/SPI slave addresses in EC
Opt for 7bit slave addresses in EC code. If 8bit is
expected by a driver, make it local and show this in
the naming.
Use __7b, __7bf and __8b as name extensions for i2c/spi
addresses used in the EC codebase. __7b indicates a
7bit address by itself. __7bf indicates a 7bit address
with optional flags attached. __8b indicates a 8bit
address by itself.
Allow space for 10bit addresses, even though this is
not currently being used by any of our attached
devices.
These extensions are for verification purposes only and
will be removed in the last pass of this ticket. I want
to make sure the variable names reflect the type to help
eliminate future 7/8/7-flags confusion.
BUG=chromium:971296
BRANCH=none
TEST=make buildall -j
Change-Id: I2fc3d1b52ce76184492b2aaff3060f486ca45f45
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1699893
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'include/usb_mux.h')
| -rw-r--r-- | include/usb_mux.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/usb_mux.h b/include/usb_mux.h index ff2704d2b6..94e2d6dbac 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(port) (usb_muxes[port].port_addr & 0xFF) +#define MUX_ADDR__7bf(port) (usb_muxes[port].port_addr & 0xFF) /* Mux state attributes */ /* TODO: Directly use USB_PD_MUX_* everywhere and remove these 3 defines */ @@ -143,29 +143,31 @@ 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(MUX_PORT(port), MUX_ADDR(port), reg, val) - : tcpc_write(port, reg, val); + ? i2c_write8__7bf(MUX_PORT(port), MUX_ADDR__7bf(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(MUX_PORT(port), MUX_ADDR(port), reg, val) - : tcpc_read(port, reg, val); + ? i2c_read8__7bf(MUX_PORT(port), MUX_ADDR__7bf(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(MUX_PORT(port), MUX_ADDR(port), reg, val) - : tcpc_write16(port, reg, val); + ? i2c_write16__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), + reg, val) + : tcpc_write16(port, reg, val); } static inline int mux_read16(int port, int reg, int *val) { return usb_muxes[port].flags & USB_MUX_FLAG_NOT_TCPC - ? i2c_read16(MUX_PORT(port), MUX_ADDR(port), reg, val) - : tcpc_read16(port, reg, val); + ? i2c_read16__7bf(MUX_PORT(port), MUX_ADDR__7bf(port), + reg, val) + : tcpc_read16(port, reg, val); } #endif /* CONFIG_USB_PD_TCPM_MUX */ |