diff options
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/accelgyro_bmi160.c | 12 | ||||
| -rw-r--r-- | driver/accelgyro_bmi260.c | 14 | ||||
| -rw-r--r-- | driver/accelgyro_bmi_common.c | 9 |
3 files changed, 11 insertions, 24 deletions
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index 78958ee5c9..f92f61d181 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -385,16 +385,6 @@ static int manage_activity(const struct motion_sensor_t *s, } return ret; } - -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; - *disabled = data->disabled_activities; - return EC_RES_SUCCESS; -} #endif static __maybe_unused int config_interrupt(const struct motion_sensor_t *s) @@ -761,7 +751,7 @@ const struct accelgyro_drv bmi160_drv = { #endif #ifdef CONFIG_GESTURE_HOST_DETECTION .manage_activity = manage_activity, - .list_activities = list_activities, + .list_activities = bmi_list_activities, #endif #ifdef CONFIG_BODY_DETECTION .get_rms_noise = bmi_get_rms_noise, diff --git a/driver/accelgyro_bmi260.c b/driver/accelgyro_bmi260.c index 3e76788366..9fb669e122 100644 --- a/driver/accelgyro_bmi260.c +++ b/driver/accelgyro_bmi260.c @@ -282,18 +282,6 @@ end_perform_calib: return ret; } -#ifdef CONFIG_GESTURE_HOST_DETECTION -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; - *disabled = data->disabled_activities; - return EC_RES_SUCCESS; -} -#endif - #ifdef CONFIG_ACCEL_INTERRUPTS /** @@ -593,7 +581,7 @@ const struct accelgyro_drv bmi260_drv = { .irq_handler = irq_handler, #endif #ifdef CONFIG_GESTURE_HOST_DETECTION - .list_activities = list_activities, + .list_activities = bmi_list_activities, #endif #ifdef CONFIG_BODY_DETECTION .get_rms_noise = bmi_get_rms_noise, diff --git a/driver/accelgyro_bmi_common.c b/driver/accelgyro_bmi_common.c index 5bd7cef42c..2da407427e 100644 --- a/driver/accelgyro_bmi_common.c +++ b/driver/accelgyro_bmi_common.c @@ -891,3 +891,12 @@ void motion_orientation_update(const struct motion_sensor_t *s) } #endif +int bmi_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; + *disabled = data->disabled_activities; + return EC_RES_SUCCESS; +} |