summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/adapter.c2
-rw-r--r--test/adapter_externs.h2
-rw-r--r--test/led_spring.c2
-rw-r--r--test/sbs_charging.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/test/adapter.c b/test/adapter.c
index f64197b387..2bfd570bd0 100644
--- a/test/adapter.c
+++ b/test/adapter.c
@@ -24,7 +24,7 @@
/* Local state */
static int mock_id;
static int mock_current;
-static struct power_state_context ctx;
+static struct charge_state_context ctx;
static void test_reset_mocks(void)
{
diff --git a/test/adapter_externs.h b/test/adapter_externs.h
index 9cb7c562b3..c866b23c1b 100644
--- a/test/adapter_externs.h
+++ b/test/adapter_externs.h
@@ -16,6 +16,6 @@ extern int ac_turbo;
extern int ap_is_throttled;
extern void check_threshold(int current, struct adapter_limits *lim);
extern struct adapter_limits batt_limits[NUM_BATT_THRESHOLDS];
-extern void watch_battery_closely(struct power_state_context *ctx);
+extern void watch_battery_closely(struct charge_state_context *ctx);
#endif /* __ADAPTER_EXTERNS_H */
diff --git a/test/led_spring.c b/test/led_spring.c
index e5778b4690..e1170a7992 100644
--- a/test/led_spring.c
+++ b/test/led_spring.c
@@ -26,7 +26,7 @@ static uint8_t lp5562_reg[LP5562_NUM_WATCH_REG];
static enum charging_state mock_charge_state = ST_IDLE;
static int lp5562_failed_i2c_reg = -1;
-static const char * const state_names[] = POWER_STATE_NAME_TABLE;
+static const char * const state_names[] = CHARGE_STATE_NAME_TABLE;
/*****************************************************************************/
/* Mock functions */
diff --git a/test/sbs_charging.c b/test/sbs_charging.c
index 77a6237394..1e068cd22a 100644
--- a/test/sbs_charging.c
+++ b/test/sbs_charging.c
@@ -67,7 +67,7 @@ static void test_setup(void)
static int wait_charging_state(void)
{
- enum power_state state;
+ enum charge_state state;
task_wake(TASK_ID_CHARGER);
msleep(WAIT_CHARGER_TASK);
state = charge_get_state();
@@ -85,7 +85,7 @@ static int charge_control(enum ec_charge_control_mode mode)
static int test_charge_state(void)
{
- enum power_state state;
+ enum charge_state state;
state = wait_charging_state();
/* Plug AC, charging at 1000mAh */