summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2015-07-10 16:08:57 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-07-13 03:18:38 +0000
commit10dc22867f8a81c2bf72d2a009b560064d5e1170 (patch)
tree0763c8727cc2d1d94ff9d23d23b05dd3094aa54e /common
parent16d40b0b3c567a5e18ea28469a09f860819d3fdd (diff)
downloadchrome-ec-10dc22867f8a81c2bf72d2a009b560064d5e1170.tar.gz
cleanup: remove board function callback on charge override timeoutrelease-R45-7262.B
Remove board function callback on charge override timeout, since the implementation should be common to all boards: send host event. This function is called when a power swap fails during an issued charge override and notifies the host so that it is aware that the power swap did not succeed. BUG=none BRANCH=smaug TEST=make -j buildall Change-Id: Ia2a078a17aef6b302fd2b9fd21a5a92c628fd7db Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/284923 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/charge_manager.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c
index ed47c8812a..da465d2d73 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -543,6 +543,15 @@ static void charge_manager_refresh(void)
}
DECLARE_DEFERRED(charge_manager_refresh);
+/**
+ * Called when charge override times out waiting for power swap.
+ */
+static void charge_override_timeout(void)
+{
+ pd_send_host_event(PD_EVENT_POWER_CHANGE);
+}
+DECLARE_DEFERRED(charge_override_timeout);
+
static void charge_manager_make_change(enum charge_manager_change_type change,
int supplier,
int port,
@@ -599,7 +608,7 @@ static void charge_manager_make_change(enum charge_manager_change_type change,
delayed_override_port);
delayed_override_port = OVERRIDE_OFF;
hook_call_deferred(
- board_charge_manager_override_timeout,
+ charge_override_timeout,
-1);
}
}
@@ -709,7 +718,7 @@ int charge_manager_set_override(int port)
delayed_override_port = OVERRIDE_OFF;
hook_call_deferred(
- board_charge_manager_override_timeout, -1);
+ charge_override_timeout, -1);
}
/* Set the override port if it's a sink. */
@@ -731,7 +740,7 @@ int charge_manager_set_override(int port)
POWER_SWAP_TIMEOUT;
delayed_override_port = port;
hook_call_deferred(
- board_charge_manager_override_timeout,
+ charge_override_timeout,
POWER_SWAP_TIMEOUT);
pd_request_power_swap(port);
/* Can't charge from requested port -- return error. */