diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-01-03 15:53:55 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-07 04:53:20 +0000 |
| commit | 5a4b239981a76aa9e98325bc082c67cbdfe487de (patch) | |
| tree | eda7b0278dff3eaf03a3cba4e4d7ac576edd1a67 /test | |
| parent | 4e27a42ff9d2b7bb566b6bc455404657a3250c91 (diff) | |
| download | chrome-ec-5a4b239981a76aa9e98325bc082c67cbdfe487de.tar.gz | |
rename power_state* to charge_state*
Those are actually charge state, not power state. Rename the misleading
names.
BUG=chrome-os-partner:24832
BRANCH=link,falco,samus,rambi,peppy,spring,pit,snow
TEST=build only because no name conflicts.
make clean BOARD=link && make -j32 BOARD=link && \
make clean BOARD=falco && make -j 32 BOARD=falco && \
make clean BOARD=samus && make -j 32 BOARD=samus && \
make clean BOARD=rambi && make -j 32 BOARD=rambi && \
make clean BOARD=peppy && make -j 32 BOARD=peppy && \
make clean BOARD=snow && make -j 32 BOARD=snow && \
make clean BOARD=spring && make -j 32 BOARD=spring && \
make clean BOARD=pit && make -j 32 BOARD=pit && \
make clean BOARD=nyan && make -j 32 BOARD=nyan && \
make runtests -j 32 && make tests -j 32 BOARD=link && \
make tests -j 32 BOARD=falco && make tests -j 32 BOARD=samus && \
make tests -j 32 BOARD=rambi && make tests -j 32 BOARD=peppy && \
make tests -j 32 BOARD=snow && make tests -j 32 BOARD=spring && \
make tests -j 32 BOARD=pit && make tests -j 32 BOARD=nyan
Change-Id: Ie15052d5a7dbd97d519303d37260945346a27779
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181505
Reviewed-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/adapter.c | 2 | ||||
| -rw-r--r-- | test/adapter_externs.h | 2 | ||||
| -rw-r--r-- | test/led_spring.c | 2 | ||||
| -rw-r--r-- | test/sbs_charging.c | 4 |
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 */ |