summaryrefslogtreecommitdiff
path: root/driver/touchpad_st.c
diff options
context:
space:
mode:
authorWei-Han Chen <stimim@google.com>2018-08-16 18:40:24 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-08-19 02:10:46 -0700
commit8aac0772eaa9eb686d57f38ee61a616caa4accbe (patch)
treec1802efe75aa68103201bedcd2ceb8f1300605d8 /driver/touchpad_st.c
parent0ea75d24f26355dcc3186db9e58604c77fdd38c0 (diff)
downloadchrome-ec-8aac0772eaa9eb686d57f38ee61a616caa4accbe.tar.gz
touchpad_st: handle new domeswitch API
In latest ST firmware, domeswitch level is already reported, there is no domeswitch_chg anymore. BRANCH=none BUG=b:70482333 TEST=manual on device Signed-off-by: Wei-Han Chen <stimim@chromium.org> Change-Id: I6ce21f48ec8aa62a4167a86581acd2e2abee7ce6 Reviewed-on: https://chromium-review.googlesource.com/1177524 Commit-Ready: Wei-Han Chen <stimim@chromium.org> Tested-by: Wei-Han Chen <stimim@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'driver/touchpad_st.c')
-rw-r--r--driver/touchpad_st.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/driver/touchpad_st.c b/driver/touchpad_st.c
index 6650471663..11a85a90c8 100644
--- a/driver/touchpad_st.c
+++ b/driver/touchpad_st.c
@@ -200,16 +200,14 @@ static int st_tp_check_domeswitch_state(void)
if (ret)
return ret;
- if (rx_buf.buffer_header.flags & ST_TP_BUFFER_HEADER_DOMESWITCH_CHG) {
- /*
- * dome_switch_level from device is inverted.
- * That is, 0 => pressed, 1 => released.
- */
- set_bits(&system_state,
- (rx_buf.buffer_header.dome_switch_level ?
- 0 : SYSTEM_STATE_DOME_SWITCH_LEVEL),
- SYSTEM_STATE_DOME_SWITCH_LEVEL);
- }
+ ret = rx_buf.buffer_header.flags & ST_TP_BUFFER_HEADER_DOMESWITCH_LVL;
+ /*
+ * Domeswitch level from device is inverted.
+ * That is, 0 => pressed, 1 => released.
+ */
+ set_bits(&system_state,
+ ret ? 0 : SYSTEM_STATE_DOME_SWITCH_LEVEL,
+ SYSTEM_STATE_DOME_SWITCH_LEVEL);
return 0;
}