diff options
| author | Heng-Ruey Hsu <henryhsu@chromium.org> | 2019-11-12 11:11:10 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-13 08:36:28 +0000 |
| commit | 0acb1f206fe19ff9ca17a5750e66dc790917a0ce (patch) | |
| tree | 3f5b8246ea2598b2159ab73963afd4ab02401f18 /driver | |
| parent | f916f248e096648b8ccef2c14b1dd0f43f0b0e41 (diff) | |
| download | chrome-ec-0acb1f206fe19ff9ca17a5750e66dc790917a0ce.tar.gz | |
Clean up double tap related definition
Fixes: commit 2f2a81079191ca "Add double tap and make motion sense wake up ap"
CONFIG_GESTURE_DETECTION_MASK includes significant motion in activity
list. We cannot use it for double tap.
Add more flags to distinguish it.
BUG=b:135575671
BRANCH=kukui
TEST=AP can receive mkbp event when double tap is triggered
Change-Id: I13776a01b14dc251396a615c8c97353f2d0477d4
Signed-off-by: Heng-Ruey Hsu <henryhsu@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1911263
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/accel_lis2dw12.c | 8 | ||||
| -rw-r--r-- | driver/accelgyro_bmi160.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/driver/accel_lis2dw12.c b/driver/accel_lis2dw12.c index f51f83b5ce..ba7514309f 100644 --- a/driver/accel_lis2dw12.c +++ b/driver/accel_lis2dw12.c @@ -150,7 +150,7 @@ static int lis2dw12_config_interrupt(const struct motion_sensor_t *s) return ret; #endif /* CONFIG_ACCEL_FIFO */ -#ifdef CONFIG_GESTURE_SENSOR_BATTERY_TAP +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP /* * Configure D-TAP event detection on 3 axis. * For more details please refer to AN5038. @@ -186,7 +186,7 @@ static int lis2dw12_config_interrupt(const struct motion_sensor_t *s) ret = st_write_data_with_mask(s, LIS2DW12_INT1_TAP_ADDR, LIS2DW12_INT1_DTAP_MASK, LIS2DW12_EN_BIT); -#endif /* CONFIG_GESTURE_SENSOR_BATTERY_TAP */ +#endif /* CONFIG_GESTURE_SENSOR_DOUBLE_TAP */ return ret; } @@ -221,7 +221,7 @@ static int lis2dw12_irq_handler(struct motion_sensor_t *s, uint32_t *event) return EC_ERROR_NOT_HANDLED; } -#ifdef CONFIG_GESTURE_SENSOR_BATTERY_TAP +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP { int status = 0; @@ -231,7 +231,7 @@ static int lis2dw12_irq_handler(struct motion_sensor_t *s, uint32_t *event) if (status & LIS2DW12_DOUBLE_TAP) *event |= CONFIG_GESTURE_TAP_EVENT; } -#endif /* CONFIG_GESTURE_SENSOR_BATTERY_TAP */ +#endif /* CONFIG_GESTURE_SENSOR_DOUBLE_TAP */ #ifdef CONFIG_ACCEL_FIFO { diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index 41ac393b23..e46a367b6a 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -772,7 +772,7 @@ int manage_activity(const struct motion_sensor_t *s, break; } #endif -#ifdef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP case MOTIONSENSE_ACTIVITY_DOUBLE_TAP: { int tmp; /* Set double tap interrupt */ @@ -1059,7 +1059,7 @@ static int config_interrupt(const struct motion_sensor_t *s) raw_write8(s->port, s->i2c_spi_addr_flags, BMI160_CMD_REG, BMI160_CMD_INT_RESET); -#ifdef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP raw_write8(s->port, s->i2c_spi_addr_flags, BMI160_INT_TAP_0, BMI160_TAP_DUR(s, CONFIG_GESTURE_TAP_MAX_INTERSTICE_T)); @@ -1099,7 +1099,7 @@ static int config_interrupt(const struct motion_sensor_t *s) #ifdef CONFIG_GESTURE_SIGMO tmp |= BMI160_INT_ANYMOTION; #endif -#ifdef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP tmp |= BMI160_INT_D_TAP; #endif #ifdef CONFIG_BMI160_ORIENTATION_SENSOR @@ -1207,7 +1207,7 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event) if (rv) return rv; -#ifdef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP if (interrupt & BMI160_D_TAP_INT) *event |= TASK_EVENT_MOTION_ACTIVITY_INTERRUPT( MOTIONSENSE_ACTIVITY_DOUBLE_TAP); @@ -1311,7 +1311,7 @@ static int init(const struct motion_sensor_t *s) data->disabled_activities |= 1 << MOTIONSENSE_ACTIVITY_SIG_MOTION; #endif -#ifdef CONFIG_GESTURE_DETECTION_MASK +#ifdef CONFIG_GESTURE_SENSOR_DOUBLE_TAP data->disabled_activities |= 1 << MOTIONSENSE_ACTIVITY_DOUBLE_TAP; #endif |