drivers/input: Rename BUTTONS configs to INPUT_BUTTONS

This commit is contained in:
Gustavo Henrique Nihei
2021-04-08 14:41:22 -03:00
committed by Alan Carvalho de Assis
parent 5719dab8ec
commit 2efae6928d
56 changed files with 119 additions and 119 deletions
+2 -2
View File
@@ -30,7 +30,7 @@
#include <syslog.h> #include <syslog.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -62,7 +62,7 @@ int a1x_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -247,8 +247,8 @@ int imxrt_bringup(void)
imxrt_lcd_initialize(); imxrt_lcd_initialize();
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -261,8 +261,8 @@ int imxrt_bringup(void)
/* Enable BUTTON support for some other purpose */ /* Enable BUTTON support for some other purpose */
board_button_initialize(); board_button_initialize();
#endif /* CONFIG_BUTTONS_LOWER */ #endif /* CONFIG_INPUT_BUTTONS_LOWER */
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef CONFIG_VIDEO_FB #ifdef CONFIG_VIDEO_FB
/* Initialize and register the framebuffer driver */ /* Initialize and register the framebuffer driver */
@@ -23,8 +23,6 @@ CONFIG_BOARDCTL_RESET=y
CONFIG_BOARDCTL_UNIQUEID=y CONFIG_BOARDCTL_UNIQUEID=y
CONFIG_BOARD_LOOPSPERMSEC=10016 CONFIG_BOARD_LOOPSPERMSEC=10016
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
@@ -43,6 +41,8 @@ CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS_REGISTER=y
CONFIG_I2C_RESET=y CONFIG_I2C_RESET=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_KINETIS_FTM0=y CONFIG_KINETIS_FTM0=y
CONFIG_KINETIS_FTM0_CHANNEL=2 CONFIG_KINETIS_FTM0_CHANNEL=2
CONFIG_KINETIS_FTM0_PWM=y CONFIG_KINETIS_FTM0_PWM=y
@@ -130,7 +130,7 @@ int k66_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -18,11 +18,11 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=21082 CONFIG_BOARD_LOOPSPERMSEC=21082
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_ETH0_PHY_LAN8720=y CONFIG_ETH0_PHY_LAN8720=y
CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_LIB_HOSTNAME="LpcXpresso-Lpc54628" CONFIG_LIB_HOSTNAME="LpcXpresso-Lpc54628"
CONFIG_LPC54_EMC=y CONFIG_LPC54_EMC=y
CONFIG_LPC54_EMC_DYNAMIC_CS0=y CONFIG_LPC54_EMC_DYNAMIC_CS0=y
@@ -19,8 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=21082 CONFIG_BOARD_LOOPSPERMSEC=21082
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_BUTTONS=y
CONFIG_FAT_LCNAMES=y CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y CONFIG_FAT_LFN=y
@@ -29,6 +27,8 @@ CONFIG_FS_PROCFS=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=9 CONFIG_I2CTOOL_MAXBUS=9
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_LPC54_EMC=y CONFIG_LPC54_EMC=y
CONFIG_LPC54_EMC_DYNAMIC_CS0=y CONFIG_LPC54_EMC_DYNAMIC_CS0=y
CONFIG_LPC54_GPIOIRQ=y CONFIG_LPC54_GPIOIRQ=y
@@ -33,7 +33,7 @@
# include <nuttx/video/fb.h> # include <nuttx/video/fb.h>
#endif #endif
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -161,7 +161,7 @@ int lpc54_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -71,7 +71,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -71,7 +71,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -65,7 +65,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -70,7 +70,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -70,7 +70,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -29,7 +29,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -69,7 +69,7 @@ int s32k1xx_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -19,10 +19,10 @@ CONFIG_ARCH_CHIP_STM32=y
CONFIG_ARCH_CHIP_STM32F427I=y CONFIG_ARCH_CHIP_STM32F427I=y
CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_IRQBUTTONS=y
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_CLOCK_MONOTONIC=y CONFIG_CLOCK_MONOTONIC=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=2
CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHINIT=y
+2 -2
View File
@@ -56,7 +56,7 @@
# include "stm32_usbhost.h" # include "stm32_usbhost.h"
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -137,7 +137,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -160,7 +160,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -30,7 +30,7 @@
#include "nucleo-f207zg.h" #include "nucleo-f207zg.h"
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -33,7 +33,7 @@
# include <nuttx/leds/userled.h> # include <nuttx/leds/userled.h>
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -76,7 +76,7 @@ int stm32_bringup(void)
{ {
int ret; int ret;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -30,7 +30,7 @@
#include "nucleo-f303ze.h" #include "nucleo-f303ze.h"
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -39,7 +39,7 @@
#include <arch/board/board.h> #include <arch/board/board.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -71,7 +71,7 @@ int stm32_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -180,7 +180,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
+1 -1
View File
@@ -30,7 +30,7 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c CSRCS += stm32_appinit.c
endif endif
ifeq ($(CONFIG_BUTTONS),y) ifeq ($(CONFIG_INPUT_BUTTONS),y)
CSRCS += stm32_buttons.c CSRCS += stm32_buttons.c
endif endif
+4 -4
View File
@@ -102,8 +102,8 @@ int stm32_bringup(void)
#endif /* CONFIG_USERLED_LOWER */ #endif /* CONFIG_USERLED_LOWER */
#endif /* CONFIG_USERLED && !CONFIG_ARCH_LEDS */ #endif /* CONFIG_USERLED && !CONFIG_ARCH_LEDS */
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -116,8 +116,8 @@ int stm32_bringup(void)
/* Enable BUTTON support for some other purpose */ /* Enable BUTTON support for some other purpose */
board_button_initialize(); board_button_initialize();
#endif /* CONFIG_BUTTONS_LOWER */ #endif /* CONFIG_INPUT_BUTTONS_LOWER */
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef CONFIG_STM32_IWDG #ifdef CONFIG_STM32_IWDG
/* Initialize the watchdog timer */ /* Initialize the watchdog timer */
@@ -30,11 +30,11 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_DEFAULT_SMALL=y CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_BUTTONS=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_BUILTIN_APPS=y
@@ -44,7 +44,7 @@
# include "stm32_usbhost.h" # include "stm32_usbhost.h"
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -392,7 +392,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -40,7 +40,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_BUTTONS) && !defined(CONFIG_ARCH_IRQBUTTONS) #if defined(CONFIG_INPUT_BUTTONS) && !defined(CONFIG_ARCH_IRQBUTTONS)
# error "The NuttX Buttons Driver depends on IRQ support to work!\n" # error "The NuttX Buttons Driver depends on IRQ support to work!\n"
#endif #endif
@@ -42,7 +42,7 @@
# include "stm32_usbhost.h" # include "stm32_usbhost.h"
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -342,7 +342,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -22,8 +22,6 @@ CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_BOARD_LOOPSPERMSEC=2796
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_CLOCK_MONOTONIC=y CONFIG_CLOCK_MONOTONIC=y
CONFIG_DEFAULT_SMALL=y CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MOUNTPOINT=y
@@ -31,6 +29,8 @@ CONFIG_DISABLE_MQUEUE=y
CONFIG_EXAMPLES_CHRONO=y CONFIG_EXAMPLES_CHRONO=y
CONFIG_EXAMPLES_SLCD=y CONFIG_EXAMPLES_SLCD=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_LIB_SLCDCODEC=y CONFIG_LIB_SLCDCODEC=y
@@ -88,8 +88,8 @@ int stm32_bringup(void)
#endif /* CONFIG_USERLED_LOWER */ #endif /* CONFIG_USERLED_LOWER */
#endif /* CONFIG_USERLED && !CONFIG_ARCH_LEDS */ #endif /* CONFIG_USERLED && !CONFIG_ARCH_LEDS */
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -101,8 +101,8 @@ int stm32_bringup(void)
/* Enable BUTTON support for some other purpose */ /* Enable BUTTON support for some other purpose */
board_button_initialize(); board_button_initialize();
#endif /* CONFIG_BUTTONS_LOWER */ #endif /* CONFIG_INPUT_BUTTONS_LOWER */
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef CONFIG_STM32_LCD #ifdef CONFIG_STM32_LCD
/* Initialize the SLCD and register the SLCD device as /dev/slcd0 */ /* Initialize the SLCD and register the SLCD device as /dev/slcd0 */
@@ -30,7 +30,7 @@
# include <nuttx/fs/fs.h> # include <nuttx/fs/fs.h>
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -63,7 +63,7 @@ int stm32_bringup(void)
{ {
int ret = OK; int ret = OK;
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -19,8 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_BOARD_LOOPSPERMSEC=2796
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_GPIO=y CONFIG_DEV_GPIO=y
@@ -38,6 +36,8 @@ CONFIG_I2C=y
CONFIG_I2CTOOL_MAXADDR=0xff CONFIG_I2CTOOL_MAXADDR=0xff
CONFIG_I2CTOOL_MINADDR=0x00 CONFIG_I2CTOOL_MINADDR=0x00
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=8 CONFIG_MAX_TASKS=8
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
@@ -168,7 +168,7 @@ int stm32_bringup(void)
stm32_i2ctool(); stm32_i2ctool();
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -32,7 +32,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -83,7 +83,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -40,7 +40,7 @@
#include "nucleo-h743zi.h" #include "nucleo-h743zi.h"
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -205,7 +205,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -213,7 +213,7 @@ int stm32_bringup(void)
{ {
syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret); syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret);
} }
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef HAVE_USBHOST #ifdef HAVE_USBHOST
/* Initialize USB host operation. stm32_usbhost_initialize() /* Initialize USB host operation. stm32_usbhost_initialize()
@@ -32,7 +32,7 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -180,7 +180,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -188,7 +188,7 @@ int stm32_bringup(void)
{ {
syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret); syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret);
} }
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
/* Initialize ADC and register the ADC driver. */ /* Initialize ADC and register the ADC driver. */
@@ -82,8 +82,8 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
iinfo("Initializing button driver\n"); iinfo("Initializing button driver\n");
/* Register the BUTTON driver */ /* Register the BUTTON driver */
@@ -98,7 +98,7 @@ int stm32_bringup(void)
board_button_initialize(); board_button_initialize();
#endif #endif
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
#ifdef HAVE_I2C_DRIVER #ifdef HAVE_I2C_DRIVER
/* Get the I2C lower half instance */ /* Get the I2C lower half instance */
@@ -20,8 +20,6 @@ CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=4230 CONFIG_BOARD_LOOPSPERMSEC=4230
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y CONFIG_DEBUG_ERROR=y
CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_FEATURES=y
@@ -37,6 +35,8 @@ CONFIG_FS_PROCFS_REGISTER=y
CONFIG_HAVE_CXX=y CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_BUILTIN_APPS=y
@@ -82,8 +82,8 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
iinfo("Initializing button driver\n"); iinfo("Initializing button driver\n");
/* Register the BUTTON driver */ /* Register the BUTTON driver */
@@ -98,7 +98,7 @@ int stm32_bringup(void)
board_button_initialize(); board_button_initialize();
#endif #endif
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
UNUSED(ret); UNUSED(ret);
return OK; return OK;
@@ -82,8 +82,8 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
iinfo("Initializing button driver\n"); iinfo("Initializing button driver\n");
/* Register the BUTTON driver */ /* Register the BUTTON driver */
@@ -98,7 +98,7 @@ int stm32_bringup(void)
board_button_initialize(); board_button_initialize();
#endif #endif
#endif /* CONFIG_BUTTONS */ #endif /* CONFIG_INPUT_BUTTONS */
UNUSED(ret); UNUSED(ret);
return OK; return OK;
@@ -34,7 +34,7 @@
#include <nuttx/timers/pwm.h> #include <nuttx/timers/pwm.h>
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -337,7 +337,7 @@ int tm4c_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS_LOWER #ifdef CONFIG_INPUT_BUTTONS_LOWER
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
+1 -1
View File
@@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs
CSRCS = xmc4_boot.c xmc4_bringup.c CSRCS = xmc4_boot.c xmc4_bringup.c
ifeq ($(CONFIG_BUTTONS),y) ifeq ($(CONFIG_INPUT_BUTTONS),y)
CSRCS += xmc4_buttons.c CSRCS += xmc4_buttons.c
endif endif
+1 -1
View File
@@ -22,7 +22,7 @@ include $(TOPDIR)/Make.defs
CSRCS = xmc4_boot.c xmc4_bringup.c CSRCS = xmc4_boot.c xmc4_bringup.c
ifeq ($(CONFIG_BUTTONS),y) ifeq ($(CONFIG_INPUT_BUTTONS),y)
CSRCS += xmc4_buttons.c CSRCS += xmc4_buttons.c
endif endif
@@ -23,9 +23,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BINFMT_DISABLE=y CONFIG_BINFMT_DISABLE=y
CONFIG_BOARD_LOOPSPERMSEC=15000 CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_BUTTONS_NPOLLWAITERS=1
CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y CONFIG_DEFAULT_SMALL=y
@@ -40,6 +37,9 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=1024
CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=1536 CONFIG_IDLETHREAD_STACKSIZE=1536
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INPUT_BUTTONS_NPOLLWAITERS=1
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
@@ -56,7 +56,7 @@ int fe310_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
+2 -2
View File
@@ -47,7 +47,7 @@
#include <nuttx/lcd/lcd_dev.h> #include <nuttx/lcd/lcd_dev.h>
#endif #endif
#if defined(CONFIG_BUTTONS_LOWER) && defined(CONFIG_SIM_BUTTONS) #if defined(CONFIG_INPUT_BUTTONS_LOWER) && defined(CONFIG_SIM_BUTTONS)
#include <nuttx/input/buttons.h> #include <nuttx/input/buttons.h>
#endif #endif
@@ -402,7 +402,7 @@ int sim_bringup(void)
#endif #endif
#endif #endif
#if defined(CONFIG_BUTTONS_LOWER) && defined(CONFIG_SIM_BUTTONS) #if defined(CONFIG_INPUT_BUTTONS_LOWER) && defined(CONFIG_SIM_BUTTONS)
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
if (ret < 0) if (ret < 0)
{ {
@@ -21,8 +21,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_ESP32_GPIO_IRQ=y CONFIG_ESP32_GPIO_IRQ=y
CONFIG_ESP32_UART0=y CONFIG_ESP32_UART0=y
CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_BUTTONS=y
@@ -31,6 +29,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -78,7 +78,7 @@
# include "esp32_aes.h" # include "esp32_aes.h"
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -337,7 +337,7 @@ int esp32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -20,8 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_ESP32_GPIO_IRQ=y CONFIG_ESP32_GPIO_IRQ=y
CONFIG_ESP32_UART0=y CONFIG_ESP32_UART0=y
CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_BUTTONS=y
@@ -30,6 +28,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -62,7 +62,7 @@
# include "esp32_board_wlan.h" # include "esp32_board_wlan.h"
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
# include <nuttx/input/buttons.h> # include <nuttx/input/buttons.h>
#endif #endif
@@ -249,7 +249,7 @@ int esp32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_BUTTONS #ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */ /* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons"); ret = btn_lower_initialize("/dev/buttons");
@@ -21,8 +21,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_ESP32_GPIO_IRQ=y CONFIG_ESP32_GPIO_IRQ=y
CONFIG_ESP32_UART0=y CONFIG_ESP32_UART0=y
CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_BUTTONS=y
@@ -31,6 +29,8 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072 CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INPUT=y CONFIG_INPUT=y
CONFIG_INPUT_BUTTONS=y
CONFIG_INPUT_BUTTONS_LOWER=y
CONFIG_INTELHEX_BINARY=y CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3

Some files were not shown because too many files have changed in this diff Show More