Rename tasks to HOOKS and CHIPSET

Rename tasks

TICK -> HOOKS
  The hooks task handles more than just the TICK hook now.

X86POWER -> CHIPSET
GAIAPOWER -> CHIPSET
  Kinda kludgy that the name of the task controls which chipset source gets
  included.  Change this to a CONFIG_CHIPSET_{X86,GAIA} #define to make it
  easier to support future chipsets.  Also, rename the task function to
  chipset_task() so ec.tasklist is chipset-agnostic.

No code changes, just renaming constants and functions.

BUG=none
BRANCH=none
TEST=build bds,link,daisy,snow,spring

Change-Id: I163ce1cd27b2d8d030d42bb1f7eb46b880c244fb
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/45805

35 files changed, 112 insertions, 110 deletions

diff --git a/board/bds/ec.tasklist b/board/bds/ec.tasklist
index b6ceedcfd5..d5f66a6570 100644
--- a/board/bds/ec.tasklist
+++ b/board/bds/ec.tasklist
@@ -15,6 +15,6 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/board/daisy/board.c b/board/daisy/board.c
index f8612a1231..10a5c2e39f 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -33,14 +33,14 @@
 #define GPIO_KB_OUTPUT (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OPEN_DRAIN)
 
 /* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
 void gaia_power_event(enum gpio_signal signal);
 void gaia_suspend_event(enum gpio_signal signal);
 void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
 #endif
 #ifndef CONFIG_TASK_KEYSCAN
 #define matrix_interrupt NULL
diff --git a/board/daisy/board.h b/board/daisy/board.h
index 0f7f2169a4..0e342b19b9 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,13 +14,14 @@
 /* Use USART1 as console serial port */
 #define CONFIG_CONSOLE_UART 1
 
-/* use I2C for host communication */
-#define CONFIG_I2C
-
 /* Debug features */
 #define CONFIG_PANIC_HELP
 #define CONFIG_ASSERT_HELP
 
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_I2C
+
 /* Allow dangerous commands all the time, since we don't have a write protect
  * switch. */
 /* TODO: (crosbug.com/p/9986) This is a serious security hole and should be
diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist
index 1097aeb4e1..12e777fee8 100644
--- a/board/daisy/ec.tasklist
+++ b/board/daisy/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,11 +15,11 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERLED, power_led_task, NULL, TASK_STACK_SIZE) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
-	TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/link/board.c b/board/link/board.c
index fd3c573d26..476be6dc79 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "x86_power.h"
 
-#ifndef CONFIG_TASK_X86POWER
+#ifndef CONFIG_CHIPSET_X86
 #define x86_power_interrupt NULL
 #endif
 #ifndef CONFIG_TASK_SWITCH
diff --git a/board/link/board.h b/board/link/board.h
index cc7463c961..b5ced2755d 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -17,6 +17,7 @@
 #define CONFIG_BATTERY_LINK
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24725
+#define CONFIG_CHIPSET_X86
 #define CONFIG_CONSOLE_CMDHELP
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_LPC
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist
index 51ec29cdd6..c6a37c2b9c 100644
--- a/board/link/ec.tasklist
+++ b/board/link/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,13 +15,13 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
 	TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
 	TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
diff --git a/board/mccroskey/ec.tasklist b/board/mccroskey/ec.tasklist
index dab971ccb3..6820cd84b4 100644
--- a/board/mccroskey/ec.tasklist
+++ b/board/mccroskey/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, 360) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/snow/board.c b/board/snow/board.c
index cf5ac61ab4..507a732c07 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -28,15 +28,16 @@
 #define HARD_RESET_TIMEOUT_MS 5
 
 /* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
 void gaia_power_event(enum gpio_signal signal);
 void gaia_suspend_event(enum gpio_signal signal);
 void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
 #endif
+
 #ifndef CONFIG_TASK_KEYSCAN
 #define matrix_interrupt NULL
 #endif
diff --git a/board/snow/board.h b/board/snow/board.h
index f7f3683322..448b3bb17b 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,17 +14,16 @@
 /* Use USART1 as console serial port */
 #define CONFIG_CONSOLE_UART 1
 
-/* use I2C for host communication */
-#define CONFIG_I2C
-
-#define CONFIG_CONFIGURE_BOARD_LATE
-#define CONFIG_HOST_COMMAND_STATUS
-
 /* Debug features */
 #define CONFIG_PANIC_HELP
 #define CONFIG_ASSERT_HELP
 #define CONFIG_CONSOLE_CMDHELP
 
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_CONFIGURE_BOARD_LATE
+#define CONFIG_HOST_COMMAND_STATUS
+#define CONFIG_I2C
 #undef  CONFIG_TASK_PROFILING
 #define CONFIG_WATCHDOG_HELP
 
diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist
index 80d808ede9..375d534b64 100644
--- a/board/snow/ec.tasklist
+++ b/board/snow/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,11 +15,11 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERLED, power_led_task, NULL, 256) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, 360) \
-	TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/board/spring/board.c b/board/spring/board.c
index 774f466814..cd98e21d7e 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -46,18 +46,20 @@ uint8_t breathing_prog[] = {0x41, 0xff,  /* 0x80 -> 0x0 */
 			    0x00, 0x00}; /* Repeat */
 
 /* GPIO interrupt handlers prototypes */
-#ifndef CONFIG_TASK_GAIAPOWER
-#define gaia_power_event NULL
-#define gaia_suspend_event NULL
-#define gaia_lid_event NULL
-#else
+#ifdef CONFIG_CHIPSET_GAIA
 void gaia_power_event(enum gpio_signal signal);
 void gaia_suspend_event(enum gpio_signal signal);
 void gaia_lid_event(enum gpio_signal signal);
+#else
+#define gaia_power_event NULL
+#define gaia_suspend_event NULL
+#define gaia_lid_event NULL
 #endif
+
 #ifndef CONFIG_TASK_KEYSCAN
 #define matrix_interrupt NULL
 #endif
+
 void usb_charge_interrupt(enum gpio_signal signal);
 
 /* GPIO signal list.  Must match order from enum gpio_signal. */
diff --git a/board/spring/board.h b/board/spring/board.h
index 1132f759c5..7c39ac54e4 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -14,16 +14,15 @@
 /* Use USART1 as console serial port */
 #define CONFIG_CONSOLE_UART 1
 
-/* use I2C for host communication */
-#define CONFIG_I2C
-
-#define CONFIG_HOST_COMMAND_STATUS
-
 /* Debug features */
 #define CONFIG_PANIC_HELP
 #define CONFIG_ASSERT_HELP
 #define CONFIG_CONSOLE_CMDHELP
 
+/* Optional features */
+#define CONFIG_CHIPSET_GAIA
+#define CONFIG_HOST_COMMAND_STATUS
+#define CONFIG_I2C
 #undef  CONFIG_TASK_PROFILING
 #define CONFIG_WATCHDOG_HELP
 
diff --git a/board/spring/ec.tasklist b/board/spring/ec.tasklist
index c29cca16df..0daf6727d7 100644
--- a/board/spring/ec.tasklist
+++ b/board/spring/ec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,10 +15,10 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, 256) \
-	TASK(GAIAPOWER, gaia_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/common/build.mk b/common/build.mk
index 9ea9322a23..7fb75d3a39 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -12,6 +12,8 @@ common-y+=gpio_commands.o version.o printf.o queue.o
 common-$(CONFIG_BATTERY_BQ20Z453)+=battery_bq20z453.o
 common-$(CONFIG_BATTERY_LINK)+=battery_link.o
 common-$(CONFIG_CHARGER_BQ24725)+=charger_bq24725.o
+common-$(CONFIG_CHIPSET_GAIA)+=gaia_power.o
+common-$(CONFIG_CHIPSET_X86)+=x86_power.o
 common-$(CONFIG_PMU_TPS65090)+=pmu_tps65090.o pmu_tps65090_charger.o
 common-$(CONFIG_EOPTION)+=eoption.o
 common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o
@@ -26,13 +28,11 @@ 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_THERMAL)+=thermal.o
 common-$(CONFIG_TASK_VBOOTHASH)+=sha256.o vboot_hash.o
-common-$(CONFIG_TASK_X86POWER)+=x86_power.o
 common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o
 common-$(CONFIG_TMP006)+=tmp006.o
 common-$(CONFIG_TSU6721)+=tsu6721.o
diff --git a/common/gaia_power.c b/common/gaia_power.c
index 20875cb0ce..c795f2f615 100644
--- a/common/gaia_power.c
+++ b/common/gaia_power.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -60,7 +60,7 @@
  *
  * So after power button is pressed:
 
- * Normal case: User releases power button and gaia_power_task() goes
+ * Normal case: User releases power button and chipset_task() goes
  *    into the inner loop, waiting for next event to occur (power button
  *    press or XPSHOLD == 0).
  *
@@ -236,14 +236,14 @@ void gaia_suspend_event(enum gpio_signal signal)
 void gaia_power_event(enum gpio_signal signal)
 {
 	/* Wake up the task */
-	task_wake(TASK_ID_GAIAPOWER);
+	task_wake(TASK_ID_CHIPSET);
 }
 
 void gaia_lid_event(enum gpio_signal signal)
 {
 	/* inform power task that lid switch has changed */
 	lid_changed = 1;
-	task_wake(TASK_ID_GAIAPOWER);
+	task_wake(TASK_ID_CHIPSET);
 }
 
 int gaia_power_init(void)
@@ -488,7 +488,7 @@ static int next_pwr_event(void)
 
 /*****************************************************************************/
 
-void gaia_power_task(void)
+void chipset_task(void)
 {
 	int value;
 
@@ -537,7 +537,7 @@ static int command_force_power(int argc, char **argv)
 	force_signal = GPIO_KB_PWR_ON_L;
 	force_value = 1;
 	/* Wake up the task */
-	task_wake(TASK_ID_GAIAPOWER);
+	task_wake(TASK_ID_CHIPSET);
 	/* Wait 100 ms */
 	msleep(100);
 	/* Release power button */
@@ -599,7 +599,7 @@ static int command_power(int argc, char **argv)
 		return EC_ERROR_PARAM1;
 
 	ccprintf("[%T PB Requesting power %s]\n", power_req_name[power_request]);
-	task_wake(TASK_ID_GAIAPOWER);
+	task_wake(TASK_ID_CHIPSET);
 
 	return EC_SUCCESS;
 }
@@ -620,7 +620,7 @@ void system_warm_reboot(void)
 	gpio_set_level(GPIO_EN_PP3300, 0);
 
 	power_request = POWER_REQ_ON;
-	task_wake(TASK_ID_GAIAPOWER);
+	task_wake(TASK_ID_CHIPSET);
 
 	return;
 }
diff --git a/common/hooks.c b/common/hooks.c
index 4704992de0..97b2da107c 100644
--- a/common/hooks.c
+++ b/common/hooks.c
@@ -75,7 +75,7 @@ void hook_notify(enum hook_type type)
 	if (type == HOOK_AC_CHANGE) {
 		/* Store deferred hook and wake task */
 		atomic_or(&pending_hooks, 1 << type);
-		task_wake(TASK_ID_TICK);
+		task_wake(TASK_ID_HOOKS);
 	} else {
 		/* Notify now */
 		notify(type);
diff --git a/common/mock_x86_power.c b/common/mock_x86_power.c
index e7c24bedd9..0c84ac0508 100644
--- a/common/mock_x86_power.c
+++ b/common/mock_x86_power.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -66,7 +66,7 @@ void x86_power_interrupt(enum gpio_signal signal)
 }
 
 
-void x86_power_task(void)
+void chipset_task(void)
 {
 	/* Do nothing */
 	while (1)
diff --git a/common/x86_power.c b/common/x86_power.c
index 8b8968a2e3..6320b2e836 100644
--- a/common/x86_power.c
+++ b/common/x86_power.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -317,7 +317,7 @@ void chipset_exit_hard_off(void)
 	want_g3_exit = 1;
 
 	if (task_start_called())
-		task_wake(TASK_ID_X86POWER);
+		task_wake(TASK_ID_CHIPSET);
 }
 
 void chipset_throttle_cpu(int throttle)
@@ -335,7 +335,7 @@ void chipset_throttle_cpu(int throttle)
 static void x86_lid_change(void)
 {
 	/* Wake up the task to update power state */
-	task_wake(TASK_ID_X86POWER);
+	task_wake(TASK_ID_CHIPSET);
 }
 DECLARE_HOOK(HOOK_LID_CHANGE, x86_lid_change, HOOK_PRIO_DEFAULT);
 
@@ -348,7 +348,7 @@ static void x86_power_ac_change(void)
 
 		if (state == X86_G3) {
 			last_shutdown_time = get_time().val;
-			task_wake(TASK_ID_X86POWER);
+			task_wake(TASK_ID_CHIPSET);
 		}
 	}
 }
@@ -415,13 +415,13 @@ void x86_power_interrupt(enum gpio_signal signal)
 	update_in_signals();
 
 	/* Wake up the task */
-	task_wake(TASK_ID_X86POWER);
+	task_wake(TASK_ID_CHIPSET);
 }
 
 /*****************************************************************************/
 /* Task function */
 
-void x86_power_task(void)
+void chipset_task(void)
 {
 	uint64_t time_now;
 
diff --git a/test/charging.tasklist b/test/charging.tasklist
index b5ee86cfe7..244dfc2d77 100644
--- a/test/charging.tasklist
+++ b/test/charging.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,11 +15,11 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_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(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/flash_overwrite.tasklist b/test/flash_overwrite.tasklist
index 8ed7251437..7864a0a1fb 100644
--- a/test/flash_overwrite.tasklist
+++ b/test/flash_overwrite.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/flash_rw_erase.tasklist b/test/flash_rw_erase.tasklist
index fc65eeb63a..5d6e3d0c7b 100644
--- a/test/flash_rw_erase.tasklist
+++ b/test/flash_rw_erase.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/hello.tasklist b/test/hello.tasklist
index fc65eeb63a..5d6e3d0c7b 100644
--- a/test/hello.tasklist
+++ b/test/hello.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/kb_debounce.tasklist b/test/kb_debounce.tasklist
index 1b1fa5a050..ca7499f9a5 100644
--- a/test/kb_debounce.tasklist
+++ b/test/kb_debounce.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,10 +14,10 @@
  * 'd' in an opaque parameter passed to the routine at startup
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/kb_deghost.tasklist b/test/kb_deghost.tasklist
index 7b03c3f854..0dae312bb4 100644
--- a/test/kb_deghost.tasklist
+++ b/test/kb_deghost.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,10 +15,10 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/mutex.tasklist b/test/mutex.tasklist
index e27e9d385a..df7cb73e56 100644
--- a/test/mutex.tasklist
+++ b/test/mutex.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist
index ca28d23cd5..5ddb8285fc 100644
--- a/test/pingpong.tasklist
+++ b/test/pingpong.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/power_button.tasklist b/test/power_button.tasklist
index 9f62015695..a2dc5360fb 100644
--- a/test/power_button.tasklist
+++ b/test/power_button.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,10 +15,10 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist
index 74ad0db736..d74e98591b 100644
--- a/test/powerdemo.tasklist
+++ b/test/powerdemo.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,6 +15,6 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERDEMO, power_demo_task, NULL, TASK_STACK_SIZE)
diff --git a/test/scancode.tasklist b/test/scancode.tasklist
index 7d8e3c14a0..d4dee90a59 100644
--- a/test/scancode.tasklist
+++ b/test/scancode.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,10 +15,10 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/thermal.tasklist b/test/thermal.tasklist
index ad112f814a..5bb13bbc60 100644
--- a/test/thermal.tasklist
+++ b/test/thermal.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,9 +15,9 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist
index 00b31fb899..1763b91d6e 100644
--- a/test/timer_calib.tasklist
+++ b/test/timer_calib.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(TESTTMR, timer_calib_task, (void *)'T', TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist
index 82378ce6ec..69be9a127e 100644
--- a/test/timer_dos.tasklist
+++ b/test/timer_dos.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/timer_jump.tasklist b/test/timer_jump.tasklist
index ccb6fe7a4c..c6ad1a3856 100644
--- a/test/timer_jump.tasklist
+++ b/test/timer_jump.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,8 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/test/typematic.tasklist b/test/typematic.tasklist
index 7b03c3f854..0dae312bb4 100644
--- a/test/typematic.tasklist
+++ b/test/typematic.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,10 +15,10 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOOKS, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
-	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
 	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \