summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parker <dparker@chromium.org>2013-08-20 18:29:34 -0700
committerDave Parker <dparker@chromium.org>2013-08-23 16:46:25 -0700
commitf3ff9373571fadd5ce058fb7a7dbb5537e8bec16 (patch)
tree4fb2aa042860b256c9b4bb53aa132fd0599299e7
parentf2fbbe536a04d0589db59c00d953c5a01e2fb8da (diff)
downloadchrome-ec-f3ff9373571fadd5ce058fb7a7dbb5537e8bec16.tar.gz
CHERRY-PICK: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. Change-Id: I5ff6fb373a048aa0360544ff998bcf3928e52611 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> Reviewed-on: https://gerrit.chromium.org/gerrit/66866
-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 474925c773..08f4b3c99d 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;