diff options
author | Randall Spangler <rspangler@chromium.org> | 2012-10-29 14:13:36 -0700 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-10-30 14:50:03 -0700 |
commit | a21ea56e76ff71849d45f59608c0beb7bede4c02 (patch) | |
tree | d8e3bd5d57920878f9603cf4c3fee7b39b371188 | |
parent | 80467aff915c638b1c3f96a51becffd493791962 (diff) | |
download | chrome-ec-a21ea56e76ff71849d45f59608c0beb7bede4c02.tar.gz |
Rename power_button module to switch
Since it handles not just power button, but also lid switch, AC
detect, and other switches.
No functional changes; just renaming.
BUG=chrome-os-partner:15579
BRANCH=none
TEST=boot system, power on/off with power button
Change-Id: I51628a52293f7207715f5f6bf368a08fe6c3dbce
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36821
-rw-r--r-- | board/link/board.c | 18 | ||||
-rw-r--r-- | board/link/ec.tasklist | 2 | ||||
-rw-r--r-- | chip/lm4/build.mk | 2 | ||||
-rw-r--r-- | chip/lm4/flash.c | 6 | ||||
-rw-r--r-- | chip/lm4/gpio.c | 2 | ||||
-rw-r--r-- | chip/lm4/keyboard_scan.c | 4 | ||||
-rw-r--r-- | chip/lm4/switch.c (renamed from chip/lm4/power_button.c) | 54 | ||||
-rw-r--r-- | chip/stm32/flash-stm32f100.c | 2 | ||||
-rw-r--r-- | common/charge_state.c | 6 | ||||
-rw-r--r-- | common/console_output.c | 2 | ||||
-rw-r--r-- | common/x86_power.c | 10 | ||||
-rw-r--r-- | include/console.h | 2 | ||||
-rw-r--r-- | include/switch.h (renamed from include/power_button.h) | 22 | ||||
-rw-r--r-- | test/charging.tasklist | 2 | ||||
-rw-r--r-- | test/kb_debounce.tasklist | 2 | ||||
-rw-r--r-- | test/kb_deghost.tasklist | 2 | ||||
-rw-r--r-- | test/power_button.tasklist | 2 | ||||
-rw-r--r-- | test/scancode.tasklist | 2 | ||||
-rw-r--r-- | test/typematic.tasklist | 2 |
19 files changed, 72 insertions, 72 deletions
diff --git a/board/link/board.c b/board/link/board.c index e4fbb53423..dae823e3b6 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -9,34 +9,34 @@ #include "gpio.h" #include "i2c.h" #include "lm4_adc.h" -#include "power_button.h" #include "registers.h" +#include "switch.h" #include "util.h" #include "x86_power.h" #ifndef CONFIG_TASK_X86POWER #define x86_power_interrupt NULL #endif -#ifndef CONFIG_TASK_POWERBTN -#define power_button_interrupt NULL +#ifndef CONFIG_TASK_SWITCH +#define switch_interrupt NULL #endif /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[GPIO_COUNT] = { /* Inputs with interrupt handlers are first for efficiency */ {"POWER_BUTTONn", LM4_GPIO_K, (1<<7), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, {"LID_SWITCHn", LM4_GPIO_K, (1<<5), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, /* Other inputs */ {"THERMAL_DATA_READYn", LM4_GPIO_B, (1<<4), 0, NULL}, {"AC_PRESENT", LM4_GPIO_H, (1<<3), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, {"BOARD_VERSION1", LM4_GPIO_H, (1<<6), 0, NULL}, {"BOARD_VERSION2", LM4_GPIO_L, (1<<6), 0, NULL}, {"BOARD_VERSION3", LM4_GPIO_L, (1<<7), 0, NULL}, {"PCH_BKLTEN", LM4_GPIO_J, (1<<3), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, {"PCH_SLP_An", LM4_GPIO_G, (1<<5), GPIO_INT_BOTH, x86_power_interrupt}, {"PCH_SLP_ME_CSW_DEVn", LM4_GPIO_G, (1<<4), GPIO_INT_BOTH, @@ -68,11 +68,11 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"PGOOD_VGFX_CORE", LM4_GPIO_D, (1<<2), GPIO_INT_BOTH, x86_power_interrupt}, {"RECOVERYn", LM4_GPIO_H, (1<<7), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, {"USB1_STATUSn", LM4_GPIO_E, (1<<7), 0, NULL}, {"USB2_STATUSn", LM4_GPIO_E, (1<<1), 0, NULL}, {"WRITE_PROTECT", LM4_GPIO_J, (1<<4), GPIO_INT_BOTH, - power_button_interrupt}, + switch_interrupt}, /* Outputs; all unasserted by default except for reset signals */ {"CPU_PROCHOT", LM4_GPIO_F, (1<<2), GPIO_OUT_LOW, NULL}, {"ENABLE_1_5V_DDR", LM4_GPIO_H, (1<<5), GPIO_OUT_LOW, NULL}, diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist index e74140d93d..72d55d010f 100644 --- a/board/link/ec.tasklist +++ b/board/link/ec.tasklist @@ -28,5 +28,5 @@ 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) \ - TASK(POWERBTN, power_button_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/chip/lm4/build.mk b/chip/lm4/build.mk index 2c8abb3d8d..d627409afb 100644 --- a/chip/lm4/build.mk +++ b/chip/lm4/build.mk @@ -23,5 +23,5 @@ chip-$(CONFIG_PECI)+=peci.o chip-$(CONFIG_SPI)+=spi.o chip-$(CONFIG_TASK_PWM)+=pwm.o chip-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o keyboard_scan_stub.o -chip-$(CONFIG_TASK_POWERBTN)+=power_button.o +chip-$(CONFIG_TASK_SWITCH)+=switch.o chip-$(CONFIG_TASK_TEMPSENSOR)+=chip_temp_sensor.o diff --git a/chip/lm4/flash.c b/chip/lm4/flash.c index e06246b7ee..e599fa5a96 100644 --- a/chip/lm4/flash.c +++ b/chip/lm4/flash.c @@ -6,8 +6,8 @@ /* Flash memory module for Chrome EC */ #include "flash.h" -#include "power_button.h" #include "registers.h" +#include "switch.h" #include "system.h" #include "timer.h" #include "util.h" @@ -285,9 +285,9 @@ uint32_t flash_get_protect(void) if (pstate.flags & PERSIST_FLAG_PROTECT_RO) flags |= EC_FLASH_PROTECT_RO_AT_BOOT; -#ifdef CONFIG_TASK_POWERBTN +#ifdef CONFIG_TASK_SWITCH /* Check if write protect pin is asserted now */ - if (write_protect_asserted()) + if (switch_get_write_protect()) flags |= EC_FLASH_PROTECT_GPIO_ASSERTED; #endif diff --git a/chip/lm4/gpio.c b/chip/lm4/gpio.c index 7c8a7a73f4..9c276634c1 100644 --- a/chip/lm4/gpio.c +++ b/chip/lm4/gpio.c @@ -9,8 +9,8 @@ #include "common.h" #include "gpio.h" #include "hooks.h" -#include "power_button.h" #include "registers.h" +#include "switch.h" #include "task.h" #include "timer.h" #include "util.h" diff --git a/chip/lm4/keyboard_scan.c b/chip/lm4/keyboard_scan.c index 1d25b1937b..03534260fc 100644 --- a/chip/lm4/keyboard_scan.c +++ b/chip/lm4/keyboard_scan.c @@ -11,8 +11,8 @@ #include "keyboard.h" #include "keyboard_scan.h" #include "keyboard_scan_stub.h" -#include "power_button.h" #include "registers.h" +#include "switch.h" #include "system.h" #include "task.h" #include "timer.h" @@ -105,7 +105,7 @@ static void enter_polling_mode(void) static int is_scanning_enabled(void) { /* Scan only if enabled AND lid is open. */ - return lm4_get_scanning_enabled() && power_lid_open_debounced(); + return lm4_get_scanning_enabled() && switch_get_lid_open(); } /** diff --git a/chip/lm4/power_button.c b/chip/lm4/switch.c index b6e84339ad..5edf047869 100644 --- a/chip/lm4/power_button.c +++ b/chip/lm4/switch.c @@ -13,16 +13,16 @@ #include "host_command.h" #include "keyboard.h" #include "keyboard_scan.h" -#include "power_button.h" #include "pwm.h" +#include "switch.h" #include "system.h" #include "task.h" #include "timer.h" #include "util.h" /* Console output macros */ -#define CPUTS(outstr) cputs(CC_POWERBTN, outstr) -#define CPRINTF(format, args...) cprintf(CC_POWERBTN, format, ## args) +#define CPUTS(outstr) cputs(CC_SWITCH, outstr) +#define CPRINTF(format, args...) cprintf(CC_SWITCH, format, ## args) /* * When chipset is on, we stretch the power button signal to it so chipset @@ -140,7 +140,7 @@ static void set_pwrbtn_to_pch(int high) * * @return 1 if lid is open, 0 if closed. */ -static int get_lid_open(void) +static int raw_lid_open(void) { return gpio_get_level(GPIO_LID_SWITCHn) ? 1 : 0; } @@ -150,13 +150,13 @@ static int get_lid_open(void) * * @return 1 if power button is pressed, 0 if not pressed. */ -static int get_power_button_pressed(void) +static int raw_power_button_pressed(void) { if (simulate_power_pressed) return 1; /* Ignore power button if lid is closed */ - if (!get_lid_open()) + if (!raw_lid_open()) return 0; return gpio_get_level(GPIO_POWER_BUTTONn) ? 0 : 1; @@ -234,7 +234,7 @@ static void lid_switch_open(uint64_t tnow) set_pwrbtn_to_pch(0); pwrbtn_state = PWRBTN_STATE_LID_OPEN; tnext_state = tnow + PWRBTN_INITIAL_US; - task_wake(TASK_ID_POWERBTN); + task_wake(TASK_ID_SWITCH); } } @@ -269,7 +269,7 @@ static void power_button_changed(uint64_t tnow) return; } - if (get_power_button_pressed()) { + if (raw_power_button_pressed()) { /* Power button pressed */ power_button_pressed(tnow); } else { @@ -293,7 +293,7 @@ static void power_button_changed(uint64_t tnow) */ static void lid_switch_changed(uint64_t tnow) { - if (get_lid_open()) + if (raw_lid_open()) lid_switch_open(tnow); else lid_switch_close(tnow); @@ -307,7 +307,7 @@ static void set_initial_pwrbtn_state(void) uint32_t reset_flags = system_get_reset_flags(); /* Set debounced power button state to initial button state */ - debounced_power_pressed = get_power_button_pressed(); + debounced_power_pressed = raw_power_button_pressed(); if (system_jumped_to_this_image() && chipset_in_state(CHIPSET_STATE_ON)) { @@ -364,17 +364,17 @@ static void set_initial_pwrbtn_state(void) } } -int power_ac_present(void) +int switch_get_ac_present(void) { return gpio_get_level(GPIO_AC_PRESENT); } -int power_lid_open_debounced(void) +int switch_get_lid_open(void) { return debounced_lid_open; } -int write_protect_asserted(void) +int switch_get_write_protect(void) { return gpio_get_level(GPIO_WRITE_PROTECT); } @@ -445,7 +445,7 @@ static void state_machine(uint64_t tnow) * recovery combination doesn't cause the chipset to shut back * down. */ set_pwrbtn_to_pch(1); - if (get_power_button_pressed()) + if (raw_power_button_pressed()) pwrbtn_state = PWRBTN_STATE_EAT_RELEASE; else pwrbtn_state = PWRBTN_STATE_IDLE; @@ -453,7 +453,7 @@ static void state_machine(uint64_t tnow) case PWRBTN_STATE_WAS_OFF: /* Done stretching initial power button signal, so show the * true power button state to the PCH. */ - if (get_power_button_pressed()) { + if (raw_power_button_pressed()) { /* User is still holding the power button */ pwrbtn_state = PWRBTN_STATE_HELD; } else { @@ -469,7 +469,7 @@ static void state_machine(uint64_t tnow) } } -void power_button_task(void) +void switch_task(void) { uint64_t t; uint64_t tsleep; @@ -491,16 +491,16 @@ void power_button_task(void) * Re-enable keyboard scanning if the power button is * no longer pressed. */ - if (!get_power_button_pressed()) + if (!raw_power_button_pressed()) keyboard_enable_scanning(1); - if (get_power_button_pressed() != + if (raw_power_button_pressed() != debounced_power_pressed) power_button_changed(t); } if (tdebounce_lid && t >= tdebounce_lid) { tdebounce_lid = 0; - if (get_lid_open() != debounced_lid_open) + if (raw_lid_open() != debounced_lid_open) lid_switch_changed(t); } @@ -542,12 +542,12 @@ void power_button_task(void) /*****************************************************************************/ /* Hooks */ -static void power_button_init(void) +static void switch_init(void) { /* Set up memory-mapped switch positions */ memmap_switches = host_get_memmap(EC_MEMMAP_SWITCHES); *memmap_switches = 0; - if (get_lid_open()) { + if (raw_lid_open()) { debounced_lid_open = 1; *memmap_switches |= EC_SWITCH_LID_OPEN; } @@ -566,9 +566,9 @@ static void power_button_init(void) gpio_enable_interrupt(GPIO_RECOVERYn); gpio_enable_interrupt(GPIO_WRITE_PROTECT); } -DECLARE_HOOK(HOOK_INIT, power_button_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, switch_init, HOOK_PRIO_DEFAULT); -void power_button_interrupt(enum gpio_signal signal) +void switch_interrupt(enum gpio_signal signal) { /* Reset debounce time for the changed signal */ switch (signal) { @@ -579,7 +579,7 @@ void power_button_interrupt(enum gpio_signal signal) case GPIO_POWER_BUTTONn: /* Reset power button debounce time */ tdebounce_pwr = get_time().val + PWRBTN_DEBOUNCE_US; - if (get_power_button_pressed()) { + if (raw_power_button_pressed()) { /* * Disable the matrix scan as soon as possible to * reduce the risk of false-reboot triggered by those @@ -609,7 +609,7 @@ void power_button_interrupt(enum gpio_signal signal) * task wake up _every_ debounce_us on its own; that's less desirable * when the EC should be sleeping. */ - task_wake(TASK_ID_POWERBTN); + task_wake(TASK_ID_SWITCH); } /*****************************************************************************/ @@ -629,14 +629,14 @@ static int command_powerbtn(int argc, char **argv) ccprintf("Simulating %d ms power button press.\n", ms); simulate_power_pressed = 1; tdebounce_pwr = get_time().val + PWRBTN_DEBOUNCE_US; - task_wake(TASK_ID_POWERBTN); + task_wake(TASK_ID_SWITCH); msleep(ms); ccprintf("Simulating power button release.\n"); simulate_power_pressed = 0; tdebounce_pwr = get_time().val + PWRBTN_DEBOUNCE_US; - task_wake(TASK_ID_POWERBTN); + task_wake(TASK_ID_SWITCH); return EC_SUCCESS; } diff --git a/chip/stm32/flash-stm32f100.c b/chip/stm32/flash-stm32f100.c index 52e267255d..907b246e84 100644 --- a/chip/stm32/flash-stm32f100.c +++ b/chip/stm32/flash-stm32f100.c @@ -7,10 +7,10 @@ #include "console.h" #include "flash.h" +#include "gpio.h" #include "hooks.h" #include "registers.h" #include "panic.h" -#include "power_button.h" #include "system.h" #include "task.h" #include "timer.h" diff --git a/common/charge_state.c b/common/charge_state.c index 09efefffe1..f658b3daea 100644 --- a/common/charge_state.c +++ b/common/charge_state.c @@ -15,10 +15,10 @@ #include "gpio.h" #include "hooks.h" #include "host_command.h" -#include "power_button.h" #include "power_led.h" #include "printf.h" #include "smart_battery.h" +#include "switch.h" #include "system.h" #include "task.h" #include "timer.h" @@ -146,7 +146,7 @@ static int state_common(struct power_state_context *ctx) curr->error = 0; /* Detect AC change */ - curr->ac = power_ac_present(); + curr->ac = switch_get_ac_present(); if (curr->ac != prev->ac) { if (curr->ac) { /* AC on @@ -569,7 +569,7 @@ int charge_get_percent(void) static int enter_force_idle_mode(void) { - if (!power_ac_present()) + if (!switch_get_ac_present()) return EC_ERROR_UNKNOWN; state_machine_force_idle = 1; charger_post_init(); diff --git a/common/console_output.c b/common/console_output.c index ea84e6364d..12e35f55a3 100644 --- a/common/console_output.c +++ b/common/console_output.c @@ -32,9 +32,9 @@ static const char *channel_names[CC_CHANNEL_COUNT] = { "lightbar", "lpc", "port80", - "powerbtn", "pwm", "spi", + "switch", "system", "task", "thermal", diff --git a/common/x86_power.c b/common/x86_power.c index 7b8b492067..4d9f5bbcfe 100644 --- a/common/x86_power.c +++ b/common/x86_power.c @@ -11,7 +11,7 @@ #include "gpio.h" #include "hooks.h" #include "host_command.h" -#include "power_button.h" +#include "switch.h" #include "system.h" #include "task.h" #include "timer.h" @@ -333,7 +333,7 @@ DECLARE_HOOK(HOOK_LID_CHANGE, x86_lid_change, HOOK_PRIO_DEFAULT); static void x86_power_ac_change(void) { - if (power_ac_present()) { + if (switch_get_ac_present()) { CPRINTF("[%T x86 AC on]\n"); } else { CPRINTF("[%T x86 AC off]\n"); @@ -431,7 +431,7 @@ void x86_power_task(void) } in_want = 0; - if (power_ac_present()) + if (switch_get_ac_present()) task_wait_event(-1); else { uint64_t target_time = last_shutdown_time + @@ -477,7 +477,7 @@ void x86_power_task(void) * of reset so it can wake the processor. */ gpio_set_level(GPIO_TOUCHSCREEN_RESETn, - power_lid_open_debounced()); + switch_get_lid_open()); /* Check for state transitions */ if (gpio_get_level(GPIO_PCH_SLP_S3n) == 1) { @@ -749,7 +749,7 @@ static int command_hibernation_delay(int argc, char **argv) /* Print the current setting */ ccprintf("Hibernation delay: %d s\n", hibernate_delay); - if (state == X86_G3 && !power_ac_present()) { + if (state == X86_G3 && !switch_get_ac_present()) { ccprintf("Time G3: %d s\n", time_g3); ccprintf("Time left: %d s\n", hibernate_delay - time_g3); } diff --git a/include/console.h b/include/console.h index a759eec628..8bfdd579b0 100644 --- a/include/console.h +++ b/include/console.h @@ -41,9 +41,9 @@ enum console_channel { CC_LIGHTBAR, CC_LPC, CC_PORT80, - CC_POWERBTN, CC_PWM, CC_SPI, + CC_SWITCH, CC_SYSTEM, CC_TASK, CC_THERMAL, diff --git a/include/power_button.h b/include/switch.h index 12919acf7b..9c4dfef498 100644 --- a/include/power_button.h +++ b/include/switch.h @@ -3,41 +3,41 @@ * found in the LICENSE file. */ -/* Power button module for Chrome EC */ +/* Switch module for Chrome EC */ -#ifndef __CROS_EC_POWER_BUTTON_H -#define __CROS_EC_POWER_BUTTON_H +#ifndef __CROS_EC_SWITCH_H +#define __CROS_EC_SWITCH_H #include "common.h" #include "gpio.h" /** - * Interrupt handler for the power button and lid switch. + * Interrupt handler for switch inputs. * * @param signal Signal which triggered the interrupt. */ -void power_button_interrupt(enum gpio_signal signal); +void switch_interrupt(enum gpio_signal signal); /** - * Power button task. + * Switch task. */ -void power_button_task(void); +void switch_task(void); /** * Return non-zero if AC power is present. */ -int power_ac_present(void); +int switch_get_ac_present(void); /** * Return non-zero if lid is open. * * Uses the debounced lid state, not the raw signal from the GPIO. */ -int power_lid_open_debounced(void); +int switch_get_lid_open(void); /** * Return non-zero if write protect signal is asserted. */ -int write_protect_asserted(void); +int switch_get_write_protect(void); -#endif /* __CROS_EC_POWER_BUTTON_H */ +#endif /* __CROS_EC_SWITCH_H */ diff --git a/test/charging.tasklist b/test/charging.tasklist index 778b0e9491..1403653779 100644 --- a/test/charging.tasklist +++ b/test/charging.tasklist @@ -23,6 +23,6 @@ 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) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_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 84a627806a..ef03820794 100644 --- a/test/kb_debounce.tasklist +++ b/test/kb_debounce.tasklist @@ -21,6 +21,6 @@ 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) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_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_deghost.tasklist b/test/kb_deghost.tasklist index c17687e971..17df5b5b6a 100644 --- a/test/kb_deghost.tasklist +++ b/test/kb_deghost.tasklist @@ -22,6 +22,6 @@ 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) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_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 2651b581c2..3ecc53e638 100644 --- a/test/power_button.tasklist +++ b/test/power_button.tasklist @@ -21,7 +21,7 @@ TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \ TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \ TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \ TASK(KEYSCAN, keyboard_scan_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/scancode.tasklist b/test/scancode.tasklist index eaf7fcf7f5..250bbbc721 100644 --- a/test/scancode.tasklist +++ b/test/scancode.tasklist @@ -22,6 +22,6 @@ 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) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_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/typematic.tasklist b/test/typematic.tasklist index c17687e971..17df5b5b6a 100644 --- a/test/typematic.tasklist +++ b/test/typematic.tasklist @@ -22,6 +22,6 @@ 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) \ - TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ + TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \ TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) |