Commit 0429f17b authored by Luis Ubieda's avatar Luis Ubieda Committed by Mahesh Mahadevan
Browse files

sensor: adxl3xx: Move run-time modification of ODR from cfg to data 

Config struct is constant and attempting to modify it triggers a fault.

Signed-off-by: default avatarLuis Ubieda <luisf@croxel.com>
(cherry picked from commit 5a9ff03c)
parent 5080ba8b

drivers/sensor/adi/adxl345/adxl345.c

+2 −2
Changes for drivers/sensor/adi/adxl345/adxl345.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int adxl345_attr_set_odr(const struct device *dev, 
				const struct sensor_value *val)

{

	enum adxl345_odr odr;

	struct adxl345_dev_config *cfg = (struct adxl345_dev_config *)dev->config;

	struct adxl345_dev_data *data = dev->data;



	switch (val->val1) {

	case 12:
@@ -257,7 +257,7 @@ static int adxl345_attr_set_odr(const struct device *dev, 
	int ret = adxl345_set_odr(dev, odr);



	if (ret == 0) {

		cfg->odr = odr;

		data->odr = odr;

	}



	return ret;

drivers/sensor/adi/adxl345/adxl345.h

+1 −0
Changes for drivers/sensor/adi/adxl345/adxl345.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ struct adxl345_dev_data { 
	struct adxl345_fifo_config fifo_config;

	uint8_t is_full_res;

	uint8_t selected_range;

	enum adxl345_odr odr;

#ifdef CONFIG_ADXL345_TRIGGER

	struct gpio_callback gpio_cb;

drivers/sensor/adi/adxl345/adxl345_stream.c

+1 −1
Changes for drivers/sensor/adi/adxl345/adxl345_stream.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void adxl345_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq 
	hdr->int_status = data->status1;

	hdr->is_full_res = data->is_full_res;

	hdr->selected_range = data->selected_range;

	hdr->accel_odr = cfg->odr;

	hdr->accel_odr = data->odr;

	hdr->sample_set_size = sample_set_size;



	uint32_t buf_avail = buf_len;

drivers/sensor/adi/adxl372/adxl372.c

+2 −2
Changes for drivers/sensor/adi/adxl372/adxl372.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static int adxl372_attr_set_odr(const struct device *dev, 
				const struct sensor_value *val)

{

	enum adxl372_odr odr;

	struct adxl372_dev_config *cfg = (struct adxl372_dev_config *)dev->config;

	struct adxl372_data *data = dev->data;



	switch (val->val1) {

	case 400:
@@ -575,7 +575,7 @@ static int adxl372_attr_set_odr(const struct device *dev, 
	int ret = adxl372_set_odr(dev, odr);



	if (ret == 0) {

		cfg->odr = odr;

		data->odr = odr;

	}



	return ret;

drivers/sensor/adi/adxl372/adxl372.h

+1 −0
Changes for drivers/sensor/adi/adxl372/adxl372.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ struct adxl372_data { 
	const struct adxl372_transfer_function *hw_tf;

	struct adxl372_fifo_config fifo_config;

	enum adxl372_act_proc_mode act_proc_mode;

	enum adxl372_odr odr;

#ifdef CONFIG_ADXL372_TRIGGER

	struct gpio_callback gpio_cb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE