diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-10-26 12:37:44 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-10-29 10:36:07 -0700 |
| commit | a7f2842c106530bb599b3ba74b57778db7df262f (patch) | |
| tree | cf8c25c2bb5b828df9941fb9f7696f98132b9edb | |
| parent | fc6b412589742976db12de4aa64137c03bfbf311 (diff) | |
| download | chrome-ec-a7f2842c106530bb599b3ba74b57778db7df262f.tar.gz | |
Rename POWERSTATE task to CHARGER
Since POWERSTATE is confusing whether it refers to battery power or
system power.
BUG=chrome-os-partner:15579
BRANCH=none
TEST=taskinfo; see CHARGER task
Change-Id: I5a237b1329cace4ce48ae39d8954c08a9912ed4b
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36707
| -rw-r--r-- | board/link/ec.tasklist | 2 | ||||
| -rw-r--r-- | common/build.mk | 2 | ||||
| -rw-r--r-- | common/charge_state.c | 2 | ||||
| -rw-r--r-- | common/lightbar.c | 2 | ||||
| -rw-r--r-- | test/charging.tasklist | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist index 9ee637efa4..1bfebe2463 100644 --- a/board/link/ec.tasklist +++ b/board/link/ec.tasklist @@ -19,7 +19,7 @@ TASK(LPC, lpc_task, NULL, TASK_STACK_SIZE) \ TASK(VBOOTHASH, vboot_hash_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \ - TASK(POWERSTATE, charge_state_machine_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \ TASK(TEMPSENSOR, temp_sensor_task, NULL, TASK_STACK_SIZE) \ TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \ TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \ diff --git a/common/build.mk b/common/build.mk index 9788e54847..11215bb6de 100644 --- a/common/build.mk +++ b/common/build.mk @@ -21,12 +21,12 @@ common-$(CONFIG_LPC)+=port80.o common-$(CONFIG_POWER_LED)+=power_led.o common-$(CONFIG_PSTORE)+=pstore_commands.o common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o +common-$(CONFIG_TASK_CHARGER)+=charge_state.o battery_precharge.o common-$(CONFIG_TASK_CONSOLE)+=console.o common-$(CONFIG_TASK_GAIAPOWER)+=gaia_power.o common-$(CONFIG_TASK_HOSTCMD)+=host_command.o host_event_commands.o common-$(CONFIG_TASK_I8042CMD)+=i8042.o keyboard.o common-$(CONFIG_TASK_LIGHTBAR)+=lightbar.o -common-$(CONFIG_TASK_POWERSTATE)+=charge_state.o battery_precharge.o common-$(CONFIG_TASK_TEMPSENSOR)+=temp_sensor.o common-$(CONFIG_TASK_THERMAL)+=thermal.o common-$(CONFIG_TASK_VBOOTHASH)+=sha256.o vboot_hash.o diff --git a/common/charge_state.c b/common/charge_state.c index c84efcb8dd..8f82656b7e 100644 --- a/common/charge_state.c +++ b/common/charge_state.c @@ -804,7 +804,7 @@ void charge_state_machine_task(void) static void charge_hook(void) { /* Wake up the task now */ - task_wake(TASK_ID_POWERSTATE); + task_wake(TASK_ID_CHARGER); } DECLARE_HOOK(HOOK_CHIPSET_RESUME, charge_hook, HOOK_PRIO_DEFAULT); DECLARE_HOOK(HOOK_AC_CHANGE, charge_hook, HOOK_PRIO_DEFAULT); diff --git a/common/lightbar.c b/common/lightbar.c index c6e971e77a..e2d1b50162 100644 --- a/common/lightbar.c +++ b/common/lightbar.c @@ -268,7 +268,7 @@ static void get_battery_level(void) if (demo_mode) return; -#ifdef CONFIG_TASK_POWERSTATE +#ifdef CONFIG_TASK_CHARGER pct = charge_get_percent(); st.battery_is_charging = (PWR_STATE_DISCHARGE != charge_get_state()); #endif diff --git a/test/charging.tasklist b/test/charging.tasklist index 6ec7287373..778b0e9491 100644 --- a/test/charging.tasklist +++ b/test/charging.tasklist @@ -19,7 +19,7 @@ TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \ TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \ TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \ - TASK(POWERSTATE, charge_state_machine_task, NULL, TASK_STACK_SIZE) \ + TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \ TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \ TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \ TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ |