diff options
Diffstat (limited to 'driver/sensorhub_lsm6dsm.c')
| -rw-r--r-- | driver/sensorhub_lsm6dsm.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/driver/sensorhub_lsm6dsm.c b/driver/sensorhub_lsm6dsm.c index 711294fb98..37072d5970 100644 --- a/driver/sensorhub_lsm6dsm.c +++ b/driver/sensorhub_lsm6dsm.c @@ -21,12 +21,12 @@ static int set_reg_bit_field(const struct motion_sensor_t *s, int tmp; int ret; - ret = st_raw_read8__7bf(s->port, s->i2c_spi_addr__7bf, reg, &tmp); + ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, reg, &tmp); if (ret != EC_SUCCESS) return ret; tmp |= bit_field; - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, reg, tmp); + return st_raw_write8(s->port, s->i2c_spi_addr_flags, reg, tmp); } static int clear_reg_bit_field(const struct motion_sensor_t *s, @@ -35,12 +35,12 @@ static int clear_reg_bit_field(const struct motion_sensor_t *s, int tmp; int ret; - ret = st_raw_read8__7bf(s->port, s->i2c_spi_addr__7bf, reg, &tmp); + ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, reg, &tmp); if (ret != EC_SUCCESS) return ret; tmp &= ~(bit_field); - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, reg, tmp); + return st_raw_write8(s->port, s->i2c_spi_addr_flags, reg, tmp); } static inline int enable_sensorhub_func(const struct motion_sensor_t *s) @@ -89,7 +89,7 @@ static inline int disable_aux_i2c_master(const struct motion_sensor_t *s) static inline int restore_master_cfg(const struct motion_sensor_t *s, int cache) { - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + return st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_MASTER_CFG_ADDR, cache); } @@ -98,7 +98,7 @@ static int enable_i2c_pass_through(const struct motion_sensor_t *s, { int ret; - ret = st_raw_read8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, LSM6DSM_MASTER_CFG_ADDR, cache); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x MCR error ret: %d\n", @@ -111,7 +111,7 @@ static int enable_i2c_pass_through(const struct motion_sensor_t *s, * Wait is for any pending bus activity(probably read) to settle down * so that there is no bus contention. */ - ret = st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_MASTER_CFG_ADDR, *cache | LSM6DSM_EXT_TRIGGER_EN); if (ret != EC_SUCCESS) { @@ -121,7 +121,7 @@ static int enable_i2c_pass_through(const struct motion_sensor_t *s, } msleep(10); - ret = st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_MASTER_CFG_ADDR, *cache & ~(LSM6DSM_EXT_TRIGGER_EN | LSM6DSM_I2C_MASTER_ON)); @@ -132,7 +132,7 @@ static int enable_i2c_pass_through(const struct motion_sensor_t *s, return ret; } - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + return st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_MASTER_CFG_ADDR, LSM6DSM_I2C_PASS_THRU_MODE); } @@ -141,7 +141,7 @@ static inline int power_down_accel(const struct motion_sensor_t *s, { int ret; - ret = st_raw_read8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_read8(s->port, s->i2c_spi_addr_flags, LSM6DSM_CTRL1_ADDR, cache); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x CTRL1R error ret: %d\n", @@ -149,34 +149,34 @@ static inline int power_down_accel(const struct motion_sensor_t *s, return ret; } - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + return st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_CTRL1_ADDR, *cache & ~LSM6DSM_XL_ODR_MASK); } static inline int restore_ctrl1(const struct motion_sensor_t *s, int cache) { - return st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + return st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_CTRL1_ADDR, cache); } -static int config_slv0_read__7bf(const struct motion_sensor_t *s, - const uint16_t slv_addr__7bf, +static int config_slv0_read(const struct motion_sensor_t *s, + const uint16_t slv_addr_flags, uint16_t reg, uint8_t len) { int ret; - uint16_t addr__8b = I2C_GET_ADDR__7b(slv_addr__7bf) << 1; + uint16_t addr_8bit = I2C_GET_ADDR(slv_addr_flags) << 1; - ret = st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_SLV0_ADD_ADDR, - (addr__8b | LSM6DSM_SLV0_RD_BIT)); + (addr_8bit | LSM6DSM_SLV0_RD_BIT)); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x SA error ret: %d\n", __func__, s->name, s->type, ret); return ret; } - ret = st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_SLV0_SUBADD_ADDR, reg); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x RA error ret: %d\n", @@ -188,7 +188,7 @@ static int config_slv0_read__7bf(const struct motion_sensor_t *s, * No decimation for external sensor 0, * Number of sensors connected to external sensor hub 1 */ - ret = st_raw_write8__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_write8(s->port, s->i2c_spi_addr_flags, LSM6DSM_SLV0_CONFIG_ADDR, (len & LSM6DSM_SLV0_NUM_OPS_MASK)); if (ret != EC_SUCCESS) { @@ -200,8 +200,8 @@ static int config_slv0_read__7bf(const struct motion_sensor_t *s, return EC_SUCCESS; } -int sensorhub_config_ext_reg__7bf(const struct motion_sensor_t *s, - const uint16_t slv_addr__7bf, +int sensorhub_config_ext_reg(const struct motion_sensor_t *s, + const uint16_t slv_addr_flags, uint8_t reg, uint8_t val) { int ret; @@ -214,13 +214,13 @@ int sensorhub_config_ext_reg__7bf(const struct motion_sensor_t *s, return ret; } - ret = st_raw_write8__7bf(s->port, slv_addr__7bf, reg, val); + ret = st_raw_write8(s->port, slv_addr_flags, reg, val); restore_master_cfg(s, tmp); return ret; } -int sensorhub_config_slv0_read__7bf(const struct motion_sensor_t *s, - uint16_t slv_addr__7bf, uint8_t reg, int len) +int sensorhub_config_slv0_read(const struct motion_sensor_t *s, + uint16_t slv_addr_flags, uint8_t reg, int len) { int tmp_xl_cfg; int ret; @@ -245,7 +245,7 @@ int sensorhub_config_slv0_read__7bf(const struct motion_sensor_t *s, goto out_restore_ctrl1; } - ret = config_slv0_read__7bf(s, slv_addr__7bf, reg, len); + ret = config_slv0_read(s, slv_addr_flags, reg, len); disable_ereg_bank_acc(s); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x CS0R error ret: %d\n", @@ -280,7 +280,7 @@ int sensorhub_slv0_data_read(const struct motion_sensor_t *s, uint8_t *raw) * register as soon as the accel is in power-up mode. So return the * contents of that register. */ - ret = st_raw_read_n_noinc__7bf(s->port, s->i2c_spi_addr__7bf, + ret = st_raw_read_n_noinc(s->port, s->i2c_spi_addr_flags, LSM6DSM_SENSORHUB1_REG, raw, OUT_XYZ_SIZE); if (ret != EC_SUCCESS) { @@ -291,8 +291,8 @@ int sensorhub_slv0_data_read(const struct motion_sensor_t *s, uint8_t *raw) return EC_SUCCESS; } -int sensorhub_check_and_rst__7bf(const struct motion_sensor_t *s, - const uint16_t slv_addr__7bf, +int sensorhub_check_and_rst(const struct motion_sensor_t *s, + const uint16_t slv_addr_flags, uint8_t whoami_reg, uint8_t whoami_val, uint8_t rst_reg, uint8_t rst_val) { @@ -306,7 +306,7 @@ int sensorhub_check_and_rst__7bf(const struct motion_sensor_t *s, return ret; } - ret = st_raw_read8__7bf(s->port, slv_addr__7bf, whoami_reg, &tmp); + ret = st_raw_read8(s->port, slv_addr_flags, whoami_reg, &tmp); if (ret != EC_SUCCESS) { CPRINTF("%s: %s type:0x%x WAIR error ret: %d\n", __func__, s->name, s->type, ret); @@ -320,7 +320,7 @@ int sensorhub_check_and_rst__7bf(const struct motion_sensor_t *s, goto err_restore_master_cfg; } - ret = st_raw_write8__7bf(s->port, slv_addr__7bf, rst_reg, rst_val); + ret = st_raw_write8(s->port, slv_addr_flags, rst_reg, rst_val); err_restore_master_cfg: restore_master_cfg(s, tmp_master_cfg); return ret; |