From 2eb53a39662b905c65015bafb5f73ab2324d369c Mon Sep 17 00:00:00 2001 From: Wai-Hong Tam Date: Tue, 3 Aug 2021 17:17:56 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3069175 Reviewed-by: Aseda Aboagye --- .../herobrine/herobrine_npcx9/CMakeLists.txt | 2 -- .../herobrine/herobrine_npcx9/src/sensors.c | 29 ---------------------- 2 files changed, 31 deletions(-) delete mode 100644 zephyr/projects/herobrine/herobrine_npcx9/src/sensors.c (limited to 'zephyr/projects/herobrine') diff --git a/zephyr/projects/herobrine/herobrine_npcx9/CMakeLists.txt b/zephyr/projects/herobrine/herobrine_npcx9/CMakeLists.txt index 9dcd46db31..23b3a2c245 100644 --- a/zephyr/projects/herobrine/herobrine_npcx9/CMakeLists.txt +++ b/zephyr/projects/herobrine/herobrine_npcx9/CMakeLists.txt @@ -15,8 +15,6 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/usb_pd_policy.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON "src/led.c") -zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MOTIONSENSE - "src/sensors.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/i2c.c") diff --git a/zephyr/projects/herobrine/herobrine_npcx9/src/sensors.c b/zephyr/projects/herobrine/herobrine_npcx9/src/sensors.c deleted file mode 100644 index dd9ce10a16..0000000000 --- a/zephyr/projects/herobrine/herobrine_npcx9/src/sensors.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "chipset.h" -#include "common.h" -#include "keyboard_scan.h" - -/* Herobrine-NPCX9 board specific sensor implementation */ - -#ifdef CONFIG_LID_ANGLE_UPDATE -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 -- cgit v1.2.1