diff options
author | Ting Shen <phoenixshen@google.com> | 2021-03-17 18:29:23 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-03-23 04:09:16 +0000 |
commit | 759c9d46a03fe87735b2abda0f77abb27d6573d3 (patch) | |
tree | 52c334edd547f18f2c87cbef8f42cda8f94bb413 /board | |
parent | a65d9bdee3e6e357e4c0fa348f152f51ec0f36fc (diff) | |
download | chrome-ec-759c9d46a03fe87735b2abda0f77abb27d6573d3.tar.gz |
jacuzzi: enable keyboard scanning in S0/tablet
Most Jacuzzi devices copied the incorrect lid_angle_peripheral_enable
code from Reef. Fix this by sharing Willow's good implementation
to all followers.
BUG=b:181852624
TEST=1) make buildall
2) manually test on fennel
BRANCH=kukui
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: Ie2dd79d5d0dcebe564664c357db73c5956d1b14b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2765633
Tested-by: Ting Shen <phoenixshen@chromium.org>
Auto-Submit: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/burnet/board.c | 13 | ||||
-rw-r--r-- | board/cerise/board.c | 13 | ||||
-rw-r--r-- | board/damu/board.c | 13 | ||||
-rw-r--r-- | board/fennel/board.c | 13 | ||||
-rw-r--r-- | board/jacuzzi/board.c | 13 | ||||
-rw-r--r-- | board/makomo/board.c | 13 | ||||
-rw-r--r-- | board/stern/board.c | 13 | ||||
-rw-r--r-- | board/willow/board.c | 21 |
8 files changed, 0 insertions, 112 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c index 8bc435a44a..9737fd633c 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -588,16 +588,3 @@ int battery_set_vendor_param(uint32_t param, uint32_t value) { return EC_ERROR_UNIMPLEMENTED; } - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/cerise/board.c b/board/cerise/board.c index f167795c3c..912a085900 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -471,16 +471,3 @@ int board_get_charger_i2c(void) /* TODO(b:138415463): confirm the bus allocation for future builds */ return board_get_version() == 1 ? 2 : 1; } - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/damu/board.c b/board/damu/board.c index 5e431a66d0..fbe027e3f0 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -452,16 +452,3 @@ int board_get_charger_i2c(void) /* TODO(b:138415463): confirm the bus allocation for future builds */ return board_get_version() == 1 ? 2 : 1; } - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/fennel/board.c b/board/fennel/board.c index 1258fd35a0..9d059e5886 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -576,16 +576,3 @@ DECLARE_HOST_COMMAND(EC_CMD_PWM_GET_DUTY, host_command_pwm_get_duty, EC_VER_MASK(0)); #endif - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index b1a7fe7cc0..e7ab8ed044 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -570,16 +570,3 @@ int board_get_battery_i2c(void) { return board_get_version() >= 1 ? 2 : 1; } - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/makomo/board.c b/board/makomo/board.c index fd9c303796..a5c04c7855 100644 --- a/board/makomo/board.c +++ b/board/makomo/board.c @@ -576,16 +576,3 @@ DECLARE_HOST_COMMAND(EC_CMD_PWM_GET_DUTY, host_command_pwm_get_duty, EC_VER_MASK(0)); #endif - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/stern/board.c b/board/stern/board.c index d218df64b2..9dacb29187 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -452,16 +452,3 @@ int board_get_charger_i2c(void) /* TODO(b:138415463): confirm the bus allocation for future builds */ return board_get_version() == 1 ? 2 : 1; } - -/* Enable or disable input devices, based on chipset state and tablet mode */ -#ifndef TEST_BUILD -void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} -#endif diff --git a/board/willow/board.c b/board/willow/board.c index 3bcc94ce79..3aad2b476e 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -445,24 +445,3 @@ int board_get_battery_i2c(void) { return board_get_version() >= 1 ? 2 : 1; } - -#ifndef TEST_BUILD -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 |