Skip to content

Commit 67c6f26

Browse files
dchat-nordiccarlescufi
dchat-nordic
authored and
carlescufi
committed
sensor: Refactor bmi270 driver data names
Make driver data names consistent in code. Signed-off-by: Dominik Chat <[email protected]>
1 parent 6cbb84c commit 67c6f26

File tree

1 file changed

+55
-55
lines changed

1 file changed

+55
-55
lines changed

‎drivers/sensor/bmi270/bmi270.c‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static uint8_t acc_odr_to_reg(const struct sensor_value *val)
143143
static int set_accel_odr_osr(const struct device *dev, const struct sensor_value *odr,
144144
const struct sensor_value *osr)
145145
{
146-
struct bmi270_data *drv_dev = dev->data;
146+
struct bmi270_data *data = dev->data;
147147
uint8_t acc_conf, odr_bits, pwr_ctrl, osr_bits;
148148
int ret = 0;
149149

@@ -185,11 +185,11 @@ static int set_accel_odr_osr(const struct device *dev, const struct sensor_value
185185
BMI270_ACC_FILT_PWR_OPT);
186186
}
187187

188-
drv_dev->acc_odr = odr_bits;
188+
data->acc_odr = odr_bits;
189189
}
190190

191191
if (osr) {
192-
if (drv_dev->acc_odr >= BMI270_ACC_ODR_100_HZ) {
192+
if (data->acc_odr >= BMI270_ACC_ODR_100_HZ) {
193193
/* Performance mode */
194194
/* osr->val2 should be unused */
195195
switch (osr->val1) {
@@ -263,7 +263,7 @@ static int set_accel_odr_osr(const struct device *dev, const struct sensor_value
263263

264264
static int set_accel_range(const struct device *dev, const struct sensor_value *range)
265265
{
266-
struct bmi270_data *drv_dev = dev->data;
266+
struct bmi270_data *data = dev->data;
267267
int ret = 0;
268268
uint8_t acc_range, reg;
269269

@@ -276,19 +276,19 @@ static int set_accel_range(const struct device *dev, const struct sensor_value *
276276
switch (range->val1) {
277277
case 2:
278278
reg = BMI270_ACC_RANGE_2G;
279-
drv_dev->acc_range = 2;
279+
data->acc_range = 2;
280280
break;
281281
case 4:
282282
reg = BMI270_ACC_RANGE_4G;
283-
drv_dev->acc_range = 4;
283+
data->acc_range = 4;
284284
break;
285285
case 8:
286286
reg = BMI270_ACC_RANGE_8G;
287-
drv_dev->acc_range = 8;
287+
data->acc_range = 8;
288288
break;
289289
case 16:
290290
reg = BMI270_ACC_RANGE_16G;
291-
drv_dev->acc_range = 16;
291+
data->acc_range = 16;
292292
break;
293293
default:
294294
return -ENOTSUP;
@@ -331,7 +331,7 @@ static uint8_t gyr_odr_to_reg(const struct sensor_value *val)
331331
static int set_gyro_odr_osr(const struct device *dev, const struct sensor_value *odr,
332332
const struct sensor_value *osr)
333333
{
334-
struct bmi270_data *drv_dev = dev->data;
334+
struct bmi270_data *data = dev->data;
335335
uint8_t gyr_conf, odr_bits, pwr_ctrl, osr_bits;
336336
int ret = 0;
337337

@@ -381,7 +381,7 @@ static int set_gyro_odr_osr(const struct device *dev, const struct sensor_value
381381
BMI270_GYR_FILT_NOISE_PWR);
382382
}
383383

384-
drv_dev->gyr_odr = odr_bits;
384+
data->gyr_odr = odr_bits;
385385
}
386386

387387
if (osr) {
@@ -422,7 +422,7 @@ static int set_gyro_odr_osr(const struct device *dev, const struct sensor_value
422422

423423
static int set_gyro_range(const struct device *dev, const struct sensor_value *range)
424424
{
425-
struct bmi270_data *drv_dev = dev->data;
425+
struct bmi270_data *data = dev->data;
426426
int ret = 0;
427427
uint8_t gyr_range, reg;
428428

@@ -435,23 +435,23 @@ static int set_gyro_range(const struct device *dev, const struct sensor_value *r
435435
switch (range->val1) {
436436
case 125:
437437
reg = BMI270_GYR_RANGE_125DPS;
438-
drv_dev->gyr_range = 125;
438+
data->gyr_range = 125;
439439
break;
440440
case 250:
441441
reg = BMI270_GYR_RANGE_250DPS;
442-
drv_dev->gyr_range = 250;
442+
data->gyr_range = 250;
443443
break;
444444
case 500:
445445
reg = BMI270_GYR_RANGE_500DPS;
446-
drv_dev->gyr_range = 500;
446+
data->gyr_range = 500;
447447
break;
448448
case 1000:
449449
reg = BMI270_GYR_RANGE_1000DPS;
450-
drv_dev->gyr_range = 1000;
450+
data->gyr_range = 1000;
451451
break;
452452
case 2000:
453453
reg = BMI270_GYR_RANGE_2000DPS;
454-
drv_dev->gyr_range = 2000;
454+
data->gyr_range = 2000;
455455
break;
456456
default:
457457
return -ENOTSUP;
@@ -497,29 +497,29 @@ static int8_t write_config_file(const struct device *dev)
497497

498498
static int bmi270_sample_fetch(const struct device *dev, enum sensor_channel chan)
499499
{
500-
struct bmi270_data *drv_dev = dev->data;
501-
uint8_t data[12];
500+
struct bmi270_data *data = dev->data;
501+
uint8_t buf[12];
502502
int ret;
503503

504504
if (chan != SENSOR_CHAN_ALL) {
505505
return -ENOTSUP;
506506
}
507507

508-
ret = bmi270_reg_read(dev, BMI270_REG_ACC_X_LSB, data, 12);
508+
ret = bmi270_reg_read(dev, BMI270_REG_ACC_X_LSB, buf, 12);
509509
if (ret == 0) {
510-
drv_dev->ax = (int16_t)sys_get_le16(&data[0]);
511-
drv_dev->ay = (int16_t)sys_get_le16(&data[2]);
512-
drv_dev->az = (int16_t)sys_get_le16(&data[4]);
513-
drv_dev->gx = (int16_t)sys_get_le16(&data[6]);
514-
drv_dev->gy = (int16_t)sys_get_le16(&data[8]);
515-
drv_dev->gz = (int16_t)sys_get_le16(&data[10]);
510+
data->ax = (int16_t)sys_get_le16(&buf[0]);
511+
data->ay = (int16_t)sys_get_le16(&buf[2]);
512+
data->az = (int16_t)sys_get_le16(&buf[4]);
513+
data->gx = (int16_t)sys_get_le16(&buf[6]);
514+
data->gy = (int16_t)sys_get_le16(&buf[8]);
515+
data->gz = (int16_t)sys_get_le16(&buf[10]);
516516
} else {
517-
drv_dev->ax = 0;
518-
drv_dev->ay = 0;
519-
drv_dev->az = 0;
520-
drv_dev->gx = 0;
521-
drv_dev->gy = 0;
522-
drv_dev->gz = 0;
517+
data->ax = 0;
518+
data->ay = 0;
519+
data->az = 0;
520+
data->gx = 0;
521+
data->gy = 0;
522+
data->gz = 0;
523523
}
524524

525525
return ret;
@@ -528,34 +528,34 @@ static int bmi270_sample_fetch(const struct device *dev, enum sensor_channel cha
528528
static int bmi270_channel_get(const struct device *dev, enum sensor_channel chan,
529529
struct sensor_value *val)
530530
{
531-
struct bmi270_data *drv_dev = dev->data;
531+
struct bmi270_data *data = dev->data;
532532

533533
if (chan == SENSOR_CHAN_ACCEL_X) {
534-
channel_accel_convert(val, drv_dev->ax, drv_dev->acc_range);
534+
channel_accel_convert(val, data->ax, data->acc_range);
535535
} else if (chan == SENSOR_CHAN_ACCEL_Y) {
536-
channel_accel_convert(val, drv_dev->ay, drv_dev->acc_range);
536+
channel_accel_convert(val, data->ay, data->acc_range);
537537
} else if (chan == SENSOR_CHAN_ACCEL_Z) {
538-
channel_accel_convert(val, drv_dev->az, drv_dev->acc_range);
538+
channel_accel_convert(val, data->az, data->acc_range);
539539
} else if (chan == SENSOR_CHAN_ACCEL_XYZ) {
540-
channel_accel_convert(&val[0], drv_dev->ax,
541-
drv_dev->acc_range);
542-
channel_accel_convert(&val[1], drv_dev->ay,
543-
drv_dev->acc_range);
544-
channel_accel_convert(&val[2], drv_dev->az,
545-
drv_dev->acc_range);
540+
channel_accel_convert(&val[0], data->ax,
541+
data->acc_range);
542+
channel_accel_convert(&val[1], data->ay,
543+
data->acc_range);
544+
channel_accel_convert(&val[2], data->az,
545+
data->acc_range);
546546
} else if (chan == SENSOR_CHAN_GYRO_X) {
547-
channel_gyro_convert(val, drv_dev->gx, drv_dev->gyr_range);
547+
channel_gyro_convert(val, data->gx, data->gyr_range);
548548
} else if (chan == SENSOR_CHAN_GYRO_Y) {
549-
channel_gyro_convert(val, drv_dev->gy, drv_dev->gyr_range);
549+
channel_gyro_convert(val, data->gy, data->gyr_range);
550550
} else if (chan == SENSOR_CHAN_GYRO_Z) {
551-
channel_gyro_convert(val, drv_dev->gz, drv_dev->gyr_range);
551+
channel_gyro_convert(val, data->gz, data->gyr_range);
552552
} else if (chan == SENSOR_CHAN_GYRO_XYZ) {
553-
channel_gyro_convert(&val[0], drv_dev->gx,
554-
drv_dev->gyr_range);
555-
channel_gyro_convert(&val[1], drv_dev->gy,
556-
drv_dev->gyr_range);
557-
channel_gyro_convert(&val[2], drv_dev->gz,
558-
drv_dev->gyr_range);
553+
channel_gyro_convert(&val[0], data->gx,
554+
data->gyr_range);
555+
channel_gyro_convert(&val[1], data->gy,
556+
data->gyr_range);
557+
channel_gyro_convert(&val[2], data->gz,
558+
data->gyr_range);
559559
} else {
560560
return -ENOTSUP;
561561
}
@@ -611,7 +611,7 @@ static int bmi270_attr_set(const struct device *dev, enum sensor_channel chan,
611611
static int bmi270_init(const struct device *dev)
612612
{
613613
int ret;
614-
struct bmi270_data *drv_dev = dev->data;
614+
struct bmi270_data *data = dev->data;
615615
uint8_t chip_id;
616616
uint8_t soft_reset_cmd;
617617
uint8_t init_ctrl;
@@ -625,10 +625,10 @@ static int bmi270_init(const struct device *dev)
625625
return ret;
626626
}
627627

628-
drv_dev->acc_odr = BMI270_ACC_ODR_100_HZ;
629-
drv_dev->acc_range = 8;
630-
drv_dev->gyr_odr = BMI270_GYR_ODR_200_HZ;
631-
drv_dev->gyr_range = 2000;
628+
data->acc_odr = BMI270_ACC_ODR_100_HZ;
629+
data->acc_range = 8;
630+
data->gyr_odr = BMI270_GYR_ODR_200_HZ;
631+
data->gyr_range = 2000;
632632

633633
k_usleep(BMI270_POWER_ON_TIME);
634634

0 commit comments

Comments
 (0)