patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: sensor: bmi160: Store sensor trigger as a pointer

Browse source 
Fixes the bmi160 sensor driver to store the user-supplied sensor
trigger as a pointer rather than a copy. This enables the trigger
handler to use CONTAINER_OF to retrieve a context pointer when the
trigger is embedded in a larger struct.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
This commit is contained in:
Maureen Helm 2023-03-07 13:07:59 -06:00 committed by Carles Cufí
parent 666a0dffd2
commit eac3ac2d87
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/sensor/bmi160/bmi160.h
View file

@ -504,10 +504,13 @@ struct bmi160_data {
#ifdef CONFIG_BMI160_TRIGGER
#if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
sensor_trigger_handler_t handler_drdy_acc;
const struct sensor_trigger *trig_drdy_acc;
sensor_trigger_handler_t handler_anymotion;
const struct sensor_trigger *trig_anymotion;
#endif
#if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND)
sensor_trigger_handler_t handler_drdy_gyr;
const struct sensor_trigger *trig_drdy_gyr;
#endif
#endif /* CONFIG_BMI160_TRIGGER */
};

26
drivers/sensor/bmi160/bmi160_trigger.c
View file

@ -17,34 +17,25 @@ LOG_MODULE_DECLARE(BMI160, CONFIG_SENSOR_LOG_LEVEL);
static void bmi160_handle_anymotion(const struct device *dev)
{
struct bmi160_data *data = dev->data;
struct sensor_trigger anym_trigger = {
.type = SENSOR_TRIG_DELTA,
.chan = SENSOR_CHAN_ACCEL_XYZ,
};
if (data->handler_anymotion) {
data->handler_anymotion(dev, &anym_trigger);
data->handler_anymotion(dev, data->trig_anymotion);
}
}
static void bmi160_handle_drdy(const struct device *dev, uint8_t status)
{
struct bmi160_data *data = dev->data;
struct sensor_trigger drdy_trigger = {
.type = SENSOR_TRIG_DATA_READY,
};
#if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
if (data->handler_drdy_acc && (status & BMI160_STATUS_ACC_DRDY)) {
drdy_trigger.chan = SENSOR_CHAN_ACCEL_XYZ;
data->handler_drdy_acc(dev, &drdy_trigger);
data->handler_drdy_acc(dev, data->trig_drdy_acc);
}
#endif
#if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND)
if (data->handler_drdy_gyr && (status & BMI160_STATUS_GYR_DRDY)) {
drdy_trigger.chan = SENSOR_CHAN_GYRO_XYZ;
data->handler_drdy_gyr(dev, &drdy_trigger);
data->handler_drdy_gyr(dev, data->trig_drdy_gyr);
}
#endif
}
@ -118,6 +109,7 @@ static void bmi160_gpio_callback(const struct device *port,
static int bmi160_trigger_drdy_set(const struct device *dev,
enum sensor_channel chan,
const struct sensor_trigger *trig,
sensor_trigger_handler_t handler)
{
struct bmi160_data *data = dev->data;
@ -126,6 +118,7 @@ static int bmi160_trigger_drdy_set(const struct device *dev,
#if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
if (chan == SENSOR_CHAN_ACCEL_XYZ) {
data->handler_drdy_acc = handler;
data->trig_drdy_acc = trig;
}
if (data->handler_drdy_acc) {
@ -136,6 +129,7 @@ static int bmi160_trigger_drdy_set(const struct device *dev,
#if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND)
if (chan == SENSOR_CHAN_GYRO_XYZ) {
data->handler_drdy_gyr = handler;
data->trig_drdy_gyr = trig;
}
if (data->handler_drdy_gyr) {
@ -153,12 +147,14 @@ static int bmi160_trigger_drdy_set(const struct device *dev,
#if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
static int bmi160_trigger_anym_set(const struct device *dev,
const struct sensor_trigger *trig,
sensor_trigger_handler_t handler)
{
struct bmi160_data *data = dev->data;
uint8_t anym_en = 0U;
data->handler_anymotion = handler;
data->trig_anymotion = trig;
if (handler) {
anym_en = BMI160_INT_ANYM_X_EN |
@ -179,9 +175,9 @@ static int bmi160_trigger_set_acc(const struct device *dev,
sensor_trigger_handler_t handler)
{
if (trig->type == SENSOR_TRIG_DATA_READY) {
return bmi160_trigger_drdy_set(dev, trig->chan, handler);
return bmi160_trigger_drdy_set(dev, trig->chan, trig, handler);
} else if (trig->type == SENSOR_TRIG_DELTA) {
return bmi160_trigger_anym_set(dev, handler);
return bmi160_trigger_anym_set(dev, trig, handler);
}
return -ENOTSUP;
@ -238,7 +234,7 @@ static int bmi160_trigger_set_gyr(const struct device *dev,
sensor_trigger_handler_t handler)
{
if (trig->type == SENSOR_TRIG_DATA_READY) {
return bmi160_trigger_drdy_set(dev, trig->chan, handler);
return bmi160_trigger_drdy_set(dev, trig->chan, trig, handler);
}
return -ENOTSUP;