From 473bd883b60fd5b00377766dae2bacad246de0d2 Mon Sep 17 00:00:00 2001 From: Denis Brockus Date: Tue, 16 Jul 2019 15:10:11 -0600 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1704792 Reviewed-by: Jack Rosenthal --- driver/charger/bd9995x.c | 10 +++++----- driver/charger/bd9995x.h | 4 ++-- driver/charger/bq24192.h | 2 +- driver/charger/bq24715.c | 4 ++-- driver/charger/bq24773.h | 16 ++++++++-------- driver/charger/bq25703.h | 2 +- driver/charger/bq25710.c | 4 ++-- driver/charger/bq25710.h | 2 +- driver/charger/bq2589x.h | 6 +++--- driver/charger/isl923x.c | 16 ++++++++-------- driver/charger/isl923x.h | 4 ++-- driver/charger/isl9241.h | 4 ++-- driver/charger/rt946x.c | 6 +++--- driver/charger/rt946x.h | 6 +++--- driver/charger/sy21612.c | 6 +++--- driver/charger/sy21612.h | 4 ++-- 16 files changed, 48 insertions(+), 48 deletions(-) (limited to 'driver/charger') diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index e9d2e601a1..f121b858dd 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -131,7 +131,7 @@ static inline int ch_raw_read16(int cmd, int *param, /* Map the Charge command code to appropriate region */ mutex_lock(&bd9995x_map_mutex); if (charger_map_cmd != map_cmd) { - rv = i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + rv = i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, BD9995X_CMD_MAP_SET, map_cmd); if (rv) { charger_map_cmd = BD9995X_INVALID_COMMAND; @@ -141,7 +141,7 @@ static inline int ch_raw_read16(int cmd, int *param, charger_map_cmd = map_cmd; } - rv = i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + rv = i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, cmd, param); bd9995x_read_cleanup: @@ -158,8 +158,8 @@ static inline int ch_raw_write16(int cmd, int param, /* Map the Charge command code to appropriate region */ mutex_lock(&bd9995x_map_mutex); if (charger_map_cmd != map_cmd) { - rv = i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, - BD9995X_CMD_MAP_SET, map_cmd); + rv = i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, + BD9995X_CMD_MAP_SET, map_cmd); if (rv) { charger_map_cmd = BD9995X_INVALID_COMMAND; goto bd9995x_write_cleanup; @@ -168,7 +168,7 @@ static inline int ch_raw_write16(int cmd, int param, charger_map_cmd = map_cmd; } - rv = i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + rv = i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, cmd, param); bd9995x_write_cleanup: diff --git a/driver/charger/bd9995x.h b/driver/charger/bd9995x.h index 6a946835bc..491f4bdeac 100644 --- a/driver/charger/bd9995x.h +++ b/driver/charger/bd9995x.h @@ -8,8 +8,8 @@ #ifndef __CROS_EC_BD9995X_H #define __CROS_EC_BD9995X_H -#define BD9995X_ADDR__7bf 0x09 -#define I2C_ADDR_CHARGER__7bf BD9995X_ADDR__7bf +#define BD9995X_ADDR_FLAGS 0x09 +#define I2C_ADDR_CHARGER_FLAGS BD9995X_ADDR_FLAGS #define BD9995X_CHARGER_NAME "bd9995x" #define BD99955_CHIP_ID 0x221 diff --git a/driver/charger/bq24192.h b/driver/charger/bq24192.h index 188cb24942..b82fe93a02 100644 --- a/driver/charger/bq24192.h +++ b/driver/charger/bq24192.h @@ -8,7 +8,7 @@ #ifndef __CROS_EC_BQ24192_H #define __CROS_EC_BQ24192_H -#define BQ24192_ADDR__7bf 0x6b +#define BQ24192_ADDR_FLAGS 0x6b /* Registers */ #define BQ24192_REG_INPUT_CTRL 0x0 diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c index bd38ed5f95..8a8d9b894f 100644 --- a/driver/charger/bq24715.c +++ b/driver/charger/bq24715.c @@ -37,13 +37,13 @@ static const struct charger_info bq24725_charger_info = { static inline int sbc_read(int cmd, int *param) { - return i2c_read16__7bf(I2C_PORT_CHARGER, CHARGER_ADDR__7bf, + return i2c_read16(I2C_PORT_CHARGER, CHARGER_ADDR_FLAGS, cmd, param); } static inline int sbc_write(int cmd, int param) { - return i2c_write16__7bf(I2C_PORT_CHARGER, CHARGER_ADDR__7bf, + return i2c_write16(I2C_PORT_CHARGER, CHARGER_ADDR_FLAGS, cmd, param); } diff --git a/driver/charger/bq24773.h b/driver/charger/bq24773.h index 0191da9ac4..910ad8da25 100644 --- a/driver/charger/bq24773.h +++ b/driver/charger/bq24773.h @@ -12,8 +12,8 @@ #include "i2c.h" /* I2C address */ -#define BQ24770_ADDR__7bf 0x09 -#define BQ24773_ADDR__7bf 0x6a +#define BQ24770_ADDR_FLAGS 0x09 +#define BQ24773_ADDR_FLAGS 0x6a /* Chip specific commands */ #define BQ24770_CHARGE_OPTION0 0x12 @@ -72,7 +72,7 @@ #ifdef CONFIG_CHARGER_BQ24770 #define CHARGER_NAME "bq24770" - #define I2C_ADDR_CHARGER__7bf BQ24770_ADDR__7bf + #define I2C_ADDR_CHARGER_FLAGS BQ24770_ADDR_FLAGS #define REG_CHARGE_OPTION0 BQ24770_CHARGE_OPTION0 #define REG_CHARGE_OPTION1 BQ24770_CHARGE_OPTION1 @@ -88,7 +88,7 @@ #elif defined(CONFIG_CHARGER_BQ24773) #define CHARGER_NAME "bq24773" - #define I2C_ADDR_CHARGER__7bf BQ24773_ADDR__7bf + #define I2C_ADDR_CHARGER_FLAGS BQ24773_ADDR_FLAGS #define REG_CHARGE_OPTION0 BQ24773_CHARGE_OPTION0 #define REG_CHARGE_OPTION1 BQ24773_CHARGE_OPTION1 @@ -105,26 +105,26 @@ #ifdef CONFIG_CHARGER_BQ24773 static inline int raw_read8(int offset, int *value) { - return i2c_read8__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_read8(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } static inline int raw_write8(int offset, int value) { - return i2c_write8__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_write8(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } #endif static inline int raw_read16(int offset, int *value) { - return i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } static inline int raw_write16(int offset, int value) { - return i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } diff --git a/driver/charger/bq25703.h b/driver/charger/bq25703.h index c568285e5c..f715824f63 100644 --- a/driver/charger/bq25703.h +++ b/driver/charger/bq25703.h @@ -9,7 +9,7 @@ #define __CROS_EC_BQ25703_H /* I2C Interface */ -#define BQ25703_I2C_ADDR1__7bf 0x6B +#define BQ25703_I2C_ADDR1_FLAGS 0x6B /* * BC1.2 minimum voltage threshold for BQ25703. diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c index 3f9f03b805..e7bb4d3b66 100644 --- a/driver/charger/bq25710.c +++ b/driver/charger/bq25710.c @@ -62,13 +62,13 @@ static const struct charger_info bq25710_charger_info = { static inline int raw_read16(int offset, int *value) { - return i2c_read16__7bf(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1__7bf, + return i2c_read16(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1_FLAGS, offset, value); } static inline int raw_write16(int offset, int value) { - return i2c_write16__7bf(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1__7bf, + return i2c_write16(I2C_PORT_CHARGER, BQ25710_SMBUS_ADDR1_FLAGS, offset, value); } diff --git a/driver/charger/bq25710.h b/driver/charger/bq25710.h index a4861e50ca..c3880be13c 100644 --- a/driver/charger/bq25710.h +++ b/driver/charger/bq25710.h @@ -9,7 +9,7 @@ #define __CROS_EC_BQ25710_H /* SMBUS Interface */ -#define BQ25710_SMBUS_ADDR1__7bf 0x09 +#define BQ25710_SMBUS_ADDR1_FLAGS 0x09 #define BQ25710_BC12_MIN_VOLTAGE_MV 1408 diff --git a/driver/charger/bq2589x.h b/driver/charger/bq2589x.h index 38dd944dd4..95bbf4c226 100644 --- a/driver/charger/bq2589x.h +++ b/driver/charger/bq2589x.h @@ -99,13 +99,13 @@ /* Variant-specific configuration */ #if defined(CONFIG_CHARGER_BQ25890) #define BQ2589X_DEVICE_ID BQ25890_DEVICE_ID -#define BQ2589X_ADDR__7bf (0x6A) +#define BQ2589X_ADDR_FLAGS 0x6A #elif defined(CONFIG_CHARGER_BQ25895) #define BQ2589X_DEVICE_ID BQ25895_DEVICE_ID -#define BQ2589X_ADDR__7bf (0x6A) +#define BQ2589X_ADDR_FLAGS 0x6A #elif defined(CONFIG_CHARGER_BQ25892) #define BQ2589X_DEVICE_ID BQ25892_DEVICE_ID -#define BQ2589X_ADDR__7bf (0x6B) +#define BQ2589X_ADDR_FLAGS 0x6B #else #error BQ2589X unknown variant #endif diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c index a2d6e08977..f2bd51b927 100644 --- a/driver/charger/isl923x.c +++ b/driver/charger/isl923x.c @@ -56,19 +56,19 @@ static const struct charger_info isl9237_charger_info = { static inline int raw_read8(int offset, int *value) { - return i2c_read8__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_read8(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } static inline int raw_read16(int offset, int *value) { - return i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } static inline int raw_write16(int offset, int value) { - return i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + return i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, offset, value); } @@ -575,7 +575,7 @@ static int print_amon_bmon(enum amon_bmon amon, int direction, int adc, curr, reg, ret; #ifdef CONFIG_CHARGER_ISL9238 - ret = i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + ret = i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, ISL9238_REG_CONTROL3, ®); if (ret) return ret; @@ -585,7 +585,7 @@ static int print_amon_bmon(enum amon_bmon amon, int direction, reg |= ISL9238_C3_AMON_BMON_DIRECTION; else reg &= ~ISL9238_C3_AMON_BMON_DIRECTION; - ret = i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + ret = i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, ISL9238_REG_CONTROL3, reg); if (ret) return ret; @@ -593,7 +593,7 @@ static int print_amon_bmon(enum amon_bmon amon, int direction, mutex_lock(&control1_mutex); - ret = i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + ret = i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, ISL923X_REG_CONTROL1, ®); if (!ret) { /* Switch between AMON/BMON */ @@ -604,7 +604,7 @@ static int print_amon_bmon(enum amon_bmon amon, int direction, /* Enable monitor */ reg &= ~ISL923X_C1_DISABLE_MON; - ret = i2c_write16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + ret = i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, ISL923X_REG_CONTROL1, reg); } @@ -689,7 +689,7 @@ static void dump_reg_range(int low, int high) for (reg = low; reg <= high; reg++) { CPRINTF("[%Xh] = ", reg); - rv = i2c_read16__7bf(I2C_PORT_CHARGER, I2C_ADDR_CHARGER__7bf, + rv = i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, reg, ®val); if (!rv) CPRINTF("0x%04x\n", regval); diff --git a/driver/charger/isl923x.h b/driver/charger/isl923x.h index 09a627d251..6f76106157 100644 --- a/driver/charger/isl923x.h +++ b/driver/charger/isl923x.h @@ -8,7 +8,7 @@ #ifndef __CROS_EC_ISL923X_H #define __CROS_EC_ISL923X_H -#define ISL923X_ADDR__7bf (0x09) +#define ISL923X_ADDR_FLAGS (0x09) /* Registers */ #define ISL923X_REG_CHG_CURRENT 0x14 @@ -304,7 +304,7 @@ enum isl9237_fsm_state { #define INPUT_I_MIN 4 #define INPUT_I_STEP 4 -#define I2C_ADDR_CHARGER__7bf ISL923X_ADDR__7bf +#define I2C_ADDR_CHARGER_FLAGS ISL923X_ADDR_FLAGS #endif /* __CROS_EC_ISL923X_H */ /** diff --git a/driver/charger/isl9241.h b/driver/charger/isl9241.h index e145abc610..7fe3f5e579 100644 --- a/driver/charger/isl9241.h +++ b/driver/charger/isl9241.h @@ -8,8 +8,8 @@ #ifndef __CROS_EC_ISL9241_H #define __CROS_EC_ISL9241_H -#define ISL9241_ADDR__7bf 0x09 -#define I2C_ADDR_CHARGER__7bf ISL9241_ADDR__7bf +#define ISL9241_ADDR_FLAGS 0x09 +#define I2C_ADDR_CHARGER_FLAGS ISL9241_ADDR_FLAGS #define CHARGER_NAME "ISL9241" #define CHARGE_V_MAX 18304 diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 4b7b9d13c6..514829d6f6 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -145,17 +145,17 @@ static const uint16_t rt946x_boost_current[] = { static int rt946x_read8(int reg, int *val) { - return i2c_read8__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, reg, val); + return i2c_read8(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, reg, val); } static int rt946x_write8(int reg, int val) { - return i2c_write8__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, reg, val); + return i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, reg, val); } static int rt946x_block_write(int reg, const uint8_t *val, int len) { - return i2c_write_block__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, + return i2c_write_block(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, reg, val, len); } diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index c5132702be..b30721367a 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -583,15 +583,15 @@ #if defined(CONFIG_CHARGER_RT9466) #define RT946X_CHARGER_NAME "rt9466" #define RT946X_VENDOR_ID 0x80 - #define RT946X_ADDR__7bf 0x53 + #define RT946X_ADDR_FLAGS 0x53 #elif defined(CONFIG_CHARGER_RT9467) #define RT946X_CHARGER_NAME "rt9467" #define RT946X_VENDOR_ID 0x90 - #define RT946X_ADDR__7bf 0x5B + #define RT946X_ADDR_FLAGS 0x5B #elif defined(CONFIG_CHARGER_MT6370) #define RT946X_CHARGER_NAME "mt6370" #define RT946X_VENDOR_ID 0xE0 - #define RT946X_ADDR__7bf 0x34 + #define RT946X_ADDR_FLAGS 0x34 #else #error "No suitable charger option defined" #endif diff --git a/driver/charger/sy21612.c b/driver/charger/sy21612.c index 0ec3a570e3..c8751ce208 100644 --- a/driver/charger/sy21612.c +++ b/driver/charger/sy21612.c @@ -22,7 +22,7 @@ static int sy21612_clear_set_reg(int reg, int clear, int set) { int val, old_val, rv; - rv = i2c_read8__7bf(I2C_PORT_SY21612, SY21612_ADDR__7bf, reg, &old_val); + rv = i2c_read8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS, reg, &old_val); if (rv) return rv; @@ -31,7 +31,7 @@ static int sy21612_clear_set_reg(int reg, int clear, int set) val |= set; if (val != old_val || clear || set) - rv = i2c_write8__7bf(I2C_PORT_SY21612, SY21612_ADDR__7bf, + rv = i2c_write8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS, reg, val); return rv; @@ -39,7 +39,7 @@ static int sy21612_clear_set_reg(int reg, int clear, int set) static int sy21612_read(int reg, int *val) { - return i2c_read8__7bf(I2C_PORT_SY21612, SY21612_ADDR__7bf, reg, val); + return i2c_read8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS, reg, val); } int sy21612_enable_regulator(int enable) diff --git a/driver/charger/sy21612.h b/driver/charger/sy21612.h index 8b72966223..befb8e6a35 100644 --- a/driver/charger/sy21612.h +++ b/driver/charger/sy21612.h @@ -10,8 +10,8 @@ #include "gpio.h" -#ifndef SY21612_ADDR__7bf -#define SY21612_ADDR__7bf 0x71 +#ifndef SY21612_ADDR_FLAGS +#define SY21612_ADDR_FLAGS 0x71 #endif enum sy21612_switching_freq { -- cgit v1.2.1