diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2018-11-30 16:25:07 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-12-01 01:08:43 -0800 |
| commit | 5c82e0336ba3dd6f93fdc4dd9c553cfb69c5caa3 (patch) | |
| tree | e211c547835e47505ed7e88ef6ffcd5d8e6ea7f2 /common/acpi.c | |
| parent | 6d6378b8d0f9a08eee75dfb794b5697cdcd4b821 (diff) | |
| download | chrome-ec-5c82e0336ba3dd6f93fdc4dd9c553cfb69c5caa3.tar.gz | |
tablet_mode: Fix tablet mode for tablet devices
Tablet devices would normally only define CONFIG_TABLET_MODE_SWITCH,
and not CONFIG_TABLET_MODE, and define a tablet_get_mode function
which always returns 1.
Since 09a5e0a9398 "dptf: Get rid of CONFIG_DPTF_DEVICE_ORIENTATION",
tablet_mode.h, when CONFIG_TABLET_MODE is not set, would define an
_inline_ tablet_get_mode function which would always return 0,
causing tablets to always be in laptop mode.
Fix this by:
- Removing the inline in tablet_mode.h.
- Add CONFIG_TABLET_MODE to all our tablets (after removing the
inline, compilation fails if CONFIG_TABLET_MODE_SWITCH is set,
but not CONFIG_TABLET_MODE).
- Remove tablet_get_mode from board/*/board.c, as the default
mode is tablet, anyway.
BRANCH=none
BUG=b:120252451
TEST=Boot kukui, onscreen keyboard works
TEST=No code size increase:
build/kukui/RW/space_free_flash shrank by 36 bytes: (23968 to 23932)
build/kukui/RW/space_free_ram shrank by 4 bytes: (10356 to 10352)
build/rainier/RW/space_free_flash shrank by 36 bytes: (44296 to 44260)
build/rainier/RW/space_free_ram shrank by 4 bytes: (12948 to 12944)
build/scarlet/RW/space_free_flash shrank by 36 bytes: (28128 to 28092)
build/scarlet/RW/space_free_ram shrank by 4 bytes: (10532 to 10528)
Change-Id: Ifea0412bb32f1d701ad2040ad62a5c812705b14a
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1355645
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'common/acpi.c')
| -rw-r--r-- | common/acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/acpi.c b/common/acpi.c index da6795acd9..924a180cb8 100644 --- a/common/acpi.c +++ b/common/acpi.c @@ -221,7 +221,11 @@ int acpi_ap_to_ec(int is_cmd, uint8_t value, uint8_t *resultptr) #endif case EC_ACPI_MEM_DEVICE_ORIENTATION: + result = 0; + +#ifdef CONFIG_TABLET_MODE result = tablet_get_mode() << EC_ACPI_MEM_TBMD_SHIFT; +#endif #ifdef CONFIG_DPTF result |= (acpi_dptf_get_profile_num() & |