summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-08-22 08:25:33 -0700
committerChromeBot <chrome-bot@google.com>2013-08-22 09:09:20 -0700
commitcd46f51bc83784b81169adcf14ed5a9ad0b0ea7e (patch)
tree7b1103ed26fc52f366cc0b26d3dfef1cc0dbd383
parentdb2ac4354228c8f908fa28e8a58092d0af1a0e21 (diff)
downloadchrome-ec-cd46f51bc83784b81169adcf14ed5a9ad0b0ea7e.tar.gz
Remove default values for undefined tasks from charge state module
Due to the order of pre-processing, TASK_ID_CHARGER and TASK_ID_SWITCH aren't defined even if they are in the ec.tasklist for a board. BUG=chrome-os-partner:21565 BRANCH=falco,peppy TEST=Turn device off, remove AC power. Plug AC power back in. Charging LED should light in ~1 second. Original-Change-Id: I20ebbec71ca5e5dc8ab34da946d3dfeb91fc7849 Signed-off-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/66466 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> (cherry picked from commit 046d6256712e35ea0bc9eae4acf0363a9f8895d4) Change-Id: I21b493e5990aa765ea347afa8bd9187f66596975 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/66651
-rw-r--r--common/charge_state.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/common/charge_state.c b/common/charge_state.c
index d0b5971ca9..c42a695837 100644
--- a/common/charge_state.c
+++ b/common/charge_state.c
@@ -34,13 +34,6 @@
/* Timeout after AP battery shutdown warning before we kill the AP */
#define LOW_BATTERY_SHUTDOWN_TIMEOUT_US (30 * SECOND)
-#ifndef TASK_ID_CHARGER
-#define TASK_ID_CHARGER TASK_ID_INVALID
-#endif
-#ifndef TASK_ID_SWITCH
-#define TASK_ID_SWITCH TASK_ID_INVALID
-#endif
-
static const char * const state_name[] = POWER_STATE_NAME_TABLE;
static int state_machine_force_idle = 0;