summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2021-08-03 17:17:56 -0700
committerCommit Bot <commit-bot@chromium.org>2021-08-05 00:13:33 +0000
commit2eb53a39662b905c65015bafb5f73ab2324d369c (patch)
tree6352433557cdb05c75b1eef449c9ecf844bfc3d0 /common
parentfc016f2dce16d0555deee69e00ea5a626eb27f21 (diff)
downloadchrome-ec-2eb53a39662b905c65015bafb5f73ab2324d369c.tar.gz
lid_angle: Create a common callback for lid angle changes
Each board defines its own callback lid_angle_peripheral_enable(). The implementation is very similar. Create a common implementation and reduce the duplicated code. This CL removes the board callbacks which are identifical to the common callback. If it is slightly different, keep it and add the __override tag. The check of TEST_BUILD is unnecessary as the board callback is not linked in the test build. BRANCH=None BUG=b:194922043 TEST=Build all the images. Change-Id: I73d381730f35b80eff69399cdfc5fb54f839aee0 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3069175 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/lid_angle.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/common/lid_angle.c b/common/lid_angle.c
index 295f5486ac..8a3775b959 100644
--- a/common/lid_angle.c
+++ b/common/lid_angle.c
@@ -178,9 +178,25 @@ static void suspend_peripherals(void)
DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, suspend_peripherals, HOOK_PRIO_DEFAULT);
#endif /* CONFIG_TABLET_MODE */
-/* Board level callback was not linked in test build, implement it here. */
#ifdef TEST_BUILD
-void lid_angle_peripheral_enable(int enable)
+__overridable void lid_angle_peripheral_enable(int enable)
{
}
-#endif
+#else
+__overridable void lid_angle_peripheral_enable(int enable)
+{
+ int chipset_in_s0 = chipset_in_state(CHIPSET_STATE_ON);
+
+ if (enable) {
+ keyboard_scan_enable(1, KB_SCAN_DISABLE_LID_ANGLE);
+ } else {
+ /*
+ * Ensure that the chipset is off before disabling the keyboard.
+ * When the chipset is on, the EC keeps the keyboard enabled and
+ * the AP decides whether to ignore input devices or not.
+ */
+ if (!chipset_in_s0)
+ keyboard_scan_enable(0, KB_SCAN_DISABLE_LID_ANGLE);
+ }
+}
+#endif /* TEST_BUILD */