drivers: sensor: bmi160: Shorten the structs a bit
This driver uses verbose names for the config and data structures, which makes it harder to see which one we are talking about. Shorten it, like the bme280 driver. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
Carles Cufí
parent
ad78766139
commit
c3823b9144
3 changed files with 27 additions and 27 deletions
|
|
@ -21,12 +21,12 @@
|
|||
|
||||
LOG_MODULE_REGISTER(BMI160, CONFIG_SENSOR_LOG_LEVEL);
|
||||
|
||||
struct bmi160_device_data bmi160_data;
|
||||
struct bmi160_data bmi160_data;
|
||||
|
||||
static int bmi160_transceive(const struct device *dev, uint8_t reg,
|
||||
bool write, void *data, size_t length)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
const struct spi_buf buf[2] = {
|
||||
{
|
||||
.buf = ®,
|
||||
|
|
@ -208,7 +208,7 @@ static int bmi160_freq_to_odr_val(uint16_t freq_int, uint16_t freq_milli)
|
|||
static int bmi160_acc_odr_set(const struct device *dev, uint16_t freq_int,
|
||||
uint16_t freq_milli)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
int odr = bmi160_freq_to_odr_val(freq_int, freq_milli);
|
||||
|
||||
if (odr < 0) {
|
||||
|
|
@ -310,7 +310,7 @@ static int bmi160_do_calibration(const struct device *dev, uint8_t foc_conf)
|
|||
#if defined(CONFIG_BMI160_ACCEL_RANGE_RUNTIME)
|
||||
static int bmi160_acc_range_set(const struct device *dev, int32_t range)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
int32_t reg_val = bmi160_range_to_reg_val(range,
|
||||
bmi160_acc_range_map,
|
||||
BMI160_ACC_RANGE_MAP_SIZE);
|
||||
|
|
@ -373,7 +373,7 @@ static int bmi160_acc_calibrate(const struct device *dev,
|
|||
enum sensor_channel chan,
|
||||
const struct sensor_value *xyz_calib_value)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
uint8_t foc_pos[] = {
|
||||
BMI160_FOC_ACC_X_POS,
|
||||
BMI160_FOC_ACC_Y_POS,
|
||||
|
|
@ -477,7 +477,7 @@ static int bmi160_gyr_odr_set(const struct device *dev, uint16_t freq_int,
|
|||
#if defined(CONFIG_BMI160_GYRO_RANGE_RUNTIME)
|
||||
static int bmi160_gyr_range_set(const struct device *dev, uint16_t range)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
int32_t reg_val = bmi160_range_to_reg_val(range,
|
||||
bmi160_gyr_range_map,
|
||||
BMI160_GYR_RANGE_MAP_SIZE);
|
||||
|
|
@ -561,7 +561,7 @@ static int bmi160_gyr_ofs_set(const struct device *dev,
|
|||
static int bmi160_gyr_calibrate(const struct device *dev,
|
||||
enum sensor_channel chan)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
|
||||
ARG_UNUSED(chan);
|
||||
|
||||
|
|
@ -639,7 +639,7 @@ static int bmi160_attr_set(const struct device *dev, enum sensor_channel chan,
|
|||
static int bmi160_sample_fetch(const struct device *dev,
|
||||
enum sensor_channel chan)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
size_t i;
|
||||
|
||||
__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
|
||||
|
|
@ -721,7 +721,7 @@ static inline void bmi160_gyr_channel_get(const struct device *dev,
|
|||
enum sensor_channel chan,
|
||||
struct sensor_value *val)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
|
||||
bmi160_channel_convert(chan, bmi160->scale.gyr,
|
||||
bmi160->sample.gyr, val);
|
||||
|
|
@ -733,7 +733,7 @@ static inline void bmi160_acc_channel_get(const struct device *dev,
|
|||
enum sensor_channel chan,
|
||||
struct sensor_value *val)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
|
||||
bmi160_channel_convert(chan, bmi160->scale.acc,
|
||||
bmi160->sample.acc, val);
|
||||
|
|
@ -745,7 +745,7 @@ static int bmi160_temp_channel_get(const struct device *dev,
|
|||
{
|
||||
uint16_t temp_raw = 0U;
|
||||
int32_t temp_micro = 0;
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
|
||||
if (bmi160->pmu_sts.raw == 0U) {
|
||||
return -EINVAL;
|
||||
|
|
@ -806,7 +806,7 @@ static const struct sensor_driver_api bmi160_api = {
|
|||
|
||||
int bmi160_init(const struct device *dev)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
uint8_t val = 0U;
|
||||
int32_t acc_range, gyr_range;
|
||||
|
||||
|
|
@ -912,7 +912,7 @@ int bmi160_init(const struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct bmi160_device_config bmi160_config = {
|
||||
const struct bmi160_cfg bmi160_config = {
|
||||
#if defined(CONFIG_BMI160_TRIGGER)
|
||||
.gpio_port = DT_INST_GPIO_LABEL(0, int_gpios),
|
||||
.int_pin = DT_INST_GPIO_PIN(0, int_gpios),
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ struct bmi160_range {
|
|||
uint8_t reg_val;
|
||||
};
|
||||
|
||||
struct bmi160_device_config {
|
||||
struct bmi160_cfg {
|
||||
#if defined(CONFIG_BMI160_TRIGGER)
|
||||
const char *gpio_port;
|
||||
gpio_pin_t int_pin;
|
||||
|
|
@ -454,7 +454,7 @@ struct bmi160_scale {
|
|||
uint16_t gyr; /* micro radians/s/lsb */
|
||||
};
|
||||
|
||||
struct bmi160_device_data {
|
||||
struct bmi160_data {
|
||||
const struct device *spi;
|
||||
struct spi_config spi_cfg;
|
||||
#if defined(CONFIG_BMI160_TRIGGER)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ LOG_MODULE_DECLARE(BMI160, CONFIG_SENSOR_LOG_LEVEL);
|
|||
|
||||
static void bmi160_handle_anymotion(const struct device *dev)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
struct sensor_trigger anym_trigger = {
|
||||
.type = SENSOR_TRIG_DELTA,
|
||||
.chan = SENSOR_CHAN_ACCEL_XYZ,
|
||||
|
|
@ -29,7 +29,7 @@ static void bmi160_handle_anymotion(const struct device *dev)
|
|||
|
||||
static void bmi160_handle_drdy(const struct device *dev, uint8_t status)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
struct sensor_trigger drdy_trigger = {
|
||||
.type = SENSOR_TRIG_DATA_READY,
|
||||
};
|
||||
|
|
@ -81,7 +81,7 @@ static void bmi160_handle_interrupts(const struct device *dev)
|
|||
static K_KERNEL_STACK_DEFINE(bmi160_thread_stack, CONFIG_BMI160_THREAD_STACK_SIZE);
|
||||
static struct k_thread bmi160_thread;
|
||||
|
||||
static void bmi160_thread_main(struct bmi160_device_data *bmi160)
|
||||
static void bmi160_thread_main(struct bmi160_data *bmi160)
|
||||
{
|
||||
while (1) {
|
||||
k_sem_take(&bmi160->sem, K_FOREVER);
|
||||
|
|
@ -93,20 +93,20 @@ static void bmi160_thread_main(struct bmi160_device_data *bmi160)
|
|||
#ifdef CONFIG_BMI160_TRIGGER_GLOBAL_THREAD
|
||||
static void bmi160_work_handler(struct k_work *work)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 =
|
||||
CONTAINER_OF(work, struct bmi160_device_data, work);
|
||||
struct bmi160_data *bmi160 =
|
||||
CONTAINER_OF(work, struct bmi160_data, work);
|
||||
|
||||
bmi160_handle_interrupts(bmi160->dev);
|
||||
}
|
||||
#endif
|
||||
|
||||
extern struct bmi160_device_data bmi160_data;
|
||||
extern struct bmi160_data bmi160_data;
|
||||
|
||||
static void bmi160_gpio_callback(const struct device *port,
|
||||
struct gpio_callback *cb, uint32_t pin)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 =
|
||||
CONTAINER_OF(cb, struct bmi160_device_data, gpio_cb);
|
||||
struct bmi160_data *bmi160 =
|
||||
CONTAINER_OF(cb, struct bmi160_data, gpio_cb);
|
||||
|
||||
ARG_UNUSED(port);
|
||||
ARG_UNUSED(pin);
|
||||
|
|
@ -122,7 +122,7 @@ static int bmi160_trigger_drdy_set(const struct device *dev,
|
|||
enum sensor_channel chan,
|
||||
sensor_trigger_handler_t handler)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
uint8_t drdy_en = 0U;
|
||||
|
||||
#if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
|
||||
|
|
@ -157,7 +157,7 @@ static int bmi160_trigger_drdy_set(const struct device *dev,
|
|||
static int bmi160_trigger_anym_set(const struct device *dev,
|
||||
sensor_trigger_handler_t handler)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
uint8_t anym_en = 0U;
|
||||
|
||||
bmi160->handler_anymotion = handler;
|
||||
|
|
@ -266,9 +266,9 @@ int bmi160_trigger_set(const struct device *dev,
|
|||
|
||||
int bmi160_trigger_mode_init(const struct device *dev)
|
||||
{
|
||||
struct bmi160_device_data *bmi160 = dev->data;
|
||||
struct bmi160_data *bmi160 = dev->data;
|
||||
|
||||
const struct bmi160_device_config *cfg = dev->config;
|
||||
const struct bmi160_cfg *cfg = dev->config;
|
||||
|
||||
bmi160->gpio = device_get_binding((char *)cfg->gpio_port);
|
||||
if (!bmi160->gpio) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue