From 1f023fa31ae2b15107e11366c1806b6da5e00dbc Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 24 Aug 2017 10:10:00 -0600 Subject: [PATCH] drivers/sensors: Fix more naming of configurations to be compliant for two more drivers. Still a few more to go. --- configs/dk-tm4c129x/README.txt | 4 ++-- configs/dk-tm4c129x/include/board.h | 2 +- configs/dk-tm4c129x/ipv6/defconfig | 2 +- configs/dk-tm4c129x/nsh/defconfig | 2 +- configs/dk-tm4c129x/src/Makefile | 2 +- configs/dk-tm4c129x/src/tm4c_bringup.c | 2 +- configs/dk-tm4c129x/src/tm4c_tmp100.c | 4 ++-- configs/stm3210e-eval/README.txt | 4 ++-- configs/stm3210e-eval/include/board.h | 4 ++-- configs/stm3210e-eval/src/Makefile | 2 +- configs/stm3210e-eval/src/stm32_lm75.c | 4 ++-- configs/stm32f4discovery/src/Makefile | 4 ++-- configs/stm32f4discovery/src/stm32_bringup.c | 4 ++-- configs/stm32f4discovery/src/stm32_max31855.c | 4 ++-- configs/stm32f4discovery/src/stm32_max6675.c | 4 ++-- configs/stm32f4discovery/src/stm32_spi.c | 8 ++++---- .../stm32f4discovery/src/stm32f4discovery.h | 2 +- drivers/sensors/Kconfig | 20 +++++++++---------- drivers/sensors/Make.defs | 10 +++++----- drivers/sensors/lis3mdl.c | 4 ++-- drivers/sensors/lm75.c | 4 ++-- drivers/sensors/lm92.c | 4 ++-- drivers/sensors/max31855.c | 4 ++-- drivers/sensors/max6675.c | 4 ++-- drivers/sensors/mcp9844.c | 2 +- include/nuttx/sensors/lis3mdl.h | 4 ++-- include/nuttx/sensors/lm75.h | 6 +++--- include/nuttx/sensors/lm92.h | 6 +++--- include/nuttx/sensors/max31855.h | 4 ++-- include/nuttx/sensors/max6675.h | 4 ++-- 30 files changed, 67 insertions(+), 67 deletions(-) diff --git a/configs/dk-tm4c129x/README.txt b/configs/dk-tm4c129x/README.txt index 9e5aa4ebd09..12a9320fb2c 100644 --- a/configs/dk-tm4c129x/README.txt +++ b/configs/dk-tm4c129x/README.txt @@ -496,8 +496,8 @@ Temperature Sensor CONFIG_I2C=y Drivers -> Sensors - CONFIG_LM75=y - CONFIG_I2C_LM75=y + CONFIG_SENSORS_LM75=y + CONFIG_LM75_I2C=y Applications -> NSH Library CONFIG_NSH_ARCHINIT=y diff --git a/configs/dk-tm4c129x/include/board.h b/configs/dk-tm4c129x/include/board.h index 75a0f7a4cfa..3c2827859d3 100644 --- a/configs/dk-tm4c129x/include/board.h +++ b/configs/dk-tm4c129x/include/board.h @@ -275,7 +275,7 @@ void tiva_boardinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_TIVA_I2C6) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_TIVA_I2C6) int tiva_tmp100_initialize(FAR const char *devpath); #endif diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig index 74a1876bf2b..e318c486027 100644 --- a/configs/dk-tm4c129x/ipv6/defconfig +++ b/configs/dk-tm4c129x/ipv6/defconfig @@ -23,7 +23,7 @@ CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LM75=y +CONFIG_SENSORS_LM75=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET_BROADCAST=y diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig index 919139ead4d..47f8e7303b6 100644 --- a/configs/dk-tm4c129x/nsh/defconfig +++ b/configs/dk-tm4c129x/nsh/defconfig @@ -21,7 +21,7 @@ CONFIG_I2CTOOL_MAXBUS=6 CONFIG_I2CTOOL_MINBUS=6 CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y -CONFIG_LM75=y +CONFIG_SENSORS_LM75=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET_ARP_IPIN=y diff --git a/configs/dk-tm4c129x/src/Makefile b/configs/dk-tm4c129x/src/Makefile index 28541cb38cc..d248e841c8c 100644 --- a/configs/dk-tm4c129x/src/Makefile +++ b/configs/dk-tm4c129x/src/Makefile @@ -60,7 +60,7 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += tm4c_appinit.c endif -ifeq ($(CONFIG_I2C_LM75),y) +ifeq ($(CONFIG_LM75_I2C),y) ifeq ($(CONFIG_TIVA_I2C6),y) CSRCS += tm4c_tmp100.c endif diff --git a/configs/dk-tm4c129x/src/tm4c_bringup.c b/configs/dk-tm4c129x/src/tm4c_bringup.c index e2207559b7e..b938dd74c5a 100644 --- a/configs/dk-tm4c129x/src/tm4c_bringup.c +++ b/configs/dk-tm4c129x/src/tm4c_bringup.c @@ -51,7 +51,7 @@ * Pre-processor Definitions ****************************************************************************/ -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_TIVA_I2C6) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_TIVA_I2C6) # define HAVE_TMP100 #endif diff --git a/configs/dk-tm4c129x/src/tm4c_tmp100.c b/configs/dk-tm4c129x/src/tm4c_tmp100.c index 88bca5de7d2..29ab1a9aeb1 100644 --- a/configs/dk-tm4c129x/src/tm4c_tmp100.c +++ b/configs/dk-tm4c129x/src/tm4c_tmp100.c @@ -47,7 +47,7 @@ #include "tiva_i2c.h" #include "dk-tm4c129x.h" -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && \ +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && \ defined(CONFIG_TIVA_I2C6) /**************************************************************************** @@ -100,4 +100,4 @@ int tiva_tmp100_initialize(FAR const char *devpath) return ret; } -#endif /* CONFIG_I2C && CONFIG_I2C_LM75 && CONFIG_TIVA_I2C6 */ +#endif /* CONFIG_I2C && CONFIG_LM75_I2C && CONFIG_TIVA_I2C6 */ diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index 3bfa7ea89cf..fb1462c5fab 100644 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -346,8 +346,8 @@ Temperature Sensor following to the NuttX configuration file Drivers -> Sensors - CONFIG_LM75=y - CONFIG_I2C_LM75=y + CONFIG_SENSORS_LM75=y + CONFIG_LM75_I2C=y Then you can implement logic like the following to use the temperature sensor: diff --git a/configs/stm3210e-eval/include/board.h b/configs/stm3210e-eval/include/board.h index d5f9c13f381..e2b50f6e054 100644 --- a/configs/stm3210e-eval/include/board.h +++ b/configs/stm3210e-eval/include/board.h @@ -277,7 +277,7 @@ void stm3210e_lcdclear(uint16_t color); * ************************************************************************************/ -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_STM32_I2C1) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_STM32_I2C1) int stm32_lm75initialize(FAR const char *devpath); #endif @@ -296,7 +296,7 @@ int stm32_lm75initialize(FAR const char *devpath); * ************************************************************************************/ -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_STM32_I2C1) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_STM32_I2C1) int stm32_lm75attach(xcpt_t irqhandler, void *arg); #endif diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile index dc282c48b6e..df06668d5be 100644 --- a/configs/stm3210e-eval/src/Makefile +++ b/configs/stm3210e-eval/src/Makefile @@ -60,7 +60,7 @@ ifeq ($(CONFIG_USBDEV_COMPOSITE),y) CSRCS += stm32_composite.c endif -ifeq ($(CONFIG_I2C_LM75),y) +ifeq ($(CONFIG_LM75_I2C),y) CSRCS += stm32_lm75.c endif diff --git a/configs/stm3210e-eval/src/stm32_lm75.c b/configs/stm3210e-eval/src/stm32_lm75.c index 959dd6731c6..a083b783830 100644 --- a/configs/stm3210e-eval/src/stm32_lm75.c +++ b/configs/stm3210e-eval/src/stm32_lm75.c @@ -48,7 +48,7 @@ #include "stm32_i2c.h" #include "stm3210e-eval.h" -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_STM32_I2C1) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_STM32_I2C1) /************************************************************************************ * Public Functions @@ -119,4 +119,4 @@ int stm32_lm75attach(xcpt_t irqhandler, void *arg) return OK; } -#endif /* CONFIG_I2C && CONFIG_I2C_LM75 && CONFIG_STM32_I2C1 */ +#endif /* CONFIG_I2C && CONFIG_LM75_I2C && CONFIG_STM32_I2C1 */ diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 601d3f3e5fa..90a31b04814 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -68,11 +68,11 @@ ifeq ($(CONFIG_SENSORS_BMP180),y) CSRCS += stm32_bmp180.c endif -ifeq ($(CONFIG_MAX31855),y) +ifeq ($(CONFIG_SENSORS_MAX31855),y) CSRCS += stm32_max31855.c endif -ifeq ($(CONFIG_MAX6675),y) +ifeq ($(CONFIG_SENSORS_MAX6675),y) CSRCS += stm32_max6675.c endif diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index c6a22313b01..a92256635a7 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -264,11 +264,11 @@ int stm32_bringup(void) } #endif -#ifdef CONFIG_MAX31855 +#ifdef CONFIG_SENSORS_MAX31855 ret = stm32_max31855initialize("/dev/temp0"); #endif -#ifdef CONFIG_MAX6675 +#ifdef CONFIG_SENSORS_MAX6675 ret = stm32_max6675initialize("/dev/temp0"); #endif diff --git a/configs/stm32f4discovery/src/stm32_max31855.c b/configs/stm32f4discovery/src/stm32_max31855.c index 8b4539fa5bc..2a03d70d7fc 100644 --- a/configs/stm32f4discovery/src/stm32_max31855.c +++ b/configs/stm32f4discovery/src/stm32_max31855.c @@ -49,7 +49,7 @@ #include "stm32_spi.h" #include "stm32f4discovery.h" -#if defined(CONFIG_SPI) && defined(CONFIG_MAX31855) && defined(CONFIG_STM32_SPI2) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MAX31855) && defined(CONFIG_STM32_SPI2) /************************************************************************************ * Pre-processor Definitions @@ -98,4 +98,4 @@ int stm32_max31855initialize(FAR const char *devpath) return ret; } -#endif /* CONFIG_SPI && CONFIG_MAX31855 */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_MAX31855 */ diff --git a/configs/stm32f4discovery/src/stm32_max6675.c b/configs/stm32f4discovery/src/stm32_max6675.c index 304efc787da..759565c6e27 100644 --- a/configs/stm32f4discovery/src/stm32_max6675.c +++ b/configs/stm32f4discovery/src/stm32_max6675.c @@ -49,7 +49,7 @@ #include "stm32_spi.h" #include "stm32f4discovery.h" -#if defined(CONFIG_SPI) && defined(CONFIG_MAX6675) && defined(CONFIG_STM32_SPI2) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MAX6675) && defined(CONFIG_STM32_SPI2) /************************************************************************************ * Pre-processor Definitions @@ -98,4 +98,4 @@ int stm32_max6675initialize(FAR const char *devpath) return ret; } -#endif /* CONFIG_SPI && CONFIG_MAX6675 */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_MAX6675 */ diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index c343520e880..9744fdf7451 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -72,10 +72,10 @@ void weak_function stm32_spidev_initialize(void) #ifdef CONFIG_STM32_SPI1 (void)stm32_configgpio(GPIO_CS_MEMS); /* MEMS chip select */ #endif -#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_MAX31855) +#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_SENSORS_MAX31855) (void)stm32_configgpio(GPIO_MAX31855_CS); /* MAX31855 chip select */ #endif -#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_MAX6675) +#if defined(CONFIG_STM32_SPI2) && defined(CONFIG_SENSORS_MAX6675) (void)stm32_configgpio(GPIO_MAX6675_CS); /* MAX6675 chip select */ #endif #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \ @@ -144,13 +144,13 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); -#if defined(CONFIG_MAX31855) +#if defined(CONFIG_SENSORS_MAX31855) if (devid == SPIDEV_TEMPERATURE(0)) { stm32_gpiowrite(GPIO_MAX31855_CS, !selected); } #endif -#if defined(CONFIG_MAX6675) +#if defined(CONFIG_SENSORS_MAX6675) if (devid == SPIDEV_TEMPERATURE(0)) { stm32_gpiowrite(GPIO_MAX6675_CS, !selected); diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h index c3be6d5cf58..75478932288 100644 --- a/configs/stm32f4discovery/src/stm32f4discovery.h +++ b/configs/stm32f4discovery/src/stm32f4discovery.h @@ -638,7 +638,7 @@ int stm32_zerocross_initialize(void); * ****************************************************************************/ -#ifdef CONFIG_MAX6675 +#ifdef CONFIG_SENSORS_MAX6675 int stm32_max6675initialize(FAR const char *devpath); #endif diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig index 1a92dcb395d..47981b1cee4 100644 --- a/drivers/sensors/Kconfig +++ b/drivers/sensors/Kconfig @@ -302,36 +302,36 @@ config ADXL345_REGDEBUG endif # SENSORS_ADXL345 -config MAX31855 +config SENSORS_MAX31855 bool "Maxim MAX31855 Driver" default n select SPI ---help--- Enables support for the MAX31855 driver -config MAX6675 +config SENSORS_MAX6675 bool "Maxim MAX6675 Driver" default n select SPI ---help--- Enables support for the MAX6675 driver -config I2C_LM75 - bool - default y if LM75 - -config LIS3MDL +config SENSORS_LIS3MDL bool "STMicro LIS3MDL 3-Axis magnetometer support" default n select SPI ---help--- Enable driver support for the STMicro LIS3MDL 3-axis magnetometer. -config LM75 +config LM75_I2C + bool + default y if LM75 + +config SENSORS_LM75 bool "STMicro LM-75 Temperature Sensor support" default n select I2C - select I2C_LM75 + select LM75_I2C ---help--- Enable driver support for the STMicro LM-75 temperature sensor. This should also work with compatible temperature sensors such as @@ -341,7 +341,7 @@ config LM75_I2C_FREQUENCY int "LM75 I2C frequency" default 100000 range 1 100000 - depends on I2C_LM75 + depends on LM75_I2C config LM92 bool "TI LM92 Temperature Sensor support" diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs index 993edf9c5d3..8ab2d3da851 100644 --- a/drivers/sensors/Make.defs +++ b/drivers/sensors/Make.defs @@ -93,11 +93,11 @@ ifeq ($(CONFIG_SENSORS_HTS221),y) CSRCS += hts221.c endif -ifeq ($(CONFIG_I2C_LM75),y) +ifeq ($(CONFIG_LM75_I2C),y) CSRCS += lm75.c endif -ifeq ($(CONFIG_LM92),y) +ifeq ($(CONFIG_SENSORS_LM92),y) CSRCS += lm92.c endif @@ -134,11 +134,11 @@ ifeq ($(CONFIG_LIS3DSH),y) CSRCS += lis3dsh.c endif -ifeq ($(CONFIG_MAX31855),y) +ifeq ($(CONFIG_SENSORS_MAX31855),y) CSRCS += max31855.c endif -ifeq ($(CONFIG_MAX6675),y) +ifeq ($(CONFIG_SENSORS_MAX6675),y) CSRCS += max6675.c endif @@ -146,7 +146,7 @@ ifeq ($(CONFIG_MPL115A),y) CSRCS += mpl115a.c endif -ifeq ($(CONFIG_LIS3MDL),y) +ifeq ($(CONFIG_SENSORS_LIS3MDL),y) CSRCS += lis3mdl.c endif diff --git a/drivers/sensors/lis3mdl.c b/drivers/sensors/lis3mdl.c index 64f33bae7ae..18c0e21f8b6 100644 --- a/drivers/sensors/lis3mdl.c +++ b/drivers/sensors/lis3mdl.c @@ -52,7 +52,7 @@ #include #include -#if defined(CONFIG_SPI) && defined(CONFIG_LIS3MDL) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_LIS3MDL) /**************************************************************************** * Private @@ -638,4 +638,4 @@ int lis3mdl_register(FAR const char *devpath, FAR struct spi_dev_s *spi, return OK; } -#endif /* CONFIG_SPI && CONFIG_LIS3MDL */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_LIS3MDL */ diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c index 025fae0c93b..f5f4ce6fa78 100644 --- a/drivers/sensors/lm75.c +++ b/drivers/sensors/lm75.c @@ -51,7 +51,7 @@ #include #include -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) /**************************************************************************** * Pre-processor Definitions @@ -604,4 +604,4 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t return ret; } -#endif /* CONFIG_I2C && CONFIG_I2C_LM75 */ +#endif /* CONFIG_I2C && CONFIG_LM75_I2C */ diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c index 47402e35609..cd2aa13b350 100644 --- a/drivers/sensors/lm92.c +++ b/drivers/sensors/lm92.c @@ -53,7 +53,7 @@ #include #include -#if defined(CONFIG_I2C) && defined(CONFIG_LM92) +#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LM92) /**************************************************************************** * Pre-processor Definitions @@ -694,4 +694,4 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, return ret; } -#endif /* CONFIG_I2C && CONFIG_LM92 */ +#endif /* CONFIG_I2C && CONFIG_SENSORS_LM92 */ diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c index b4668088dc7..f5be09cfde8 100644 --- a/drivers/sensors/max31855.c +++ b/drivers/sensors/max31855.c @@ -56,7 +56,7 @@ #include #include -#if defined(CONFIG_SPI) && defined(CONFIG_MAX31855) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MAX31855) /**************************************************************************** * Pre-processor Definitions @@ -331,4 +331,4 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi) return ret; } -#endif /* CONFIG_SPI && CONFIG_MAX31855 */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_MAX31855 */ diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c index 3d273df20f1..b0f63d80c41 100644 --- a/drivers/sensors/max6675.c +++ b/drivers/sensors/max6675.c @@ -56,7 +56,7 @@ #include #include -#if defined(CONFIG_SPI) && defined(CONFIG_MAX6675) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MAX6675) /**************************************************************************** * Pre-processor Definitions @@ -308,4 +308,4 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi) return ret; } -#endif /* CONFIG_SPI && CONFIG_MAX6675 */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_MAX6675 */ diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c index f895d86152a..1d5ec6823ce 100644 --- a/drivers/sensors/mcp9844.c +++ b/drivers/sensors/mcp9844.c @@ -374,4 +374,4 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, return ret; } -#endif /* CONFIG_I2C && CONFIG_I2C_LM75 */ +#endif /* CONFIG_I2C && CONFIG_LM75_I2C */ diff --git a/include/nuttx/sensors/lis3mdl.h b/include/nuttx/sensors/lis3mdl.h index e5acba39404..eeddbe56bb1 100644 --- a/include/nuttx/sensors/lis3mdl.h +++ b/include/nuttx/sensors/lis3mdl.h @@ -45,7 +45,7 @@ #include #include -#if defined(CONFIG_SPI) && defined(CONFIG_LIS3MDL) +#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_LIS3MDL) /**************************************************************************** * Pre-processor Definitions @@ -176,5 +176,5 @@ int lis3mdl_register(FAR const char *devpath, FAR struct spi_dev_s *spi, } #endif -#endif /* CONFIG_SPI && CONFIG_LIS3MDL */ +#endif /* CONFIG_SPI && CONFIG_SENSORS_LIS3MDL */ #endif /* __INCLUDE_NUTTX_SENSORS_LIS3MDL_H */ diff --git a/include/nuttx/sensors/lm75.h b/include/nuttx/sensors/lm75.h index f12e2120a17..ba12d3114f0 100644 --- a/include/nuttx/sensors/lm75.h +++ b/include/nuttx/sensors/lm75.h @@ -43,14 +43,14 @@ #include #include -#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) +#if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************ * CONFIG_I2C - Enables support for I2C drivers - * CONFIG_I2C_LM75 - Enables support for the LM-75 driver + * CONFIG_LM75_I2C - Enables support for the LM-75 driver */ #define CONFIG_LM75_BASEADDR 0x48 @@ -126,5 +126,5 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, } #endif -#endif /* CONFIG_I2C && CONFIG_I2C_LM75 */ +#endif /* CONFIG_I2C && CONFIG_LM75_I2C */ #endif /* __INCLUDE_NUTTX_SENSORS_LM75_H */ diff --git a/include/nuttx/sensors/lm92.h b/include/nuttx/sensors/lm92.h index 4bfa3423f0f..1c7f278d35b 100644 --- a/include/nuttx/sensors/lm92.h +++ b/include/nuttx/sensors/lm92.h @@ -45,14 +45,14 @@ #include #include -#if defined(CONFIG_I2C) && defined(CONFIG_LM92) +#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LM92) /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************ * CONFIG_I2C - Enables support for I2C drivers - * CONFIG_LM92 - Enables support for the LM92 driver + * CONFIG_SENSORS_LM92 - Enables support for the LM92 driver */ #define CONFIG_LM92_BASEADDR 0x48 @@ -129,5 +129,5 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, } #endif -#endif /* CONFIG_I2C && CONFIG_LM92 */ +#endif /* CONFIG_I2C && CONFIG_SENSORS_LM92 */ #endif /* __INCLUDE_NUTTX_SENSORS_LM92_H */ diff --git a/include/nuttx/sensors/max31855.h b/include/nuttx/sensors/max31855.h index 4a4a91b9c43..fcfe795e3be 100644 --- a/include/nuttx/sensors/max31855.h +++ b/include/nuttx/sensors/max31855.h @@ -43,7 +43,7 @@ #include #include -#if defined(CONFIG_MAX31855) +#if defined(CONFIG_SENSORS_MAX31855) /**************************************************************************** * Pre-processor Definitions @@ -94,5 +94,5 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi); } #endif -#endif /* CONFIG_MAX31855 */ +#endif /* CONFIG_SENSORS_MAX31855 */ #endif /* __INCLUDE_NUTTX_SENSORS_MAX31855_H */ diff --git a/include/nuttx/sensors/max6675.h b/include/nuttx/sensors/max6675.h index 0864c7434b0..64b7fbf279f 100644 --- a/include/nuttx/sensors/max6675.h +++ b/include/nuttx/sensors/max6675.h @@ -43,7 +43,7 @@ #include #include -#if defined(CONFIG_MAX6675) +#if defined(CONFIG_SENSORS_MAX6675) /**************************************************************************** * Pre-processor Definitions @@ -94,5 +94,5 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi); } #endif -#endif /* CONFIG_MAX6675 */ +#endif /* CONFIG_SENSORS_MAX6675 */ #endif /* __INCLUDE_NUTTX_SENSORS_MAX6675_H */