summaryrefslogtreecommitdiff
path: root/common/charge_state_v1.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/charge_state_v1.c')
-rw-r--r--common/charge_state_v1.c34
1 files changed, 28 insertions, 6 deletions
diff --git a/common/charge_state_v1.c b/common/charge_state_v1.c
index bb2c681ef9..d08aa2430b 100644
--- a/common/charge_state_v1.c
+++ b/common/charge_state_v1.c
@@ -874,18 +874,40 @@ void charger_task(void)
/* Hooks */
/**
- * Charge notification hook.
+ * Chipset notification hook.
*
- * This is triggered when the AC state changes or the system boots, so that
- * we can update our charging state.
+ * This is triggered when the system boots or resumes, so that we can update
+ * our charging state.
*/
-static void charge_hook(void)
+static void chipset_hook(void)
{
/* Wake up the task now */
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);
+DECLARE_HOOK(HOOK_CHIPSET_RESUME, chipset_hook, HOOK_PRIO_DEFAULT);
+
+/**
+ * AC change notification hook.
+ *
+ * This is triggered when the AC state changes, so that we can update the
+ * memory-mapped AC status and our charging state.
+ */
+static void ac_change_hook(void)
+{
+ /**
+ * Update the memory-mapped AC_PRESENT flag immediately so the
+ * state is correct prior to the host being notified of the AC
+ * change event.
+ */
+ if (extpower_is_present())
+ *task_ctx.memmap_batt_flags |= EC_BATT_FLAG_AC_PRESENT;
+ else
+ *task_ctx.memmap_batt_flags &= ~EC_BATT_FLAG_AC_PRESENT;
+
+ /* Wake up the task now */
+ task_wake(TASK_ID_CHARGER);
+}
+DECLARE_HOOK(HOOK_AC_CHANGE, ac_change_hook, HOOK_PRIO_DEFAULT);
static void charge_init(void)
{