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 /driver/accelgyro_bmi160.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 'driver/accelgyro_bmi160.h')
| -rw-r--r-- | driver/accelgyro_bmi160.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/driver/accelgyro_bmi160.h b/driver/accelgyro_bmi160.h index 428338b080..4f9cc61b84 100644 --- a/driver/accelgyro_bmi160.h +++ b/driver/accelgyro_bmi160.h @@ -22,14 +22,10 @@ * | SPI device ID | 1 | * +-------------------------------+---+ */ -#define BMI160_SET_SPI_ADDRESS(_addr) (((_addr) << 1) | 1) -#define BMI160_IS_SPI(_addr) ((_addr) & 1) -#define BMI160_SPI_ADDRESS(_addr) ((_addr) >> 1) -#define BMI160_I2C_ADDRESS(_addr) (_addr) /* I2C addresses */ -#define BMI160_ADDR0 0xd0 -#define BMI160_ADDR1 0xd2 +#define BMI160_ADDR0__7bf 0x68 +#define BMI160_ADDR1__7bf 0x69 #define BMI160_CHIP_ID 0x00 #define BMI160_CHIP_ID_MAJOR 0xd1 @@ -490,10 +486,10 @@ void bmi160_interrupt(enum gpio_signal signal); #ifdef CONFIG_BMI160_SEC_I2C /* Functions to access the secondary device through the accel/gyro. */ -int bmi160_sec_raw_read8(const int port, const int addr, const uint8_t reg, - int *data_ptr); -int bmi160_sec_raw_write8(const int port, const int addr, const uint8_t reg, - int data); +int bmi160_sec_raw_read8__7bf(const int port, const uint16_t addr__7bf, + const uint8_t reg, int *data_ptr); +int bmi160_sec_raw_write8__7bf(const int port, const uint16_t addr__7bf, + const uint8_t reg, int data); #endif #ifdef CONFIG_CMD_I2C_STRESS_TEST_ACCEL |