From e8f6467d65f086a16ec33cb3cfd724086595d2f1 Mon Sep 17 00:00:00 2001 From: Wai-Hong Tam Date: Wed, 21 Jul 2021 15:11:59 -0700 Subject: tablet_mode: Fix the race condition of setting the tablet mode There are 2 tablet mode triggers: * Lid: when the lid angle close to 360 degree, either detected by a GMR sensor or by the angle computed by 2 motion sensors. * Base: when the detachable base is detached. These 2 triggers set the tablet mode status, which as a boolean, resulting a race condition. This CL fixes the race condition. Each trigger updates its own bit. The final tablet mode status is the OR of all bits. BRANCH=Trogdor BUG=b:193873098 TEST=Attached the base, checked tablet_mode enabled; detached the base, checked tablet_mode disabled; flip base to 360 degree, checked tablet_mode disabled; move the base out of the lid, checked tablet_mode disabled. Change-Id: Ia9d9d2d66c194796c1039cc8b746c8d1f28a4496 Signed-off-by: Wai-Hong Tam Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3044414 Reviewed-by: Ting Shen --- include/tablet_mode.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/tablet_mode.h') diff --git a/include/tablet_mode.h b/include/tablet_mode.h index b5a2f2f562..3e03d77f6a 100644 --- a/include/tablet_mode.h +++ b/include/tablet_mode.h @@ -13,12 +13,17 @@ */ int tablet_get_mode(void); +/* Bit mask of tablet mode trigger */ +#define TABLET_TRIGGER_LID BIT(0) +#define TABLET_TRIGGER_BASE BIT(1) + /** * Set tablet mode state * * @param mode 1: tablet mode. 0 clamshell mode. + * @param trigger: bitmask of the trigger, TABLET_TRIGGER_*. */ -void tablet_set_mode(int mode); +void tablet_set_mode(int mode, uint32_t trigger); /** * Disable tablet mode -- cgit v1.2.1