This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push: new d68476796a drivers/sensors: fix various coding style issues d68476796a is described below commit d68476796ac508e969956aab5d365507d9f32fa0 Author: raiden00pl <raide...@railab.me> AuthorDate: Thu May 22 16:10:12 2025 +0200 drivers/sensors: fix various coding style issues fix various coding style issues for drivers/sensors: - remove redundant `#define CONFIG_XXX` that should be provided from Kconfig - correct section banners - remove empty section banners - fix some function banners Signed-off-by: raiden00pl <raide...@railab.me> --- drivers/sensors/Kconfig | 35 +++++++++++++++++++++++++++++++---- drivers/sensors/adt7320.c | 6 +----- drivers/sensors/adxl345_base.c | 6 +----- drivers/sensors/adxl372.c | 2 +- drivers/sensors/aht10.c | 6 +----- drivers/sensors/ak09912.c | 2 +- drivers/sensors/amg88xx.c | 2 ++ drivers/sensors/apds9922.c | 12 ------------ drivers/sensors/apds9960.c | 8 -------- drivers/sensors/as726x.c | 4 ---- drivers/sensors/bh1749nuc_base.c | 4 ---- drivers/sensors/bh1749nuc_uorb.c | 10 +--------- drivers/sensors/bh1750fvi.c | 8 -------- drivers/sensors/bme680_uorb.c | 2 +- drivers/sensors/bme688_uorb.c | 2 +- drivers/sensors/bmg160.c | 2 +- drivers/sensors/bmi088.c | 4 ---- drivers/sensors/bmi088_base.c | 12 ------------ drivers/sensors/bmi160.c | 8 -------- drivers/sensors/bmi160_base.c | 8 -------- drivers/sensors/bmm150_uorb.c | 2 +- drivers/sensors/bmp180.c | 8 -------- drivers/sensors/bmp180_base.c | 20 +------------------- drivers/sensors/bmp180_base.h | 2 +- drivers/sensors/bmp180_uorb.c | 3 ++- drivers/sensors/bmp280_uorb.c | 2 +- drivers/sensors/dhtxx.c | 2 +- drivers/sensors/fs3000_uorb.c | 6 +++++- drivers/sensors/hall3ph.c | 2 +- drivers/sensors/hdc1008.c | 6 +----- drivers/sensors/hts221.c | 4 ---- drivers/sensors/ina219.c | 4 ---- drivers/sensors/ina226.c | 4 ---- drivers/sensors/ina3221.c | 4 ---- drivers/sensors/isl29023.c | 4 ---- drivers/sensors/kxtj9.c | 6 ------ drivers/sensors/l3gd20_uorb.c | 4 ---- drivers/sensors/lis2dh.c | 6 +----- drivers/sensors/lis2mdl_uorb.c | 6 ------ drivers/sensors/lis331dl.c | 6 +----- drivers/sensors/lis3dsh.c | 2 +- drivers/sensors/lis3mdl.c | 2 +- drivers/sensors/lm75.c | 6 +----- drivers/sensors/lm92.c | 6 +----- drivers/sensors/lps25h.c | 4 ---- drivers/sensors/lsm303agr.c | 8 -------- drivers/sensors/lsm330_spi.c | 2 +- drivers/sensors/lsm6dsl.c | 4 ---- drivers/sensors/lsm6dso32_uorb.c | 4 ---- drivers/sensors/lsm9ds1_base.c | 4 ---- drivers/sensors/ltc4151.c | 6 +----- drivers/sensors/ltr308_uorb.c | 12 +++++++++++- drivers/sensors/max31855.c | 8 ++++---- drivers/sensors/max31865.c | 8 ++++---- drivers/sensors/max44009.c | 4 ---- drivers/sensors/max6675.c | 8 ++++---- drivers/sensors/mb7040.c | 8 -------- drivers/sensors/mcp9600_uorb.c | 6 ------ drivers/sensors/mcp9844.c | 8 -------- drivers/sensors/mlx90393.c | 2 +- drivers/sensors/mlx90614.c | 4 ---- drivers/sensors/mpl115a.c | 6 +----- drivers/sensors/ms56xx_uorb.c | 2 +- drivers/sensors/ms58xx.c | 4 ---- drivers/sensors/msa301.c | 8 -------- drivers/sensors/nau7802.c | 35 ++++++++++++++++++++++++++++------- drivers/sensors/qencoder.c | 8 +------- drivers/sensors/scd30.c | 6 +----- drivers/sensors/scd41.c | 6 +----- drivers/sensors/sgp30.c | 6 +----- drivers/sensors/sht21.c | 6 +----- drivers/sensors/sht3x.c | 6 +----- drivers/sensors/sht4x_uorb.c | 6 +----- drivers/sensors/sps30.c | 6 +----- drivers/sensors/veml6070.c | 8 -------- drivers/sensors/vl53l1x.c | 2 +- drivers/sensors/wtgahrs2_uorb.c | 4 ---- drivers/sensors/zerocross.c | 2 +- 78 files changed, 128 insertions(+), 353 deletions(-) diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig index 65e0a8223a..154969a9dc 100644 --- a/drivers/sensors/Kconfig +++ b/drivers/sensors/Kconfig @@ -143,6 +143,11 @@ config SENSORS_AS726X ---help--- Enable driver support for the AS726X Spectral Sensor. +config AS726X_I2C_FREQUENCY + int "AS726X I2C frequency" + default 100000 + depends on SENSORS_AS726X + config SENSORS_BH1749NUC bool "Rohm BH1749NUC Color Sensor support" default n @@ -201,6 +206,20 @@ config SENSORS_NAU7802 ---help--- Enable driver support for the Adafruit NAU7802 sensor. +if SENSORS_NAU7802 + +config NAU7802_I2C_FREQUENCY + int "NAU7802 I2C frequency" + default 100000 + +config SENSORS_NAU7802_THREAD_STACKSIZE + int "NAU7802 worker thread stack size" + default 1024 + ---help--- + The stack size for the worker threads that perform measurements. + +endif # SENSORS_NAU7802 + config BH1750FVI_I2C_FREQUENCY int "BH1750FVI I2C frequency" default 400000 @@ -979,6 +998,11 @@ config SENSORS_MSA301 ---help--- Enable driver support for the MSA301. +config MSA301_I2C_FREQUENCY + int "MSA301 I2C frequency" + default 400000 + depends on SENSORS_MSA301 + config LSM9DS1_I2C_FREQUENCY int "LSM9DS1 I2C frequency" default 400000 @@ -1587,7 +1611,7 @@ config SENSORS_LIS2MDL if SENSORS_LIS2MDL -config SENSORS_LIS2MDL_FREQUENCY +config SENSORS_LIS2MDL_I2C_FREQUENCY int "LIS2MDL I2C frequency" default 1000000 range 1 3400000 @@ -1737,14 +1761,12 @@ config SENSORS_AHT10 ---help--- Enable driver support for the ASAIR AHT10 temperature and humidity sensors. -if SENSORS_AHT10 config AHT10_I2C_FREQUENCY int "AHT10 I2C frequency" + depends on SENSORS_AHT10 default 400000 range 1 400000 -endif # SENSORS_AHT10 - config SENSORS_SHT21 bool "Sensirion SHT21 temperature and humidity sensor" default n @@ -1938,6 +1960,11 @@ config SENSORS_ADT7320 ---help--- Enables support for the ADT7320 Driver +config ADT7320_SPI_FREQUENCY + int "ADT7320 SPI frequency" + depends on SENSORS_ADT7320 + default 1000000 + config SENSORS_HDC1008 bool "TI HDC1008 temperature and humidity sensor" default n diff --git a/drivers/sensors/adt7320.c b/drivers/sensors/adt7320.c index 8f01efb9d7..d39b480db8 100644 --- a/drivers/sensors/adt7320.c +++ b/drivers/sensors/adt7320.c @@ -46,10 +46,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_ADT7320_SPI_FREQUENCY -# define CONFIG_ADT7320_SPI_FREQUENCY 1000000 -#endif - #define ADT7320_SPI_MODE (SPIDEV_MODE3) /* SPI Mode 3: CPOL=1,CPHA=1 */ /* Centigrade to Fahrenheit conversion: F = 9*C/5 + 32 */ @@ -58,7 +54,7 @@ #define B16_32 (32 * 65536) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct adt7320_dev_s diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c index 56ec097997..3d998e230c 100644 --- a/drivers/sensors/adxl345_base.c +++ b/drivers/sensors/adxl345_base.c @@ -42,11 +42,7 @@ #if defined(CONFIG_SENSORS_ADXL345) /**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Functions + * Private Functions Prototypes ****************************************************************************/ /* Character driver methods */ diff --git a/drivers/sensors/adxl372.c b/drivers/sensors/adxl372.c index 807aaa3c00..94c6a7a750 100644 --- a/drivers/sensors/adxl372.c +++ b/drivers/sensors/adxl372.c @@ -47,7 +47,7 @@ #define ADXL372_INITIAL_CR_SIZE 7 /**************************************************************************** - * Private structure definitions + * Private Types ****************************************************************************/ struct sensor_data_s diff --git a/drivers/sensors/aht10.c b/drivers/sensors/aht10.c index b56b0fe02d..b9e1b85d4d 100644 --- a/drivers/sensors/aht10.c +++ b/drivers/sensors/aht10.c @@ -44,10 +44,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_AHT10_I2C_FREQUENCY -# define CONFIG_AHT10_I2C_FREQUENCY 400000 -#endif - /* I2C command bytes */ #define AHT10_SOFT_INIT 0xe1 @@ -56,7 +52,7 @@ #define AHT10_NORMAL_CMD 0xa8 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct aht10_dev_s diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c index 6c1f3eab07..ea94a8f003 100644 --- a/drivers/sensors/ak09912.c +++ b/drivers/sensors/ak09912.c @@ -129,7 +129,7 @@ do { \ ((low & 0xff) | ((high << 8) & ~0xff)) /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ /* Structure for compensating data. */ diff --git a/drivers/sensors/amg88xx.c b/drivers/sensors/amg88xx.c index e2c78246bb..524308babc 100644 --- a/drivers/sensors/amg88xx.c +++ b/drivers/sensors/amg88xx.c @@ -195,6 +195,7 @@ static const struct file_operations g_amg88xx_fops = * Write to an amg88xx register transaction pattern: * Write COMMAND at REGISTER * Sensor Address / W - Register Address - Command + * ****************************************************************************/ static inline int amg88xx_i2c_write_addr(FAR struct amg88xx_dev_s *priv, @@ -230,6 +231,7 @@ static inline int amg88xx_i2c_write_addr(FAR struct amg88xx_dev_s *priv, * Read to an amg88xx register transaction pattern: * Read COMMAND from REGISTER * Sensor Address / W - Register Address - Sensor Address / R - Command + * ****************************************************************************/ static inline int amg88xx_i2c_read_addr(FAR struct amg88xx_dev_s *priv, diff --git a/drivers/sensors/apds9922.c b/drivers/sensors/apds9922.c index 7a023c7ffa..ffcb28eefb 100644 --- a/drivers/sensors/apds9922.c +++ b/drivers/sensors/apds9922.c @@ -49,18 +49,6 @@ * Pre-process Definitions ****************************************************************************/ -#ifndef CONFIG_APDS9922_I2C_FREQUENCY -# define CONFIG_APDS9922_I2C_FREQUENCY 400000 -#endif - -#ifndef CONFIG_APDS9922_ALS_NPOLLWAITERS -# define CONFIG_APDS9922_ALS_NPOLLWAITERS 2 -#endif - -#ifndef CONFIG_APDS9922_PS_NPOLLWAITERS -# define CONFIG_APDS9922_PS_NPOLLWAITERS 2 -#endif - /* Helper macros */ #ifdef CONFIG_ENDIAN_BIG diff --git a/drivers/sensors/apds9960.c b/drivers/sensors/apds9960.c index 08aa647620..a7378d7e29 100644 --- a/drivers/sensors/apds9960.c +++ b/drivers/sensors/apds9960.c @@ -48,14 +48,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_APDS9960) -/**************************************************************************** - * Pre-process Definitions - ****************************************************************************/ - -#ifndef CONFIG_APDS9960_I2C_FREQUENCY -# define CONFIG_APDS9960_I2C_FREQUENCY 400000 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/as726x.c b/drivers/sensors/as726x.c index 4241886064..059e6ed9b8 100644 --- a/drivers/sensors/as726x.c +++ b/drivers/sensors/as726x.c @@ -60,10 +60,6 @@ * Pre-process Definitions ****************************************************************************/ -#ifndef CONFIG_AS726X_I2C_FREQUENCY -# define CONFIG_AS726X_I2C_FREQUENCY 100000 -#endif - #define AS726X_INTEGRATION_TIME 50 #define AS726X_GAIN 0b01 /* Set gain to 64x */ #define AS726X_MEASURMENT_MODE 0b10 /* One-shot reading of VBGYOR or RSTUVW */ diff --git a/drivers/sensors/bh1749nuc_base.c b/drivers/sensors/bh1749nuc_base.c index 27caac9c53..9035745ce7 100644 --- a/drivers/sensors/bh1749nuc_base.c +++ b/drivers/sensors/bh1749nuc_base.c @@ -28,10 +28,6 @@ #include "bh1749nuc_base.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/drivers/sensors/bh1749nuc_uorb.c b/drivers/sensors/bh1749nuc_uorb.c index c434a45baa..11f0358256 100644 --- a/drivers/sensors/bh1749nuc_uorb.c +++ b/drivers/sensors/bh1749nuc_uorb.c @@ -37,15 +37,7 @@ #include "bh1749nuc_base.h" /**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ enum bh1749nuc_idx_e diff --git a/drivers/sensors/bh1750fvi.c b/drivers/sensors/bh1750fvi.c index 6ec8c5f781..57d43c5f79 100644 --- a/drivers/sensors/bh1750fvi.c +++ b/drivers/sensors/bh1750fvi.c @@ -41,14 +41,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_BH1750FVI) -/**************************************************************************** - * Pre-process Definitions - ****************************************************************************/ - -#ifndef CONFIG_BH1750FVI_I2C_FREQUENCY -# define CONFIG_BH1750FVI_I2C_FREQUENCY 400000 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/bme680_uorb.c b/drivers/sensors/bme680_uorb.c index 0f8c78d9de..ab2dfcfa7d 100644 --- a/drivers/sensors/bme680_uorb.c +++ b/drivers/sensors/bme680_uorb.c @@ -270,7 +270,7 @@ const float const_array2[16] = ((type) >= BME680_OS_SKIPPED && (type) <= BME680_OS_16X) /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct bme680_data_s diff --git a/drivers/sensors/bme688_uorb.c b/drivers/sensors/bme688_uorb.c index 5334366fa3..f6f73e66c2 100644 --- a/drivers/sensors/bme688_uorb.c +++ b/drivers/sensors/bme688_uorb.c @@ -218,7 +218,7 @@ ((type) >= BME688_OS_SKIPPED && (type) <= BME688_OS_16X) /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct bme688_data_s diff --git a/drivers/sensors/bmg160.c b/drivers/sensors/bmg160.c index 2433ed9b38..4e9279e734 100644 --- a/drivers/sensors/bmg160.c +++ b/drivers/sensors/bmg160.c @@ -42,7 +42,7 @@ #if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_BMG160) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct bmg160_sensor_data_s diff --git a/drivers/sensors/bmi088.c b/drivers/sensors/bmi088.c index 70da73ade0..919aa5c812 100644 --- a/drivers/sensors/bmi088.c +++ b/drivers/sensors/bmi088.c @@ -30,10 +30,6 @@ #if defined(CONFIG_SENSORS_BMI088) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/bmi088_base.c b/drivers/sensors/bmi088_base.c index 849e591e55..cb4497aa68 100644 --- a/drivers/sensors/bmi088_base.c +++ b/drivers/sensors/bmi088_base.c @@ -28,14 +28,6 @@ #if defined(CONFIG_SENSORS_BMI088) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -59,10 +51,6 @@ static void bmi088_configspi(FAR struct spi_dev_s *spi) } #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/drivers/sensors/bmi160.c b/drivers/sensors/bmi160.c index 08e0a1cfc4..6cf4001ddd 100644 --- a/drivers/sensors/bmi160.c +++ b/drivers/sensors/bmi160.c @@ -28,14 +28,6 @@ #if defined(CONFIG_SENSORS_BMI160) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/drivers/sensors/bmi160_base.c b/drivers/sensors/bmi160_base.c index 8b9e0832d6..954d587bf4 100644 --- a/drivers/sensors/bmi160_base.c +++ b/drivers/sensors/bmi160_base.c @@ -28,14 +28,6 @@ #if defined(CONFIG_SENSORS_BMI160) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/drivers/sensors/bmm150_uorb.c b/drivers/sensors/bmm150_uorb.c index 527621dd70..8a732b6e01 100644 --- a/drivers/sensors/bmm150_uorb.c +++ b/drivers/sensors/bmm150_uorb.c @@ -108,7 +108,7 @@ #define INTCFG_EN_Z (1 << 5) /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct bmm150_trim_s diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c index b03a5d117f..59c11e5951 100644 --- a/drivers/sensors/bmp180.c +++ b/drivers/sensors/bmp180.c @@ -30,14 +30,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_BMP180) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Type Definitions - ****************************************************************************/ - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/bmp180_base.c b/drivers/sensors/bmp180_base.c index 16f3ebfc6f..24f94d2a3a 100644 --- a/drivers/sensors/bmp180_base.c +++ b/drivers/sensors/bmp180_base.c @@ -20,8 +20,6 @@ * ****************************************************************************/ -/* Character driver for the Freescale BMP1801 Barometer Sensor */ - /**************************************************************************** * Included Files ****************************************************************************/ @@ -31,23 +29,7 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_BMP180) /**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions + * Public Functions ****************************************************************************/ /**************************************************************************** diff --git a/drivers/sensors/bmp180_base.h b/drivers/sensors/bmp180_base.h index 0f5bdcdd01..8b8f0d700f 100644 --- a/drivers/sensors/bmp180_base.h +++ b/drivers/sensors/bmp180_base.h @@ -94,7 +94,7 @@ #define CURRENT_OSS (BMP180_OVERSAMPLE8X) /**************************************************************************** - * Private Type Definitions + * Private Type ****************************************************************************/ struct bmp180_dev_s diff --git a/drivers/sensors/bmp180_uorb.c b/drivers/sensors/bmp180_uorb.c index 62809ae6d2..b3c553219d 100644 --- a/drivers/sensors/bmp180_uorb.c +++ b/drivers/sensors/bmp180_uorb.c @@ -40,7 +40,7 @@ #define BMP180_MIN_INTERVAL 30000 /**************************************************************************** - * Private Type Definitions + * Private Type ****************************************************************************/ struct bmp180_dev_uorb_s @@ -52,6 +52,7 @@ struct bmp180_dev_uorb_s uint32_t interval; /* Sensor acquisition interval. */ struct bmp180_dev_s dev; }; + /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/bmp280_uorb.c b/drivers/sensors/bmp280_uorb.c index 9eb38e6bdc..421af2ec92 100644 --- a/drivers/sensors/bmp280_uorb.c +++ b/drivers/sensors/bmp280_uorb.c @@ -125,7 +125,7 @@ #define COMBINE(d) (((int)(d)[0] << 12) | ((int)(d)[1] << 4) | ((int)(d)[2] >> 4)) /**************************************************************************** - * Private Type Definitions + * Private Type ****************************************************************************/ struct bmp280_dev_s diff --git a/drivers/sensors/dhtxx.c b/drivers/sensors/dhtxx.c index eb8344e646..8e21eeffbe 100644 --- a/drivers/sensors/dhtxx.c +++ b/drivers/sensors/dhtxx.c @@ -71,7 +71,7 @@ #define DHT22_MAX_TEMP 80.0F /**************************************************************************** - * Private Type Definitions + * Private Type ****************************************************************************/ struct dhtxx_dev_s diff --git a/drivers/sensors/fs3000_uorb.c b/drivers/sensors/fs3000_uorb.c index 5b6c51bb15..a9478b0421 100644 --- a/drivers/sensors/fs3000_uorb.c +++ b/drivers/sensors/fs3000_uorb.c @@ -48,7 +48,7 @@ #define FS3000_ADDR 0x28 /**************************************************************************** - * Private Type Definitions + * Private Type ****************************************************************************/ struct fs3000_dev_s @@ -96,6 +96,7 @@ static const struct sensor_ops_s g_sensor_ops = * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int fs3000_get_data(FAR struct fs3000_dev_s *priv, @@ -136,6 +137,7 @@ static int fs3000_get_data(FAR struct fs3000_dev_s *priv, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int fs3000_get_velocity(FAR struct fs3000_dev_s *priv, uint8_t *data, @@ -181,6 +183,7 @@ static int fs3000_get_velocity(FAR struct fs3000_dev_s *priv, uint8_t *data, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int fs3000_thread(int argc, char** argv) @@ -233,6 +236,7 @@ thread_sleep: * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ int fs3000_register(FAR struct i2c_master_s *i2c) diff --git a/drivers/sensors/hall3ph.c b/drivers/sensors/hall3ph.c index 090257a864..f3ca0c577b 100644 --- a/drivers/sensors/hall3ph.c +++ b/drivers/sensors/hall3ph.c @@ -46,7 +46,7 @@ #include <arch/irq.h> /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ /* This structure describes the state of the upper half driver */ diff --git a/drivers/sensors/hdc1008.c b/drivers/sensors/hdc1008.c index 32c4bfd8ec..a79eb2292f 100644 --- a/drivers/sensors/hdc1008.c +++ b/drivers/sensors/hdc1008.c @@ -52,10 +52,6 @@ # define hdc1008_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SHT21_I2C_FREQUENCY -# define CONFIG_SHT21_I2C_FREQUENCY 400000 -#endif - /* Macros to convert raw temperature and humidity to real values. Temperature * is scaled by 100, humidity by 10. */ @@ -99,7 +95,7 @@ #define HDC1008_CONFIGURATION_RST (1 << 15) /* Bit 15: Software reset bit */ /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct hdc1008_dev_s diff --git a/drivers/sensors/hts221.c b/drivers/sensors/hts221.c index 90d65529ad..cd5ae83a4b 100644 --- a/drivers/sensors/hts221.c +++ b/drivers/sensors/hts221.c @@ -54,10 +54,6 @@ # define hts221_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_HTS221_I2C_FREQUENCY -# define CONFIG_HTS221_I2C_FREQUENCY 400000 -#endif - #define HTS221_WHO_AM_I 0x0f #define HTS221_AV_CONF 0x10 #define HTS221_CTRL_REG1 0x20 diff --git a/drivers/sensors/ina219.c b/drivers/sensors/ina219.c index 7f7a6b0f56..a1b830b94c 100644 --- a/drivers/sensors/ina219.c +++ b/drivers/sensors/ina219.c @@ -65,10 +65,6 @@ #define INA219_CONFIG_OPMODE_BCONT (6 << INA219_CONFIG_OPMODE_SHIFT) #define INA219_CONFIG_OPMODE_SBCONT (7 << INA219_CONFIG_OPMODE_SHIFT) -#ifndef CONFIG_INA219_I2C_FREQUENCY -# define CONFIG_INA219_I2C_FREQUENCY 400000 -#endif - #define I2C_NOSTARTSTOP_MSGS 2 #define I2C_NOSTARTSTOP_ADDRESS_MSG_INDEX 0 #define I2C_NOSTARTSTOP_DATA_MSG_INDEX 1 diff --git a/drivers/sensors/ina226.c b/drivers/sensors/ina226.c index 93697a243d..a2aba074f8 100644 --- a/drivers/sensors/ina226.c +++ b/drivers/sensors/ina226.c @@ -44,10 +44,6 @@ # error i2c support required #endif -#ifndef CONFIG_INA226_I2C_FREQUENCY -# define CONFIG_INA226_I2C_FREQUENCY 400000 -#endif - #define I2C_NOSTARTSTOP_MSGS 2 #define I2C_NOSTARTSTOP_ADDRESS_MSG_INDEX 0 #define I2C_NOSTARTSTOP_DATA_MSG_INDEX 1 diff --git a/drivers/sensors/ina3221.c b/drivers/sensors/ina3221.c index f5064097d5..8909282559 100644 --- a/drivers/sensors/ina3221.c +++ b/drivers/sensors/ina3221.c @@ -68,10 +68,6 @@ #define INA3221_CONFIG_RST (1 << 15) -#ifndef CONFIG_INA3221_I2C_FREQUENCY -# define CONFIG_INA3221_I2C_FREQUENCY 400000 -#endif - #define I2C_NOSTARTSTOP_MSGS 2 #define I2C_NOSTARTSTOP_ADDRESS_MSG_INDEX 0 #define I2C_NOSTARTSTOP_DATA_MSG_INDEX 1 diff --git a/drivers/sensors/isl29023.c b/drivers/sensors/isl29023.c index 1dc758e58c..eeed293df6 100644 --- a/drivers/sensors/isl29023.c +++ b/drivers/sensors/isl29023.c @@ -45,10 +45,6 @@ * Pre-Processor Definitions ****************************************************************************/ -#ifndef CONFIG_ISL29023_I2C_FREQUENCY -# define CONFIG_ISL29023_I2C_FREQUENCY 400000 -#endif - /* Registers definitions */ #define ISL29023_COMMAND_1 0x00 diff --git a/drivers/sensors/kxtj9.c b/drivers/sensors/kxtj9.c index f8b6ac210d..f443a270da 100644 --- a/drivers/sensors/kxtj9.c +++ b/drivers/sensors/kxtj9.c @@ -45,12 +45,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - -#ifndef CONFIG_KXTJ9_I2C_BUS_SPEED -# define CONFIG_KXTJ9_I2C_BUS_SPEED 400000 -#endif - /* Register Definitions *****************************************************/ /* Output registers */ diff --git a/drivers/sensors/l3gd20_uorb.c b/drivers/sensors/l3gd20_uorb.c index 089575be8a..db7bb0cfdb 100644 --- a/drivers/sensors/l3gd20_uorb.c +++ b/drivers/sensors/l3gd20_uorb.c @@ -46,10 +46,6 @@ #if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_L3GD20) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/lis2dh.c b/drivers/sensors/lis2dh.c index 49fe94065f..abf20acf8c 100644 --- a/drivers/sensors/lis2dh.c +++ b/drivers/sensors/lis2dh.c @@ -51,10 +51,6 @@ # define lis2dh_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_LIS2DH_I2C_FREQUENCY -# define CONFIG_LIS2DH_I2C_FREQUENCY 400000 -#endif - #ifdef CONFIG_LIS2DH_DRIVER_SELFTEST # define LSB_AT_10BIT_RESOLUTION 4 # define LSB_AT_12BIT_RESOLUTION 1 @@ -74,7 +70,7 @@ #define LIS2DH_COUNT_INTS /**************************************************************************** - * Private Data Types + * Private Types ****************************************************************************/ enum interrupts diff --git a/drivers/sensors/lis2mdl_uorb.c b/drivers/sensors/lis2mdl_uorb.c index efc84c1fe2..7d22719c71 100644 --- a/drivers/sensors/lis2mdl_uorb.c +++ b/drivers/sensors/lis2mdl_uorb.c @@ -49,12 +49,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* The LIS2MDL supports up to 3.4MHz bus speeds */ - -#ifndef CONFIG_SENSORS_LIS2MDL_I2C_FREQUENCY -#define CONFIG_SENSORS_LIS2MDL_I2C_FREQUENCY 1000000 -#endif - /* The value that should be in the "who am I" register */ #define WHO_AM_I_VAL 0x40 diff --git a/drivers/sensors/lis331dl.c b/drivers/sensors/lis331dl.c index b14103b7e8..a2de398acf 100644 --- a/drivers/sensors/lis331dl.c +++ b/drivers/sensors/lis331dl.c @@ -42,10 +42,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LIS331DL_I2C_FREQUENCY -# define CONFIG_LIS331DL_I2C_FREQUENCY 100000 -#endif - /* LIS331DL Internal Registers **********************************************/ #define ST_LIS331DL_WHOAMI 0x0F /* who am I register */ @@ -80,7 +76,7 @@ #define ST_LIS331DL_OUT_Z 0x2D /**************************************************************************** - * Private Data Types + * Private Types ****************************************************************************/ struct lis331dl_dev_s diff --git a/drivers/sensors/lis3dsh.c b/drivers/sensors/lis3dsh.c index 6f9b098049..dce108f105 100644 --- a/drivers/sensors/lis3dsh.c +++ b/drivers/sensors/lis3dsh.c @@ -42,7 +42,7 @@ #if defined(CONFIG_SPI) && defined(CONFIG_LIS3DSH) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct lis3dsh_sensor_data_s diff --git a/drivers/sensors/lis3mdl.c b/drivers/sensors/lis3mdl.c index 3200f2c35a..8355631c8c 100644 --- a/drivers/sensors/lis3mdl.c +++ b/drivers/sensors/lis3mdl.c @@ -42,7 +42,7 @@ #if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_LIS3MDL) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct lis3mdl_sensor_data_s diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c index 3a3e871e1f..e166d6a949 100644 --- a/drivers/sensors/lm75.c +++ b/drivers/sensors/lm75.c @@ -45,17 +45,13 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LM75_I2C_FREQUENCY -# define CONFIG_LM75_I2C_FREQUENCY 100000 -#endif - /* Centigrade to Fahrenheit conversion: F = 9*C/5 + 32 */ #define B16_9DIV5 (9 * 65536 / 5) #define B16_32 (32 * 65536) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct lm75_dev_s diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c index bf19bbf8e2..473a9996e4 100644 --- a/drivers/sensors/lm92.c +++ b/drivers/sensors/lm92.c @@ -44,17 +44,13 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LM92_I2C_FREQUENCY -# define CONFIG_LM92_I2C_FREQUENCY 400000 -#endif - /* Centigrade to Fahrenheit conversion: F = 9*C/5 + 32 */ #define B16_9DIV5 (9 * 65536 / 5) #define B16_32 (32 * 65536) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct lm92_dev_s diff --git a/drivers/sensors/lps25h.c b/drivers/sensors/lps25h.c index 852d02f462..e9c5b61b57 100644 --- a/drivers/sensors/lps25h.c +++ b/drivers/sensors/lps25h.c @@ -48,10 +48,6 @@ # define lps25h_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_LPS25H_I2C_FREQUENCY -# define CONFIG_LPS25H_I2C_FREQUENCY 400000 -#endif - #define LPS25H_PRESSURE_INTERNAL_DIVIDER 4096 /* 'AN4450 - Hardware and software guidelines for use of LPS25H pressure diff --git a/drivers/sensors/lsm303agr.c b/drivers/sensors/lsm303agr.c index 244d95499d..c768baa641 100644 --- a/drivers/sensors/lsm303agr.c +++ b/drivers/sensors/lsm303agr.c @@ -58,14 +58,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LSM303AGR) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifndef CONFIG_LSM303AGR_I2C_FREQUENCY -# define CONFIG_LSM303AGR_I2C_FREQUENCY 400000 -#endif - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/lsm330_spi.c b/drivers/sensors/lsm330_spi.c index eb2fb33099..c3d68f9f8e 100644 --- a/drivers/sensors/lsm330_spi.c +++ b/drivers/sensors/lsm330_spi.c @@ -48,7 +48,7 @@ #define LSM330_INITIAL_GYROCR_SIZE 5 /**************************************************************************** - * Private structure definitions + * Private Types ****************************************************************************/ struct sensor_data_s diff --git a/drivers/sensors/lsm6dsl.c b/drivers/sensors/lsm6dsl.c index cd676d2bd6..7250e2c91c 100644 --- a/drivers/sensors/lsm6dsl.c +++ b/drivers/sensors/lsm6dsl.c @@ -63,10 +63,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LSM6DSL_I2C_FREQUENCY -# define CONFIG_LSM6DSL_I2C_FREQUENCY 400000 -#endif - /* Self test limits. */ #define LSM6DSL_MIN_ST_LIMIT_MG 50.0f /* Accelerator min limit */ diff --git a/drivers/sensors/lsm6dso32_uorb.c b/drivers/sensors/lsm6dso32_uorb.c index 54b13e519a..bfaac4d45f 100644 --- a/drivers/sensors/lsm6dso32_uorb.c +++ b/drivers/sensors/lsm6dso32_uorb.c @@ -58,10 +58,6 @@ #define MDPS_TO_RADS (3.141592653f / (180.0f * 1000.0f)) -#ifndef CONFIG_SENSORS_LSM6DSO32_I2C_FREQUENCY -#define CONFIG_SENSORS_LSM6DSO32_I2C_FREQUENCY 400000 -#endif /* CONFIG_SENSORS_LSM6DSO32_I2C_FREQUENCY */ - /* Number of measurement rounds for gyro self test */ #define GYRO_SELFTEST_ROUNDS 5 diff --git a/drivers/sensors/lsm9ds1_base.c b/drivers/sensors/lsm9ds1_base.c index 30f11460d9..61b5f40fb7 100644 --- a/drivers/sensors/lsm9ds1_base.c +++ b/drivers/sensors/lsm9ds1_base.c @@ -26,10 +26,6 @@ #include "lsm9ds1_base.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/ltc4151.c b/drivers/sensors/ltc4151.c index 69d4c87254..5a43a4deea 100644 --- a/drivers/sensors/ltc4151.c +++ b/drivers/sensors/ltc4151.c @@ -43,16 +43,12 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_LTC4151_I2C_FREQUENCY -# define CONFIG_LTC4151_I2C_FREQUENCY 400000 -#endif - #define I2C_NOSTARTSTOP_MSGS 2 #define I2C_NOSTARTSTOP_ADDRESS_MSG_INDEX 0 #define I2C_NOSTARTSTOP_DATA_MSG_INDEX 1 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct ltc4151_dev_s diff --git a/drivers/sensors/ltr308_uorb.c b/drivers/sensors/ltr308_uorb.c index cb30a5e7c8..d5ca0d865f 100644 --- a/drivers/sensors/ltr308_uorb.c +++ b/drivers/sensors/ltr308_uorb.c @@ -56,7 +56,7 @@ #define LTR308_DATA_0 0x0D /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct ltr308_sensor_s @@ -118,6 +118,7 @@ static const struct sensor_ops_s g_sensor_ops = * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_set_reg8(FAR struct ltr308_dev_s *priv, uint8_t regaddr, @@ -153,6 +154,7 @@ static int ltr308_set_reg8(FAR struct ltr308_dev_s *priv, uint8_t regaddr, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_get_reg8(FAR struct ltr308_dev_s *priv, uint8_t regaddr, @@ -190,6 +192,7 @@ static int ltr308_get_reg8(FAR struct ltr308_dev_s *priv, uint8_t regaddr, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_get_reg24(FAR struct ltr308_dev_s *priv, uint8_t regaddr, @@ -219,6 +222,7 @@ static int ltr308_get_reg24(FAR struct ltr308_dev_s *priv, uint8_t regaddr, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_checkid(FAR struct ltr308_dev_s *priv) @@ -247,6 +251,7 @@ static int ltr308_checkid(FAR struct ltr308_dev_s *priv) * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_get_status(FAR struct ltr308_dev_s *priv, @@ -292,6 +297,7 @@ static int ltr308_get_status(FAR struct ltr308_dev_s *priv, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_get_lux(FAR struct ltr308_dev_s *priv, uint8_t gain, @@ -375,6 +381,7 @@ static int ltr308_get_lux(FAR struct ltr308_dev_s *priv, uint8_t gain, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_activate(FAR struct sensor_lowerhalf_s *lower, @@ -418,6 +425,7 @@ static int ltr308_activate(FAR struct sensor_lowerhalf_s *lower, * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_calibrate(FAR struct sensor_lowerhalf_s *lower, @@ -503,6 +511,7 @@ err_out: * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ static int ltr308_thread(int argc, char** argv) @@ -581,6 +590,7 @@ thread_sleep: * * Return value: * Zero (OK) on success; a negated errno value on failure + * ****************************************************************************/ int ltr308_register(int devno, FAR struct i2c_master_s *i2c) diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c index aa9a362a12..2be57a6e9b 100644 --- a/drivers/sensors/max31855.c +++ b/drivers/sensors/max31855.c @@ -52,10 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -/**************************************************************************** - * Private - ****************************************************************************/ - #define MAX31855_FAULT (1 << 16) #define MAX31855_SHORT_VCC (1 << 2) #define MAX31855_SHORT_GND (1 << 1) @@ -63,6 +59,10 @@ #define MAX31855_TEMP_COUPLE 0xffffc000 #define MAX31855_TEMP_JUNCTION 0xfff0 +/**************************************************************************** + * Private Types + ****************************************************************************/ + struct max31855_dev_s { FAR struct spi_dev_s *spi; /* Saved SPI driver instance */ diff --git a/drivers/sensors/max31865.c b/drivers/sensors/max31865.c index 76916a88f2..2bedd8604f 100644 --- a/drivers/sensors/max31865.c +++ b/drivers/sensors/max31865.c @@ -54,10 +54,6 @@ * Pre-processor Definitions ****************************************************************************/ -/**************************************************************************** - * Private - ****************************************************************************/ - #define MAX31865_CONFIG_REG 0x00 # define MAX31865_BIAS_ON (1 << 7) # define MAX31865_AUTO_CONVERSION (1 << 6) @@ -87,6 +83,10 @@ #define RTD_A (3.9083e-3) #define RTD_B (-5.775e-7) +/**************************************************************************** + * Private Types + ****************************************************************************/ + struct max31865_dev_s { FAR struct spi_dev_s *spi; /* Saved SPI driver instance */ diff --git a/drivers/sensors/max44009.c b/drivers/sensors/max44009.c index 82ed1c6d59..53a3a55664 100644 --- a/drivers/sensors/max44009.c +++ b/drivers/sensors/max44009.c @@ -50,10 +50,6 @@ # define max44009_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_MAX44009_I2C_FREQUENCY -# define CONFIG_MAX44009_I2C_FREQUENCY 400000 -#endif - /* Registers */ #define MAX44009_INT_STS 0x0 diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c index 0ee50e9b5f..70f6d5ed48 100644 --- a/drivers/sensors/max6675.c +++ b/drivers/sensors/max6675.c @@ -51,15 +51,15 @@ * Pre-processor Definitions ****************************************************************************/ -/**************************************************************************** - * Private - ****************************************************************************/ - #define MAX6675_THREE_STATE (1 << 0) #define MAX6675_DEV_ID (1 << 1) #define MAX6675_OPEN_CIRCUIT (1 << 2) #define MAX6675_TEMP_COUPLE 0x7ff8 +/**************************************************************************** + * Private Types + ****************************************************************************/ + struct max6675_dev_s { FAR struct spi_dev_s *spi; /* Saved SPI driver instance */ diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c index eb1989770e..390390c5f8 100644 --- a/drivers/sensors/mb7040.c +++ b/drivers/sensors/mb7040.c @@ -39,14 +39,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MB7040) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifndef CONFIG_MB7040_I2C_FREQUENCY -# define CONFIG_MB7040_I2C_FREQUENCY 400000 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/mcp9600_uorb.c b/drivers/sensors/mcp9600_uorb.c index cae99833ea..02f999052f 100644 --- a/drivers/sensors/mcp9600_uorb.c +++ b/drivers/sensors/mcp9600_uorb.c @@ -47,12 +47,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* I2C frequency to use during transfers */ - -#ifdef CONFIG_MCP9600_I2C_FREQUENCY -#define CONFIG_MCP9600_I2C_FREQUENCY 100000 -#endif - #define REG_THERMO_HOT_JUNC 0x0 /* Thermocouple Hot-Junction, T H */ #define REG_JUNC_TEMP_DELTA 0x1 /* Junctions Temperature Delta, TΔ */ #define REG_COLD_JUNC_TEMP 0x2 /* Cold-Junction Temperature, T C */ diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c index 136f6e0274..dffce515f8 100644 --- a/drivers/sensors/mcp9844.c +++ b/drivers/sensors/mcp9844.c @@ -38,14 +38,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MCP9844) -/**************************************************************************** - * Pre-process Definitions - ****************************************************************************/ - -#ifndef CONFIG_MCP9844_I2C_FREQUENCY -# define CONFIG_MCP9844_I2C_FREQUENCY 400000 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/mlx90393.c b/drivers/sensors/mlx90393.c index 203c47ebb6..bc9eea7308 100644 --- a/drivers/sensors/mlx90393.c +++ b/drivers/sensors/mlx90393.c @@ -42,7 +42,7 @@ #if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MLX90393) /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct mlx90393_sensor_data_s diff --git a/drivers/sensors/mlx90614.c b/drivers/sensors/mlx90614.c index 08cdb95bb2..7e861c5226 100644 --- a/drivers/sensors/mlx90614.c +++ b/drivers/sensors/mlx90614.c @@ -47,10 +47,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MLX90614) -/**************************************************************************** - * Pre-process Definitions - ****************************************************************************/ - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c index 266683666c..0fbd21b345 100644 --- a/drivers/sensors/mpl115a.c +++ b/drivers/sensors/mpl115a.c @@ -43,11 +43,7 @@ #if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MPL115A) /**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct mpl115a_dev_s diff --git a/drivers/sensors/ms56xx_uorb.c b/drivers/sensors/ms56xx_uorb.c index 669875d34c..b18a62af64 100644 --- a/drivers/sensors/ms56xx_uorb.c +++ b/drivers/sensors/ms56xx_uorb.c @@ -68,7 +68,7 @@ #define MS56XX_CMD_ADC_PROM_READ(i) (0xa0 + (i)*2) /* 0xA0 - 0xAE */ /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct ms56xx_calib_s diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c index 225e197e23..ecbea5dbc2 100644 --- a/drivers/sensors/ms58xx.c +++ b/drivers/sensors/ms58xx.c @@ -45,10 +45,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_MS58XX_I2C_FREQUENCY -# define CONFIG_MS58XX_I2C_FREQUENCY 400000 -#endif - /* Register Definitions *****************************************************/ /* Register Addresses */ diff --git a/drivers/sensors/msa301.c b/drivers/sensors/msa301.c index 66563c513b..5bffbc617c 100644 --- a/drivers/sensors/msa301.c +++ b/drivers/sensors/msa301.c @@ -63,14 +63,6 @@ struct msa301_ops_s CODE int (*sensor_read)(FAR struct msa301_dev_s *priv); }; -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -# ifndef CONFIG_MSA301_I2C_FREQUENCY -# define CONFIG_MSA301_I2C_FREQUENCY 400000 -# endif - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/nau7802.c b/drivers/sensors/nau7802.c index ea176a075c..43f4329587 100644 --- a/drivers/sensors/nau7802.c +++ b/drivers/sensors/nau7802.c @@ -45,13 +45,9 @@ #include <nuttx/signal.h> #include <nuttx/wqueue.h> -#ifndef CONFIG_SENSORS_NAU7802_I2C_FREQUENCY -#define CONFIG_SENSORS_NAU7802_I2C_FREQUENCY 100000 -#endif - -#ifndef CONFIG_SENSORS_NAU7802_THREAD_STACKSIZE -#define CONFIG_SENSORS_NAU7802_THREAD_STACKSIZE 10000 -#endif +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ /* Registers */ @@ -86,6 +82,10 @@ #define CAL_START 0x2 #define CAL_ERR 0x3 +/**************************************************************************** + * Private Types + ****************************************************************************/ + /* ODR to Interval */ static const uint32_t ODR_TO_INTERVAL[] = @@ -117,6 +117,7 @@ typedef struct * * Description: * Read `nbytes` from the register at `addr` into `buf`. + * ****************************************************************************/ static int nau7802_read_reg(FAR nau7802_dev_s *dev, uint8_t addr, void *buf, @@ -147,6 +148,7 @@ static int nau7802_read_reg(FAR nau7802_dev_s *dev, uint8_t addr, void *buf, * * Description: * Write `nbytes` from `buf` to the registers starting at `addr`. + * ****************************************************************************/ static int nau7802_write_reg(FAR nau7802_dev_s *dev, uint8_t addr, void *buf, @@ -174,13 +176,16 @@ static int nau7802_write_reg(FAR nau7802_dev_s *dev, uint8_t addr, void *buf, /**************************************************************************** * Name: nau7802_set_bits + * * Description: * Helper function to set bits in a register. + * * Arguments: * addr - The address of the register to modify * n_bits - The number of bits to set * n_bit_shifts - The number of bits to shift * value - The value to set + * ****************************************************************************/ static int nau7802_set_bits(FAR nau7802_dev_s *dev, uint8_t addr, @@ -276,8 +281,10 @@ static int nau7802_reset(FAR nau7802_dev_s *dev) /**************************************************************************** * Name: nau7802_enable + * * Description: * Enable or disable the NAU7802. + * ****************************************************************************/ static int nau7802_enable(FAR nau7802_dev_s *dev, bool enable) @@ -332,8 +339,10 @@ static int nau7802_enable(FAR nau7802_dev_s *dev, bool enable) /**************************************************************************** * Name: nau7802_data_available + * * Description: * Check if data is available over I2C. + * ****************************************************************************/ static int nau7802_data_available(FAR nau7802_dev_s *dev, bool *val) @@ -346,6 +355,7 @@ static int nau7802_data_available(FAR nau7802_dev_s *dev, bool *val) * * Description: * Read the ADC data from the NAU7802 into the sensor_force structure. + * ****************************************************************************/ static int nau7802_read_data(FAR nau7802_dev_s *dev, @@ -394,8 +404,10 @@ static int nau7802_read_data(FAR nau7802_dev_s *dev, /**************************************************************************** * Name: nau7802_set_ldo + * * Description: * Set the LDO voltage. + * ****************************************************************************/ static int nau7802_set_ldo(FAR nau7802_dev_s *dev, nau7802_ldo_e voltage) @@ -441,6 +453,7 @@ static int nau7802_set_interval(FAR nau7802_dev_s *dev, * Description: * Reads some data with exclusive device access and pushed it to the UORB * upper half. + * ****************************************************************************/ static int nau7802_push_data(FAR nau7802_dev_s *dev) @@ -483,8 +496,10 @@ unlock_ret: /**************************************************************************** * Name: nau7802_get_calibvalue + * * Description: * Get the gain calibration value. + * ****************************************************************************/ static int nau7802_get_calibvalue(FAR nau7802_dev_s *dev, unsigned long arg) @@ -527,8 +542,10 @@ static int nau7802_get_calibvalue(FAR nau7802_dev_s *dev, unsigned long arg) /**************************************************************************** * Name: nau7802_set_calibvalue + * * Description: * Set the gain calibration value. + * ****************************************************************************/ static int nau7802_set_calibvalue(FAR struct sensor_lowerhalf_s *lower, @@ -571,10 +588,12 @@ static int nau7802_set_calibvalue(FAR struct sensor_lowerhalf_s *lower, /**************************************************************************** * Name: nau7802_calibrate + * * Description: * Perform either an INTERNAL, OFFSET or GAIN calibration. * The gain calibration value is saved and can be retrieved via the * SNIOC_GET_GAIN_CALIBVALUE command + * ****************************************************************************/ static int nau7802_calibrate(FAR struct sensor_lowerhalf_s *lower, @@ -795,6 +814,7 @@ static int nau7802_get_info(FAR struct sensor_lowerhalf_s *lower, * * Description: * Kernel thread to poll the NAU7802 + * ****************************************************************************/ static int nau7802_thread(int argc, FAR char *argv[]) @@ -859,6 +879,7 @@ static const struct sensor_ops_s g_sensor_ops = * * Returned Value: * Zero (OK) on success; a negated errno value on failure. + * ****************************************************************************/ int nau7802_register(FAR struct i2c_master_s *i2c, int devno, uint8_t addr) diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c index d097b63543..dad34f7c29 100644 --- a/drivers/sensors/qencoder.c +++ b/drivers/sensors/qencoder.c @@ -48,13 +48,7 @@ #ifdef CONFIG_SENSORS_QENCODER /**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Debug ********************************************************************/ - -/**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ /* This structure describes the state of the upper half driver */ diff --git a/drivers/sensors/scd30.c b/drivers/sensors/scd30.c index 61c5e3554a..d6d7b14fc8 100644 --- a/drivers/sensors/scd30.c +++ b/drivers/sensors/scd30.c @@ -55,10 +55,6 @@ # define scd30_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SCD30_I2C_FREQUENCY -# define CONFIG_SCD30_I2C_FREQUENCY 100000 -#endif - #define SCD30_I2C_RETRIES 3 /* SCD30 command words */ @@ -80,7 +76,7 @@ #define SCD30_DEFAULT_TEMPERATURE_OFFSET 0 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct scd30_dev_s diff --git a/drivers/sensors/scd41.c b/drivers/sensors/scd41.c index 12e7f17372..7107945459 100644 --- a/drivers/sensors/scd41.c +++ b/drivers/sensors/scd41.c @@ -55,10 +55,6 @@ # define scd41_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SCD41_I2C_FREQUENCY -# define CONFIG_SCD41_I2C_FREQUENCY 100000 -#endif - #define SCD41_I2C_RETRIES 3 /* SCD41 command words */ @@ -90,7 +86,7 @@ #define SCD41_DEFAULT_TEMPERATURE_OFFSET 0 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct scd41_dev_s diff --git a/drivers/sensors/sgp30.c b/drivers/sensors/sgp30.c index 45794acf0d..938589d183 100644 --- a/drivers/sensors/sgp30.c +++ b/drivers/sensors/sgp30.c @@ -55,16 +55,12 @@ # define sgp30_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SGP30_I2C_FREQUENCY -# define CONFIG_SGP30_I2C_FREQUENCY 100000 -#endif - #define SGP30_I2C_RETRIES 3 #define SGP30_INIT_RETRIES 5 #define SGP30_INIT_LIMIT_MS 10 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct sgp30_dev_s diff --git a/drivers/sensors/sht21.c b/drivers/sensors/sht21.c index 936037b3b0..7fcce86ca3 100644 --- a/drivers/sensors/sht21.c +++ b/drivers/sensors/sht21.c @@ -51,10 +51,6 @@ # define sht21_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SHT21_I2C_FREQUENCY -# define CONFIG_SHT21_I2C_FREQUENCY 400000 -#endif - /* I2C command bytes */ #define SHT21_TRIG_T_MEAS_HM 0xe3 @@ -64,7 +60,7 @@ #define SHT21_SOFT_RESET 0xfe /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct sht21_dev_s diff --git a/drivers/sensors/sht3x.c b/drivers/sensors/sht3x.c index adaf7a5631..8eb6d29102 100644 --- a/drivers/sensors/sht3x.c +++ b/drivers/sensors/sht3x.c @@ -51,10 +51,6 @@ # define sht3x_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SHT3X_I2C_FREQUENCY -# define CONFIG_SHT3X_I2C_FREQUENCY 400000 -#endif - /* Commands */ #define SHT3X_READ_SERIALNBR 0x3780 /* read serial number */ @@ -98,7 +94,7 @@ #define SHT3X_DEFAULT_MEAS_MODE SHT3X_MEAS_PERI_1_H /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct sht3x_dev_s diff --git a/drivers/sensors/sht4x_uorb.c b/drivers/sensors/sht4x_uorb.c index 31888afe13..50c3592687 100644 --- a/drivers/sensors/sht4x_uorb.c +++ b/drivers/sensors/sht4x_uorb.c @@ -47,10 +47,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_SHT4X_I2C_FREQUENCY -#define CONFIG_SHT4X_I2C_FREQUENCY 400000 -#endif - #define SHT4X_CRC_INIT 0xFF /* Initial value of the calculated CRC. */ #define SHT4X_CRC_POLY 0x31 /* CRC calculation polynomial. */ @@ -67,7 +63,7 @@ #define SHT4X_HEAT_20_P1 0x15 /* Activate heater with 20mW for 0.1s. */ /**************************************************************************** - * Private + * Private Types ****************************************************************************/ /* Sensor information for the lowerhalf sensors. diff --git a/drivers/sensors/sps30.c b/drivers/sensors/sps30.c index 855a0099ba..432bfa5879 100644 --- a/drivers/sensors/sps30.c +++ b/drivers/sensors/sps30.c @@ -55,10 +55,6 @@ # define sps30_dbg(x, ...) sninfo(x, ##__VA_ARGS__) #endif -#ifndef CONFIG_SPS30_I2C_FREQUENCY -# define CONFIG_SPS30_I2C_FREQUENCY 100000 -#endif - #define SPS30_MEASUREMENT_INTERVAL 1 /* one second, fixed in hw */ #define SPS30_MEASUREMENT_MODE 0x0300 @@ -77,7 +73,7 @@ #define SPS30_CMD_SOFT_RESET 0xd304 /**************************************************************************** - * Private + * Private Types ****************************************************************************/ struct sps30_dev_s diff --git a/drivers/sensors/veml6070.c b/drivers/sensors/veml6070.c index ccd7b364cf..279779b330 100644 --- a/drivers/sensors/veml6070.c +++ b/drivers/sensors/veml6070.c @@ -42,14 +42,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_VEML6070) -/**************************************************************************** - * Pre-process Definitions - ****************************************************************************/ - -#ifndef CONFIG_VEML6070_I2C_FREQUENCY -# define CONFIG_VEML6070_I2C_FREQUENCY 100000 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/drivers/sensors/vl53l1x.c b/drivers/sensors/vl53l1x.c index 337a38166f..8b699a91ec 100644 --- a/drivers/sensors/vl53l1x.c +++ b/drivers/sensors/vl53l1x.c @@ -64,7 +64,7 @@ #define VL53L1X_ADDR 0x29 /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ struct vl53l1x_dev_s diff --git a/drivers/sensors/wtgahrs2_uorb.c b/drivers/sensors/wtgahrs2_uorb.c index 14bdeb223a..2463a92d5d 100644 --- a/drivers/sensors/wtgahrs2_uorb.c +++ b/drivers/sensors/wtgahrs2_uorb.c @@ -88,10 +88,6 @@ struct wtgahrs2_dev_s unsigned char gnss_mask; }; -/**************************************************************************** - * Private - ****************************************************************************/ - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/drivers/sensors/zerocross.c b/drivers/sensors/zerocross.c index ab05b351c7..22b1fea2f0 100644 --- a/drivers/sensors/zerocross.c +++ b/drivers/sensors/zerocross.c @@ -49,7 +49,7 @@ #ifdef CONFIG_SENSORS_ZEROCROSS /**************************************************************************** - * Private Type Definitions + * Private Types ****************************************************************************/ /* This structure describes the state of the upper half driver */