From 313700e26faa418b10e41401a3ae06eccd38d19a Mon Sep 17 00:00:00 2001 From: Baohong Liu Date: Wed, 30 Nov 2016 15:14:07 -0800 Subject: [PATCH] drivers: sensor: use unified kernel API Change-Id: I5d51e65105f9dee3d5eb49c60b9e5636ebd14df6 Signed-off-by: Baohong Liu --- drivers/sensor/ak8975/ak8975.c | 2 +- drivers/sensor/bmc150_magn/bmc150_magn.c | 2 +- drivers/sensor/bmg160/bmg160.c | 2 +- drivers/sensor/bmi160/bmi160.c | 8 ++++---- drivers/sensor/dht/dht.c | 2 +- drivers/sensor/fxos8700/fxos8700.c | 2 +- drivers/sensor/hp206c/hp206c.c | 2 +- drivers/sensor/lps25hb/lps25hb.c | 4 ++-- drivers/sensor/lsm6ds0/lsm6ds0.c | 2 +- drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c | 2 +- drivers/sensor/sht3xd/sht3xd.c | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c index 1625cffc4fc..b55a5e565e6 100644 --- a/drivers/sensor/ak8975/ak8975.c +++ b/drivers/sensor/ak8975/ak8975.c @@ -37,7 +37,7 @@ static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) return -EIO; } - sys_thread_busy_wait(AK8975_MEASURE_TIME_US); + k_busy_wait(AK8975_MEASURE_TIME_US); if (i2c_burst_read(drv_data->i2c, CONFIG_AK8975_I2C_ADDR, AK8975_REG_DATA_START, buf, 6) < 0) { diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index e24aea6ba71..0f6cb27a5f4 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -69,7 +69,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, !state) < 0) { return -EIO; } - sys_thread_busy_wait(5 * USEC_PER_MSEC); + k_busy_wait(5 * USEC_PER_MSEC); return 0; case BMC150_MAGN_POWER_MODE_SLEEP: diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c index d438b835edf..8a3b43b60e9 100644 --- a/drivers/sensor/bmg160/bmg160.c +++ b/drivers/sensor/bmg160/bmg160.c @@ -317,7 +317,7 @@ int bmg160_init(struct device *dev) /* reset the chip */ bmg160_write_byte(dev, BMG160_REG_BGW_SOFTRESET, BMG160_RESET); - sys_thread_busy_wait(1000); /* wait for the chip to come up */ + k_busy_wait(1000); /* wait for the chip to come up */ if (bmg160_write_byte(dev, BMG160_REG_RANGE, BMG160_DEFAULT_RANGE) < 0) { diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c index e98e508aeda..586da376430 100644 --- a/drivers/sensor/bmi160/bmi160.c +++ b/drivers/sensor/bmi160/bmi160.c @@ -153,7 +153,7 @@ static int bmi160_pmu_set(struct device *dev, union bmi160_pmu_status *pmu_sts) * Cannot use a nano timer here since this is called from the * init function and the timeouts were not initialized yet. */ - sys_thread_busy_wait(cmds[i].delay_us); + k_busy_wait(cmds[i].delay_us); /* make sure the PMU_STATUS was set, though */ do { @@ -318,7 +318,7 @@ static int bmi160_do_calibration(struct device *dev, uint8_t foc_conf) return -EIO; } - sys_thread_busy_wait(250000); /* calibration takes a maximum of 250ms */ + k_busy_wait(250000); /* calibration takes a maximum of 250ms */ return 0; } @@ -851,7 +851,7 @@ int bmi160_init(struct device *dev) return -EIO; } - sys_thread_busy_wait(1000); + k_busy_wait(1000); /* do a dummy read from 0x7F to activate SPI */ if (bmi160_byte_read(dev, 0x7F, &val) < 0) { @@ -859,7 +859,7 @@ int bmi160_init(struct device *dev) return -EIO; } - sys_thread_busy_wait(100); + k_busy_wait(100); if (bmi160_byte_read(dev, BMI160_REG_CHIPID, &val) < 0) { SYS_LOG_DBG("Failed to read chip id."); diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c index a99d5560a8e..7872bb8baea 100644 --- a/drivers/sensor/dht/dht.c +++ b/drivers/sensor/dht/dht.c @@ -73,7 +73,7 @@ static int dht_sample_fetch(struct device *dev, enum sensor_channel chan) /* send start signal */ gpio_pin_write(drv_data->gpio, CONFIG_DHT_GPIO_PIN_NUM, 0); - sys_thread_busy_wait(DHT_START_SIGNAL_DURATION); + k_busy_wait(DHT_START_SIGNAL_DURATION); gpio_pin_write(drv_data->gpio, CONFIG_DHT_GPIO_PIN_NUM, 1); diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index 3042c54c569..1a706eed2df 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -254,7 +254,7 @@ static int fxos8700_init(struct device *dev) /* The sensor requires us to wait 1 ms after a software reset before * attempting further communications. */ - sys_thread_busy_wait(USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC); /* Set the mode (accel-only, mag-only, or hybrid) */ if (i2c_reg_update_byte(data->i2c, config->i2c_address, diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c index b722abab791..31039caf835 100644 --- a/drivers/sensor/hp206c/hp206c.c +++ b/drivers/sensor/hp206c/hp206c.c @@ -323,7 +323,7 @@ static int hp206c_init(struct device *dev) k_timer_init(&hp206c->tmr, NULL, NULL); #endif - sys_thread_busy_wait(500); + k_busy_wait(500); if (hp206c_osr_set(dev, HP206C_DEFAULT_OSR) < 0) { SYS_LOG_ERR("OSR value is not supported."); diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index d6d1c93e373..86300dc2361 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -118,14 +118,14 @@ static int lps25hb_init_chip(struct device *dev) uint8_t chip_id; lps25hb_power_ctrl(dev, 0); - sys_thread_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(50 * USEC_PER_MSEC); if (lps25hb_power_ctrl(dev, 1) < 0) { SYS_LOG_DBG("failed to power on device"); return -EIO; } - sys_thread_busy_wait(20 * USEC_PER_MSEC); + k_busy_wait(20 * USEC_PER_MSEC); if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_WHO_AM_I, &chip_id) < 0) { diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index 712506bf7a4..e24fdf0ab32 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -39,7 +39,7 @@ static inline int lsm6ds0_reboot(struct device *dev) return -EIO; } - sys_thread_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(50 * USEC_PER_MSEC); return 0; } diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index c03899b0ab9..c05ada00e23 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -42,7 +42,7 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) return -EIO; } - sys_thread_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(50 * USEC_PER_MSEC); return 0; } diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index c4ba00bdfcb..a54c9a079fb 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -175,7 +175,7 @@ static int sht3xd_init(struct device *dev) return -EIO; } - sys_thread_busy_wait(SHT3XD_CLEAR_STATUS_WAIT_USEC); + k_busy_wait(SHT3XD_CLEAR_STATUS_WAIT_USEC); /* set periodic measurement mode */ if (sht3xd_write_command(drv_data, @@ -185,7 +185,7 @@ static int sht3xd_init(struct device *dev) return -EIO; } - sys_thread_busy_wait(sht3xd_measure_wait[SHT3XD_REPEATABILITY_IDX]); + k_busy_wait(sht3xd_measure_wait[SHT3XD_REPEATABILITY_IDX]); #ifdef CONFIG_SHT3XD_TRIGGER if (sht3xd_init_interrupt(dev) < 0) {