zephyr: replace zephyr integer types with C99 types
git grep -l 'u\(8\|16\|32\|64\)_t' | \ xargs sed -i "s/u\(8\|16\|32\|64\)_t/uint\1_t/g" git grep -l 's\(8\|16\|32\|64\)_t' | \ xargs sed -i "s/s\(8\|16\|32\|64\)_t/int\1_t/g" Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala
Kumar Gala
parent
ee6fa31af6
commit
a1b77fd589
2364 changed files with 32505 additions and 32505 deletions
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
LOG_MODULE_REGISTER(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
|
||||
|
||||
static const u16_t lsm6dso_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
|
||||
static const uint16_t lsm6dso_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
|
||||
1660, 3330, 6660};
|
||||
|
||||
#if defined(LSM6DSO_ACCEL_ODR_RUNTIME) || defined(LSM6DSO_GYRO_ODR_RUNTIME)
|
||||
static int lsm6dso_freq_to_odr_val(u16_t freq)
|
||||
static int lsm6dso_freq_to_odr_val(uint16_t freq)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ static int lsm6dso_freq_to_odr_val(u16_t freq)
|
|||
}
|
||||
#endif
|
||||
|
||||
static int lsm6dso_odr_to_freq_val(u16_t odr)
|
||||
static int lsm6dso_odr_to_freq_val(uint16_t odr)
|
||||
{
|
||||
/* for valid index, return value from map */
|
||||
if (odr < ARRAY_SIZE(lsm6dso_odr_map)) {
|
||||
|
|
@ -53,10 +53,10 @@ static int lsm6dso_odr_to_freq_val(u16_t odr)
|
|||
}
|
||||
|
||||
#ifdef LSM6DSO_ACCEL_FS_RUNTIME
|
||||
static const u16_t lsm6dso_accel_fs_map[] = {2, 16, 4, 8};
|
||||
static const u16_t lsm6dso_accel_fs_sens[] = {1, 8, 2, 4};
|
||||
static const uint16_t lsm6dso_accel_fs_map[] = {2, 16, 4, 8};
|
||||
static const uint16_t lsm6dso_accel_fs_sens[] = {1, 8, 2, 4};
|
||||
|
||||
static int lsm6dso_accel_range_to_fs_val(s32_t range)
|
||||
static int lsm6dso_accel_range_to_fs_val(int32_t range)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
@ -71,10 +71,10 @@ static int lsm6dso_accel_range_to_fs_val(s32_t range)
|
|||
#endif
|
||||
|
||||
#ifdef LSM6DSO_GYRO_FS_RUNTIME
|
||||
static const u16_t lsm6dso_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
|
||||
static const u16_t lsm6dso_gyro_fs_sens[] = {2, 4, 8, 16, 1};
|
||||
static const uint16_t lsm6dso_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
|
||||
static const uint16_t lsm6dso_gyro_fs_sens[] = {2, 4, 8, 16, 1};
|
||||
|
||||
static int lsm6dso_gyro_range_to_fs_val(s32_t range)
|
||||
static int lsm6dso_gyro_range_to_fs_val(int32_t range)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ static inline int lsm6dso_reboot(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs)
|
||||
static int lsm6dso_accel_set_fs_raw(struct device *dev, uint8_t fs)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr)
|
||||
static int lsm6dso_accel_set_odr_raw(struct device *dev, uint8_t odr)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs)
|
||||
static int lsm6dso_gyro_set_fs_raw(struct device *dev, uint8_t fs)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr)
|
||||
static int lsm6dso_gyro_set_odr_raw(struct device *dev, uint8_t odr)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr)
|
|||
}
|
||||
|
||||
#ifdef LSM6DSO_ACCEL_ODR_RUNTIME
|
||||
static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq)
|
||||
static int lsm6dso_accel_odr_set(struct device *dev, uint16_t freq)
|
||||
{
|
||||
int odr;
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq)
|
|||
#endif
|
||||
|
||||
#ifdef LSM6DSO_ACCEL_FS_RUNTIME
|
||||
static int lsm6dso_accel_range_set(struct device *dev, s32_t range)
|
||||
static int lsm6dso_accel_range_set(struct device *dev, int32_t range)
|
||||
{
|
||||
int fs;
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
|
@ -212,7 +212,7 @@ static int lsm6dso_accel_config(struct device *dev, enum sensor_channel chan,
|
|||
}
|
||||
|
||||
#ifdef LSM6DSO_GYRO_ODR_RUNTIME
|
||||
static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq)
|
||||
static int lsm6dso_gyro_odr_set(struct device *dev, uint16_t freq)
|
||||
{
|
||||
int odr;
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq)
|
|||
#endif
|
||||
|
||||
#ifdef LSM6DSO_GYRO_FS_RUNTIME
|
||||
static int lsm6dso_gyro_range_set(struct device *dev, s32_t range)
|
||||
static int lsm6dso_gyro_range_set(struct device *dev, int32_t range)
|
||||
{
|
||||
int fs;
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
|
|
@ -393,24 +393,24 @@ static int lsm6dso_sample_fetch(struct device *dev, enum sensor_channel chan)
|
|||
}
|
||||
|
||||
static inline void lsm6dso_accel_convert(struct sensor_value *val, int raw_val,
|
||||
u32_t sensitivity)
|
||||
uint32_t sensitivity)
|
||||
{
|
||||
s64_t dval;
|
||||
int64_t dval;
|
||||
|
||||
/* Sensitivity is exposed in ug/LSB */
|
||||
/* Convert to m/s^2 */
|
||||
dval = (s64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
|
||||
val->val1 = (s32_t)(dval / 1000000);
|
||||
val->val2 = (s32_t)(dval % 1000000);
|
||||
dval = (int64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
|
||||
val->val1 = (int32_t)(dval / 1000000);
|
||||
val->val2 = (int32_t)(dval % 1000000);
|
||||
|
||||
}
|
||||
|
||||
static inline int lsm6dso_accel_get_channel(enum sensor_channel chan,
|
||||
struct sensor_value *val,
|
||||
struct lsm6dso_data *data,
|
||||
u32_t sensitivity)
|
||||
uint32_t sensitivity)
|
||||
{
|
||||
u8_t i;
|
||||
uint8_t i;
|
||||
|
||||
switch (chan) {
|
||||
case SENSOR_CHAN_ACCEL_X:
|
||||
|
|
@ -442,23 +442,23 @@ static int lsm6dso_accel_channel_get(enum sensor_channel chan,
|
|||
}
|
||||
|
||||
static inline void lsm6dso_gyro_convert(struct sensor_value *val, int raw_val,
|
||||
u32_t sensitivity)
|
||||
uint32_t sensitivity)
|
||||
{
|
||||
s64_t dval;
|
||||
int64_t dval;
|
||||
|
||||
/* Sensitivity is exposed in udps/LSB */
|
||||
/* Convert to rad/s */
|
||||
dval = (s64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
|
||||
val->val1 = (s32_t)(dval / 1000000);
|
||||
val->val2 = (s32_t)(dval % 1000000);
|
||||
dval = (int64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
|
||||
val->val1 = (int32_t)(dval / 1000000);
|
||||
val->val2 = (int32_t)(dval % 1000000);
|
||||
}
|
||||
|
||||
static inline int lsm6dso_gyro_get_channel(enum sensor_channel chan,
|
||||
struct sensor_value *val,
|
||||
struct lsm6dso_data *data,
|
||||
u32_t sensitivity)
|
||||
uint32_t sensitivity)
|
||||
{
|
||||
u8_t i;
|
||||
uint8_t i;
|
||||
|
||||
switch (chan) {
|
||||
case SENSOR_CHAN_GYRO_X:
|
||||
|
|
@ -502,21 +502,21 @@ static void lsm6dso_gyro_channel_get_temp(struct sensor_value *val,
|
|||
|
||||
#if defined(CONFIG_LSM6DSO_SENSORHUB)
|
||||
static inline void lsm6dso_magn_convert(struct sensor_value *val, int raw_val,
|
||||
u16_t sensitivity)
|
||||
uint16_t sensitivity)
|
||||
{
|
||||
double dval;
|
||||
|
||||
/* Sensitivity is exposed in mgauss/LSB */
|
||||
dval = (double)(raw_val * sensitivity);
|
||||
val->val1 = (s32_t)dval / 1000000;
|
||||
val->val2 = (s32_t)dval % 1000000;
|
||||
val->val1 = (int32_t)dval / 1000000;
|
||||
val->val2 = (int32_t)dval % 1000000;
|
||||
}
|
||||
|
||||
static inline int lsm6dso_magn_get_channel(enum sensor_channel chan,
|
||||
struct sensor_value *val,
|
||||
struct lsm6dso_data *data)
|
||||
{
|
||||
s16_t sample[3];
|
||||
int16_t sample[3];
|
||||
int idx;
|
||||
|
||||
idx = lsm6dso_shub_get_idx(SENSOR_CHAN_MAGN_XYZ);
|
||||
|
|
@ -526,11 +526,11 @@ static inline int lsm6dso_magn_get_channel(enum sensor_channel chan,
|
|||
}
|
||||
|
||||
|
||||
sample[0] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][0] |
|
||||
sample[0] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][0] |
|
||||
(data->ext_data[idx][1] << 8)));
|
||||
sample[1] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][2] |
|
||||
sample[1] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][2] |
|
||||
(data->ext_data[idx][3] << 8)));
|
||||
sample[2] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][4] |
|
||||
sample[2] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][4] |
|
||||
(data->ext_data[idx][5] << 8)));
|
||||
|
||||
switch (chan) {
|
||||
|
|
@ -559,7 +559,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
|
|||
struct lsm6dso_data *data)
|
||||
{
|
||||
float rh;
|
||||
s16_t raw_val;
|
||||
int16_t raw_val;
|
||||
struct hts221_data *ht = &data->hts221;
|
||||
int idx;
|
||||
|
||||
|
|
@ -569,7 +569,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
|
|||
return;
|
||||
}
|
||||
|
||||
raw_val = sys_le16_to_cpu((s16_t)(data->ext_data[idx][0] |
|
||||
raw_val = sys_le16_to_cpu((int16_t)(data->ext_data[idx][0] |
|
||||
(data->ext_data[idx][1] << 8)));
|
||||
|
||||
/* find relative humidty by linear interpolation */
|
||||
|
|
@ -584,7 +584,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
|
|||
static inline void lsm6dso_press_convert(struct sensor_value *val,
|
||||
struct lsm6dso_data *data)
|
||||
{
|
||||
s32_t raw_val;
|
||||
int32_t raw_val;
|
||||
int idx;
|
||||
|
||||
idx = lsm6dso_shub_get_idx(SENSOR_CHAN_PRESS);
|
||||
|
|
@ -593,7 +593,7 @@ static inline void lsm6dso_press_convert(struct sensor_value *val,
|
|||
return;
|
||||
}
|
||||
|
||||
raw_val = sys_le32_to_cpu((s32_t)(data->ext_data[idx][0] |
|
||||
raw_val = sys_le32_to_cpu((int32_t)(data->ext_data[idx][0] |
|
||||
(data->ext_data[idx][1] << 8) |
|
||||
(data->ext_data[idx][2] << 16)));
|
||||
|
||||
|
|
@ -601,13 +601,13 @@ static inline void lsm6dso_press_convert(struct sensor_value *val,
|
|||
/* Convert raw_val to val in kPa */
|
||||
val->val1 = (raw_val >> 12) / 10;
|
||||
val->val2 = (raw_val >> 12) % 10 * 100000 +
|
||||
(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
|
||||
(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
|
||||
}
|
||||
|
||||
static inline void lsm6dso_temp_convert(struct sensor_value *val,
|
||||
struct lsm6dso_data *data)
|
||||
{
|
||||
s16_t raw_val;
|
||||
int16_t raw_val;
|
||||
int idx;
|
||||
|
||||
idx = lsm6dso_shub_get_idx(SENSOR_CHAN_PRESS);
|
||||
|
|
@ -616,12 +616,12 @@ static inline void lsm6dso_temp_convert(struct sensor_value *val,
|
|||
return;
|
||||
}
|
||||
|
||||
raw_val = sys_le16_to_cpu((s16_t)(data->ext_data[idx][3] |
|
||||
raw_val = sys_le16_to_cpu((int16_t)(data->ext_data[idx][3] |
|
||||
(data->ext_data[idx][4] << 8)));
|
||||
|
||||
/* Temperature sensitivity is 100 LSB/deg C */
|
||||
val->val1 = raw_val / 100;
|
||||
val->val2 = (s32_t)raw_val % 100 * (10000);
|
||||
val->val2 = (int32_t)raw_val % 100 * (10000);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -688,7 +688,7 @@ static const struct sensor_driver_api lsm6dso_api_funcs = {
|
|||
static int lsm6dso_init_chip(struct device *dev)
|
||||
{
|
||||
struct lsm6dso_data *lsm6dso = dev->driver_data;
|
||||
u8_t chip_id;
|
||||
uint8_t chip_id;
|
||||
|
||||
if (lsm6dso_device_id_get(lsm6dso->ctx, &chip_id) < 0) {
|
||||
LOG_DBG("Failed reading chip id");
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
#include "lsm6dso_reg.h"
|
||||
|
||||
union axis3bit16_t {
|
||||
s16_t i16bit[3];
|
||||
u8_t u8bit[6];
|
||||
int16_t i16bit[3];
|
||||
uint8_t u8bit[6];
|
||||
};
|
||||
|
||||
union axis1bit16_t {
|
||||
s16_t i16bit;
|
||||
u8_t u8bit[2];
|
||||
int16_t i16bit;
|
||||
uint8_t u8bit[2];
|
||||
};
|
||||
|
||||
#define LSM6DSO_EN_BIT 0x01
|
||||
|
|
@ -96,25 +96,25 @@ struct lsm6dso_config {
|
|||
int (*bus_init)(struct device *dev);
|
||||
#ifdef CONFIG_LSM6DSO_TRIGGER
|
||||
const char *int_gpio_port;
|
||||
u8_t int_gpio_pin;
|
||||
u8_t int_gpio_flags;
|
||||
u8_t int_pin;
|
||||
uint8_t int_gpio_pin;
|
||||
uint8_t int_gpio_flags;
|
||||
uint8_t int_pin;
|
||||
#endif /* CONFIG_LSM6DSO_TRIGGER */
|
||||
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
|
||||
u16_t i2c_slv_addr;
|
||||
uint16_t i2c_slv_addr;
|
||||
#elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
|
||||
struct spi_config spi_conf;
|
||||
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
|
||||
const char *gpio_cs_port;
|
||||
u8_t cs_gpio;
|
||||
uint8_t cs_gpio;
|
||||
#endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
|
||||
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
|
||||
};
|
||||
|
||||
union samples {
|
||||
u8_t raw[6];
|
||||
uint8_t raw[6];
|
||||
struct {
|
||||
s16_t axis[3];
|
||||
int16_t axis[3];
|
||||
};
|
||||
} __aligned(2);
|
||||
|
||||
|
|
@ -122,38 +122,38 @@ union samples {
|
|||
struct lsm6dso_data;
|
||||
|
||||
struct lsm6dso_tf {
|
||||
int (*read_data)(struct lsm6dso_data *data, u8_t reg_addr,
|
||||
u8_t *value, u8_t len);
|
||||
int (*write_data)(struct lsm6dso_data *data, u8_t reg_addr,
|
||||
u8_t *value, u8_t len);
|
||||
int (*read_reg)(struct lsm6dso_data *data, u8_t reg_addr,
|
||||
u8_t *value);
|
||||
int (*write_reg)(struct lsm6dso_data *data, u8_t reg_addr,
|
||||
u8_t value);
|
||||
int (*update_reg)(struct lsm6dso_data *data, u8_t reg_addr,
|
||||
u8_t mask, u8_t value);
|
||||
int (*read_data)(struct lsm6dso_data *data, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len);
|
||||
int (*write_data)(struct lsm6dso_data *data, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len);
|
||||
int (*read_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
|
||||
uint8_t *value);
|
||||
int (*write_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
|
||||
uint8_t value);
|
||||
int (*update_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
|
||||
uint8_t mask, uint8_t value);
|
||||
};
|
||||
|
||||
#define LSM6DSO_SHUB_MAX_NUM_SLVS 2
|
||||
|
||||
struct lsm6dso_data {
|
||||
struct device *bus;
|
||||
s16_t acc[3];
|
||||
u32_t acc_gain;
|
||||
s16_t gyro[3];
|
||||
u32_t gyro_gain;
|
||||
int16_t acc[3];
|
||||
uint32_t acc_gain;
|
||||
int16_t gyro[3];
|
||||
uint32_t gyro_gain;
|
||||
#if defined(CONFIG_LSM6DSO_ENABLE_TEMP)
|
||||
int temp_sample;
|
||||
#endif
|
||||
#if defined(CONFIG_LSM6DSO_SENSORHUB)
|
||||
u8_t ext_data[2][6];
|
||||
u16_t magn_gain;
|
||||
uint8_t ext_data[2][6];
|
||||
uint16_t magn_gain;
|
||||
|
||||
struct hts221_data {
|
||||
s16_t x0;
|
||||
s16_t x1;
|
||||
s16_t y0;
|
||||
s16_t y1;
|
||||
int16_t x0;
|
||||
int16_t x1;
|
||||
int16_t y0;
|
||||
int16_t y1;
|
||||
} hts221;
|
||||
#endif /* CONFIG_LSM6DSO_SENSORHUB */
|
||||
|
||||
|
|
@ -165,10 +165,10 @@ struct lsm6dso_data {
|
|||
stmdev_ctx_t ctx_spi;
|
||||
#endif
|
||||
|
||||
u16_t accel_freq;
|
||||
u8_t accel_fs;
|
||||
u16_t gyro_freq;
|
||||
u8_t gyro_fs;
|
||||
uint16_t accel_freq;
|
||||
uint8_t accel_fs;
|
||||
uint16_t gyro_freq;
|
||||
uint8_t gyro_fs;
|
||||
|
||||
#ifdef CONFIG_LSM6DSO_TRIGGER
|
||||
struct device *gpio;
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
|
||||
|
||||
static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr,
|
||||
u8_t *value, u8_t len)
|
||||
static int lsm6dso_i2c_read(struct device *dev, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
const struct lsm6dso_config *cfg = dev->config_info;
|
||||
|
|
@ -30,8 +30,8 @@ static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr,
|
|||
reg_addr, value, len);
|
||||
}
|
||||
|
||||
static int lsm6dso_i2c_write(struct device *dev, u8_t reg_addr,
|
||||
u8_t *value, u8_t len)
|
||||
static int lsm6dso_i2c_write(struct device *dev, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
const struct lsm6dso_config *cfg = dev->config_info;
|
||||
|
|
|
|||
|
|
@ -46,16 +46,16 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
|
|||
#define LSM6DSO_SHUB_SLVX_WRITE 0x0
|
||||
#define LSM6DSO_SHUB_SLVX_READ 0x1
|
||||
|
||||
static u8_t num_ext_dev;
|
||||
static u8_t shub_ext[LSM6DSO_SHUB_MAX_NUM_SLVS];
|
||||
static uint8_t num_ext_dev;
|
||||
static uint8_t shub_ext[LSM6DSO_SHUB_MAX_NUM_SLVS];
|
||||
|
||||
static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
|
||||
u8_t slv_addr, u8_t slv_reg,
|
||||
u8_t *value, u16_t len);
|
||||
uint8_t slv_addr, uint8_t slv_reg,
|
||||
uint8_t *value, uint16_t len);
|
||||
static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
|
||||
u8_t slv_addr, u8_t slv_reg,
|
||||
u8_t *value, u16_t len);
|
||||
static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable);
|
||||
uint8_t slv_addr, uint8_t slv_reg,
|
||||
uint8_t *value, uint16_t len);
|
||||
static void lsm6dso_shub_enable(struct lsm6dso_data *data, uint8_t enable);
|
||||
|
||||
/*
|
||||
* LIS2MDL magn device specific part
|
||||
|
|
@ -73,9 +73,9 @@ static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable);
|
|||
#define LIS2MDL_OFF_CANC 0x02
|
||||
#define LIS2MDL_SENSITIVITY 1500
|
||||
|
||||
static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
||||
static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, uint8_t i2c_addr)
|
||||
{
|
||||
u8_t mag_cfg[2];
|
||||
uint8_t mag_cfg[2];
|
||||
|
||||
data->magn_gain = LIS2MDL_SENSITIVITY;
|
||||
|
||||
|
|
@ -95,12 +95,12 @@ static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const u16_t lis2mdl_map[] = {10, 20, 50, 100};
|
||||
static const uint16_t lis2mdl_map[] = {10, 20, 50, 100};
|
||||
|
||||
static int lsm6dso_lis2mdl_odr_set(struct lsm6dso_data *data,
|
||||
u8_t i2c_addr, u16_t freq)
|
||||
uint8_t i2c_addr, uint16_t freq)
|
||||
{
|
||||
u8_t odr, cfg;
|
||||
uint8_t odr, cfg;
|
||||
|
||||
for (odr = 0; odr < ARRAY_SIZE(lis2mdl_map); odr++) {
|
||||
if (freq == lis2mdl_map[odr]) {
|
||||
|
|
@ -121,7 +121,7 @@ static int lsm6dso_lis2mdl_odr_set(struct lsm6dso_data *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
||||
static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
|
||||
enum sensor_channel chan,
|
||||
enum sensor_attribute attr,
|
||||
const struct sensor_value *val)
|
||||
|
|
@ -153,9 +153,9 @@ static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
|||
#define HTS221_REG_CONV_START 0x30
|
||||
|
||||
static int lsmdso_hts221_read_conv_data(struct lsm6dso_data *data,
|
||||
u8_t i2c_addr)
|
||||
uint8_t i2c_addr)
|
||||
{
|
||||
u8_t buf[16], i;
|
||||
uint8_t buf[16], i;
|
||||
struct hts221_data *ht = &data->hts221;
|
||||
|
||||
for (i = 0; i < sizeof(buf); i += 7) {
|
||||
|
|
@ -178,9 +178,9 @@ static int lsmdso_hts221_read_conv_data(struct lsm6dso_data *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_hts221_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
||||
static int lsm6dso_hts221_init(struct lsm6dso_data *data, uint8_t i2c_addr)
|
||||
{
|
||||
u8_t hum_cfg;
|
||||
uint8_t hum_cfg;
|
||||
|
||||
/* configure ODR and BDU */
|
||||
hum_cfg = HTS221_ODR_1HZ | HTS221_BDU | HTS221_PD;
|
||||
|
|
@ -190,12 +190,12 @@ static int lsm6dso_hts221_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
|||
return lsmdso_hts221_read_conv_data(data, i2c_addr);
|
||||
}
|
||||
|
||||
static const u16_t hts221_map[] = {0, 1, 7, 12};
|
||||
static const uint16_t hts221_map[] = {0, 1, 7, 12};
|
||||
|
||||
static int lsm6dso_hts221_odr_set(struct lsm6dso_data *data,
|
||||
u8_t i2c_addr, u16_t freq)
|
||||
uint8_t i2c_addr, uint16_t freq)
|
||||
{
|
||||
u8_t odr, cfg;
|
||||
uint8_t odr, cfg;
|
||||
|
||||
for (odr = 0; odr < ARRAY_SIZE(hts221_map); odr++) {
|
||||
if (freq == hts221_map[odr]) {
|
||||
|
|
@ -216,7 +216,7 @@ static int lsm6dso_hts221_odr_set(struct lsm6dso_data *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_hts221_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
||||
static int lsm6dso_hts221_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
|
||||
enum sensor_channel chan,
|
||||
enum sensor_attribute attr,
|
||||
const struct sensor_value *val)
|
||||
|
|
@ -246,9 +246,9 @@ static int lsm6dso_hts221_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
|||
#define LPS22HB_LPF_EN 0x08
|
||||
#define LPS22HB_BDU_EN 0x02
|
||||
|
||||
static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
||||
static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, uint8_t i2c_addr)
|
||||
{
|
||||
u8_t baro_cfg[2];
|
||||
uint8_t baro_cfg[2];
|
||||
|
||||
/* sw reset device */
|
||||
baro_cfg[0] = LPS22HB_SW_RESET;
|
||||
|
|
@ -280,9 +280,9 @@ static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
|||
#define LPS22HH_LPF_EN 0x08
|
||||
#define LPS22HH_BDU_EN 0x02
|
||||
|
||||
static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
||||
static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, uint8_t i2c_addr)
|
||||
{
|
||||
u8_t baro_cfg[2];
|
||||
uint8_t baro_cfg[2];
|
||||
|
||||
/* sw reset device */
|
||||
baro_cfg[0] = LPS22HH_SW_RESET;
|
||||
|
|
@ -303,12 +303,12 @@ static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, u8_t i2c_addr)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const u16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
|
||||
static const uint16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
|
||||
|
||||
static int lsm6dso_lps22hh_odr_set(struct lsm6dso_data *data,
|
||||
u8_t i2c_addr, u16_t freq)
|
||||
uint8_t i2c_addr, uint16_t freq)
|
||||
{
|
||||
u8_t odr, cfg;
|
||||
uint8_t odr, cfg;
|
||||
|
||||
for (odr = 0; odr < ARRAY_SIZE(lps22hh_map); odr++) {
|
||||
if (freq == lps22hh_map[odr]) {
|
||||
|
|
@ -329,7 +329,7 @@ static int lsm6dso_lps22hh_odr_set(struct lsm6dso_data *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
||||
static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
|
||||
enum sensor_channel chan,
|
||||
enum sensor_attribute attr,
|
||||
const struct sensor_value *val)
|
||||
|
|
@ -349,15 +349,15 @@ static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, u8_t i2c_addr,
|
|||
/* List of supported external sensors */
|
||||
static struct lsm6dso_shub_slist {
|
||||
enum sensor_channel type;
|
||||
u8_t i2c_addr[2];
|
||||
u8_t ext_i2c_addr;
|
||||
u8_t wai_addr;
|
||||
u8_t wai_val;
|
||||
u8_t out_data_addr;
|
||||
u8_t out_data_len;
|
||||
u8_t sh_out_reg;
|
||||
int (*dev_init)(struct lsm6dso_data *data, u8_t i2c_addr);
|
||||
int (*dev_conf)(struct lsm6dso_data *data, u8_t i2c_addr,
|
||||
uint8_t i2c_addr[2];
|
||||
uint8_t ext_i2c_addr;
|
||||
uint8_t wai_addr;
|
||||
uint8_t wai_val;
|
||||
uint8_t out_data_addr;
|
||||
uint8_t out_data_len;
|
||||
uint8_t sh_out_reg;
|
||||
int (*dev_init)(struct lsm6dso_data *data, uint8_t i2c_addr);
|
||||
int (*dev_conf)(struct lsm6dso_data *data, uint8_t i2c_addr,
|
||||
enum sensor_channel chan, enum sensor_attribute attr,
|
||||
const struct sensor_value *val);
|
||||
} lsm6dso_shub_slist[] = {
|
||||
|
|
@ -419,7 +419,7 @@ static struct lsm6dso_shub_slist {
|
|||
|
||||
static inline void lsm6dso_shub_wait_completed(struct lsm6dso_data *data)
|
||||
{
|
||||
u16_t freq;
|
||||
uint16_t freq;
|
||||
|
||||
freq = (data->accel_freq == 0) ? 26 : data->accel_freq;
|
||||
k_msleep((2000U / freq) + 1);
|
||||
|
|
@ -437,8 +437,8 @@ static inline void lsm6dso_shub_embedded_en(struct lsm6dso_data *data, bool on)
|
|||
}
|
||||
|
||||
static int lsm6dso_shub_read_embedded_regs(struct lsm6dso_data *data,
|
||||
u8_t reg_addr,
|
||||
u8_t *value, int len)
|
||||
uint8_t reg_addr,
|
||||
uint8_t *value, int len)
|
||||
{
|
||||
lsm6dso_shub_embedded_en(data, true);
|
||||
|
||||
|
|
@ -454,8 +454,8 @@ static int lsm6dso_shub_read_embedded_regs(struct lsm6dso_data *data,
|
|||
}
|
||||
|
||||
static int lsm6dso_shub_write_embedded_regs(struct lsm6dso_data *data,
|
||||
u8_t reg_addr,
|
||||
u8_t *value, u8_t len)
|
||||
uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len)
|
||||
{
|
||||
lsm6dso_shub_embedded_en(data, true);
|
||||
|
||||
|
|
@ -470,11 +470,11 @@ static int lsm6dso_shub_write_embedded_regs(struct lsm6dso_data *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable)
|
||||
static void lsm6dso_shub_enable(struct lsm6dso_data *data, uint8_t enable)
|
||||
{
|
||||
/* Enable Accel @26hz */
|
||||
if (!data->accel_freq) {
|
||||
u8_t odr = (enable) ? 2 : 0;
|
||||
uint8_t odr = (enable) ? 2 : 0;
|
||||
|
||||
if (lsm6dso_xl_data_rate_set(data->ctx, odr) < 0) {
|
||||
LOG_DBG("shub: failed to set XL sampling rate");
|
||||
|
|
@ -496,7 +496,7 @@ static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable)
|
|||
/* must be called with master on */
|
||||
static int lsm6dso_shub_check_slv0_nack(struct lsm6dso_data *data)
|
||||
{
|
||||
u8_t status;
|
||||
uint8_t status;
|
||||
|
||||
if (lsm6dso_shub_read_embedded_regs(data, LSM6DSO_SHUB_STATUS_MASTER,
|
||||
&status, 1) < 0) {
|
||||
|
|
@ -516,10 +516,10 @@ static int lsm6dso_shub_check_slv0_nack(struct lsm6dso_data *data)
|
|||
* use SLV0 for generic read to slave device
|
||||
*/
|
||||
static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
|
||||
u8_t slv_addr, u8_t slv_reg,
|
||||
u8_t *value, u16_t len)
|
||||
uint8_t slv_addr, uint8_t slv_reg,
|
||||
uint8_t *value, uint16_t len)
|
||||
{
|
||||
u8_t slave[3];
|
||||
uint8_t slave[3];
|
||||
|
||||
slave[0] = (slv_addr << 1) | LSM6DSO_SHUB_SLVX_READ;
|
||||
slave[1] = slv_reg;
|
||||
|
|
@ -557,11 +557,11 @@ static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
|
|||
* use SLV0 to configure slave device
|
||||
*/
|
||||
static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
|
||||
u8_t slv_addr, u8_t slv_reg,
|
||||
u8_t *value, u16_t len)
|
||||
uint8_t slv_addr, uint8_t slv_reg,
|
||||
uint8_t *value, uint16_t len)
|
||||
{
|
||||
u8_t slv_cfg[3];
|
||||
u8_t cnt = 0U;
|
||||
uint8_t slv_cfg[3];
|
||||
uint8_t cnt = 0U;
|
||||
|
||||
while (cnt < len) {
|
||||
slv_cfg[0] = (slv_addr << 1) & ~LSM6DSO_SHUB_SLVX_READ;
|
||||
|
|
@ -619,7 +619,7 @@ static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
|
|||
*/
|
||||
static int lsm6dso_shub_set_data_channel(struct lsm6dso_data *data)
|
||||
{
|
||||
u8_t n, i, slv_cfg[6];
|
||||
uint8_t n, i, slv_cfg[6];
|
||||
struct lsm6dso_shub_slist *sp;
|
||||
|
||||
/* Set data channel for slave devices */
|
||||
|
|
@ -664,7 +664,7 @@ static int lsm6dso_shub_set_data_channel(struct lsm6dso_data *data)
|
|||
|
||||
int lsm6dso_shub_get_idx(enum sensor_channel type)
|
||||
{
|
||||
u8_t n;
|
||||
uint8_t n;
|
||||
struct lsm6dso_shub_slist *sp;
|
||||
|
||||
for (n = 0; n < num_ext_dev; n++) {
|
||||
|
|
@ -679,7 +679,7 @@ int lsm6dso_shub_get_idx(enum sensor_channel type)
|
|||
|
||||
int lsm6dso_shub_fetch_external_devs(struct device *dev)
|
||||
{
|
||||
u8_t n;
|
||||
uint8_t n;
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
struct lsm6dso_shub_slist *sp;
|
||||
|
||||
|
|
@ -707,7 +707,7 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan,
|
|||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
struct lsm6dso_shub_slist *sp = NULL;
|
||||
u8_t n;
|
||||
uint8_t n;
|
||||
|
||||
for (n = 0; n < num_ext_dev; n++) {
|
||||
sp = &lsm6dso_shub_slist[shub_ext[n]];
|
||||
|
|
@ -732,8 +732,8 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan,
|
|||
int lsm6dso_shub_init(struct device *dev)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
u8_t i, n = 0, regn;
|
||||
u8_t chip_id;
|
||||
uint8_t i, n = 0, regn;
|
||||
uint8_t chip_id;
|
||||
struct lsm6dso_shub_slist *sp;
|
||||
|
||||
for (n = 0; n < ARRAY_SIZE(lsm6dso_shub_slist); n++) {
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
|
||||
|
||||
static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr,
|
||||
u8_t *value, u8_t len)
|
||||
static int lsm6dso_spi_read(struct device *dev, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
const struct lsm6dso_config *cfg = dev->config_info;
|
||||
const struct spi_config *spi_cfg = &cfg->spi_conf;
|
||||
u8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 };
|
||||
uint8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 };
|
||||
const struct spi_buf tx_buf = {
|
||||
.buf = buffer_tx,
|
||||
.len = 2,
|
||||
|
|
@ -62,13 +62,13 @@ static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lsm6dso_spi_write(struct device *dev, u8_t reg_addr,
|
||||
u8_t *value, u8_t len)
|
||||
static int lsm6dso_spi_write(struct device *dev, uint8_t reg_addr,
|
||||
uint8_t *value, uint8_t len)
|
||||
{
|
||||
struct lsm6dso_data *data = dev->driver_data;
|
||||
const struct lsm6dso_config *cfg = dev->config_info;
|
||||
const struct spi_config *spi_cfg = &cfg->spi_conf;
|
||||
u8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ };
|
||||
uint8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ };
|
||||
const struct spi_buf tx_buf[2] = {
|
||||
{
|
||||
.buf = buffer_tx,
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static void lsm6dso_handle_interrupt(void *arg)
|
|||
}
|
||||
|
||||
static void lsm6dso_gpio_callback(struct device *dev,
|
||||
struct gpio_callback *cb, u32_t pins)
|
||||
struct gpio_callback *cb, uint32_t pins)
|
||||
{
|
||||
struct lsm6dso_data *lsm6dso =
|
||||
CONTAINER_OF(cb, struct lsm6dso_data, gpio_cb);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue