diff options
| author | pengjunhao5 <pengjunhao5@huaqin.corp-partner.google.com> | 2021-09-01 09:53:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-12 15:10:16 +0000 |
| commit | 10c534dbe9037e15aca10fe29c2953cb5696cdc8 (patch) | |
| tree | a230107dbf603f55ca70214434d9c4d878b718da | |
| parent | 9075342132c2325103571258304f62352236a018 (diff) | |
| download | chrome-ec-10c534dbe9037e15aca10fe29c2953cb5696cdc8.tar.gz | |
Coachz: MotionSensor: Avoid redefine gesture function list_activites
This commit is for motion sensor combine(BMI160 & BMI260),Avoid redefine
gesture function `list_activites`.
BUG=b:195908820
TEST=make -j BOARD=coachz
Verify build on SIT board
BRANCH=Trogdor
Signed-off-by: pengjunhao5 <pengjunhao5@huaqin.corp-partner.google.com>
Reviewed-by: tongjian <tongjian@huaqin.corp-partner.google.com>
Reviewed-by: yudengwu <yudengwu@huaqin.corp-partner.google.com>
Change-Id: If31442d0c00745d124b20188b4e5fad8a9a1d173
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3133188
Reviewed-by: Jian Tong <tongjian@huaqin.corp-partner.google.com>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
(cherry picked from commit cb3771973de86c9af21d9bc349d2db733283df43)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3213985
Tested-by: Rong Chang <rongchang@chromium.org>
Auto-Submit: Rong Chang <rongchang@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Rong Chang <rongchang@chromium.org>
| -rw-r--r-- | driver/accelgyro_bmi160.c | 16 | ||||
| -rw-r--r-- | driver/accelgyro_bmi260.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index 7beaa0de04..7681a5b391 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -277,10 +277,11 @@ end_perform_calib: * Defined even if host interface is not defined, to enable double tap even * when the host does not deal with gesture. */ -int manage_activity(const struct motion_sensor_t *s, - enum motionsensor_activity activity, - int enable, - const struct ec_motion_sense_activity *param) +#ifdef CONFIG_GESTURE_HOST_DETECTION +static int manage_activity(const struct motion_sensor_t *s, + enum motionsensor_activity activity, + int enable, + const struct ec_motion_sense_activity *param) { int ret; struct bmi_drv_data_t *data = BMI_GET_DATA(s); @@ -340,10 +341,9 @@ int manage_activity(const struct motion_sensor_t *s, return ret; } -#ifdef CONFIG_GESTURE_HOST_DETECTION -int list_activities(const struct motion_sensor_t *s, - uint32_t *enabled, - uint32_t *disabled) +static int list_activities(const struct motion_sensor_t *s, + uint32_t *enabled, + uint32_t *disabled) { struct bmi_drv_data_t *data = BMI_GET_DATA(s); *enabled = data->enabled_activities; diff --git a/driver/accelgyro_bmi260.c b/driver/accelgyro_bmi260.c index 4c1e0b1542..4e682bed8c 100644 --- a/driver/accelgyro_bmi260.c +++ b/driver/accelgyro_bmi260.c @@ -258,9 +258,9 @@ end_perform_calib: } #ifdef CONFIG_GESTURE_HOST_DETECTION -int list_activities(const struct motion_sensor_t *s, - uint32_t *enabled, - uint32_t *disabled) +static int list_activities(const struct motion_sensor_t *s, + uint32_t *enabled, + uint32_t *disabled) { struct bmi_drv_data_t *data = BMI_GET_DATA(s); *enabled = data->enabled_activities; |