diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-10-24 11:18:47 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-10-25 01:32:15 +0000 |
| commit | df541c6ffdc3ecf2802bad1c235e730cd29f8bfb (patch) | |
| tree | 5de1078e831ec5e3f3f7437b6e5e8c96b4156a69 /test | |
| parent | 4a1ecb67f9ff1745422aecdd5cc70a9f630d7dc8 (diff) | |
| download | chrome-ec-df541c6ffdc3ecf2802bad1c235e730cd29f8bfb.tar.gz | |
cleanup: rename I2C_PORT_HOST to I2C_PORT_MASTER
Previously, it was really confusing whether I2C_PORT_HOST meant the
port where the EC was the master, or the port used to talk to the AP.
No functional changes, just a global find/replace and some tidying of
unused comments.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms; pass unit tests
Change-Id: Ia591ba4577d3399729556e0234ba0db3a0e3c5ea
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/174546
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/led_spring.c | 2 | ||||
| -rw-r--r-- | test/sbs_charging.c | 2 | ||||
| -rw-r--r-- | test/test_config.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/led_spring.c b/test/led_spring.c index 8abda2bc07..e5778b4690 100644 --- a/test/led_spring.c +++ b/test/led_spring.c @@ -59,7 +59,7 @@ static void set_battery_soc(int soc) static int lp5562_i2c_write8(int port, int slave_addr, int offset, int data) { - if (port != I2C_PORT_HOST || slave_addr != LP5562_I2C_ADDR) + if (port != I2C_PORT_MASTER || slave_addr != LP5562_I2C_ADDR) return EC_ERROR_INVAL; if (offset == lp5562_failed_i2c_reg) return EC_ERROR_UNKNOWN; diff --git a/test/sbs_charging.c b/test/sbs_charging.c index fc74cc8624..77a6237394 100644 --- a/test/sbs_charging.c +++ b/test/sbs_charging.c @@ -105,7 +105,7 @@ static int test_charge_state(void) /* Attach battery again, charging */ ccprintf("[CHARGING TEST] Attach battery\n"); - test_attach_i2c(I2C_PORT_HOST, BATTERY_ADDR); + test_attach_i2c(I2C_PORT_BATTERY, BATTERY_ADDR); state = wait_charging_state(); TEST_ASSERT(state == PWR_STATE_CHARGE); diff --git a/test/test_config.h b/test/test_config.h index 9de2e0db8c..53144073e4 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -32,7 +32,7 @@ #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER_INPUT_CURRENT 4032 #define CONFIG_LED_DRIVER_LP5562 -#define I2C_PORT_HOST 1 +#define I2C_PORT_MASTER 1 #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER 1 #endif @@ -44,7 +44,7 @@ #define CONFIG_CHARGER_INPUT_CURRENT 4032 #define CONFIG_CHARGER_DISCHARGE_ON_AC int board_discharge_on_ac(int enabled); -#define I2C_PORT_HOST 1 +#define I2C_PORT_MASTER 1 #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER 1 #endif @@ -70,7 +70,7 @@ int board_discharge_on_ac(int enabled); #define CONFIG_TEMP_SENSOR #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER 1 -#define I2C_PORT_HOST 1 +#define I2C_PORT_MASTER 1 #endif #endif /* __CROS_EC_TEST_CONFIG_H */ |