summaryrefslogtreecommitdiff
path: root/common/motion_lid.c
diff options
context:
space:
mode:
authorli feng <li1.feng@intel.com>2015-07-02 13:29:10 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-10 20:42:18 +0000
commit2911e38022a950d9f0e85ed7480829bf21d34a1f (patch)
tree3a5997761bcee8f6443069d4b49cd08c549d386c /common/motion_lid.c
parent68b2809ee8f611d089f6d946dba10bb1b6d5c507 (diff)
downloadchrome-ec-2911e38022a950d9f0e85ed7480829bf21d34a1f.tar.gz
Cyan: Added Clamshell/Tablet mode support
Enabled lid angle calculation. Clamshell/Tablet mode is decided by lid angle. Accelerometers are set to be active in S3 also. Trackpad is enabled/disabled by GPIO TP_INT_DISABLE. Keyboard scan and trackpad are enabled in clamshell mode and disabled in tablet mode. Removed enable_keyboard() since keyboard is enabled in clamshell S0 and S3. BUG=chrome-os-partner:41353 TEST=Verify in clamshell mode, system can be waken up from S3 by keyboard/trackpad; And not tablet mode. BRANCH=None Change-Id: Ic5fb5a562e8426288eae2fb9815a213fe5033955 Signed-off-by: li feng <li1.feng@intel.com> Signed-off-by: Shamile Khan <shamile.khan@intel.com> Reviewed-on: https://chromium-review.googlesource.com/287341 Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/motion_lid.c')
-rw-r--r--common/motion_lid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/motion_lid.c b/common/motion_lid.c
index 1beb79febb..eca904f900 100644
--- a/common/motion_lid.c
+++ b/common/motion_lid.c
@@ -153,8 +153,8 @@ void motion_lid_calc(void)
accel_lid->xyz,
&lid_angle_deg);
-#ifdef CONFIG_LID_ANGLE_KEY_SCAN
- lidangle_keyscan_update(motion_lid_get_angle());
+#ifdef CONFIG_LID_ANGLE_UPDATE
+ lid_angle_update(motion_lid_get_angle());
#endif
}
@@ -170,12 +170,12 @@ int host_cmd_motion_lid(struct host_cmd_handler_args *args)
switch (in->cmd) {
case MOTIONSENSE_CMD_KB_WAKE_ANGLE:
-#ifdef CONFIG_LID_ANGLE_KEY_SCAN
+#ifdef CONFIG_LID_ANGLE_UPDATE
/* Set new keyboard wake lid angle if data arg has value. */
if (in->kb_wake_angle.data != EC_MOTION_SENSE_NO_VALUE)
- lid_angle_set_kb_wake_angle(in->kb_wake_angle.data);
+ lid_angle_set_wake_angle(in->kb_wake_angle.data);
- out->kb_wake_angle.ret = lid_angle_get_kb_wake_angle();
+ out->kb_wake_angle.ret = lid_angle_get_wake_angle();
#else
out->kb_wake_angle.ret = 0;
#endif