sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/input: Rename AJOYSTICK configs to INPUT_AJOYSTICK

Browse Source
This commit is contained in:
Gustavo Henrique Nihei 2021-04-08 06:33:58 -03:00 committed by Alan Carvalho de Assis
parent 3054237d2e
commit ada84cacda
34 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/arm/sama5/giant-board/src/Makefile
View File

@ -65,7 +65,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += sam_adc.c CSRCS += sam_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += sam_ajoystick.c CSRCS += sam_ajoystick.c
endif endif
endif endif

16
boards/arm/sama5/giant-board/src/sam_ajoystick.c
View File

@ -45,29 +45,29 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1) # elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1)
# error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick # error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick
# elif !defined(CONFIG_SAMA5_PIOC_IRQ) # elif !defined(CONFIG_SAMA5_PIOC_IRQ)
# error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick # error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_EMACA) # elif defined(CONFIG_SAMA5_EMACA)
# error EMAC conflicts with the Itead PIO usage # error EMAC conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SSC0) # elif defined(CONFIG_SAMA5_SSC0)
# error SSC0 conflicts with the Itead PIO usage # error SSC0 conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SPI1) # elif defined(CONFIG_SAMA5_SPI1)
# warning SPI1 may conflict with the Itead PIO usage # warning SPI1 may conflict with the Itead PIO usage
# elif defined(CONFIG_SAMA5_ISI) # elif defined(CONFIG_SAMA5_ISI)
# warning ISI may conflict with the Itead PIO usage # warning ISI may conflict with the Itead PIO usage
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Number of Joystick buttons */ /* Number of Joystick buttons */
@ -434,4 +434,4 @@ int sam_ajoy_initialization(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/sama5/sama5d2-xult/src/Makefile
View File

@ -83,7 +83,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += sam_adc.c CSRCS += sam_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += sam_ajoystick.c CSRCS += sam_ajoystick.c
endif endif
endif endif

16
boards/arm/sama5/sama5d2-xult/src/sam_ajoystick.c
View File

@ -45,29 +45,29 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1) # elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1)
# error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick # error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick
# elif !defined(CONFIG_SAMA5_PIOC_IRQ) # elif !defined(CONFIG_SAMA5_PIOC_IRQ)
# error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick # error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_EMACA) # elif defined(CONFIG_SAMA5_EMACA)
# error EMAC conflicts with the Itead PIO usage # error EMAC conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SSC0) # elif defined(CONFIG_SAMA5_SSC0)
# error SSC0 conflicts with the Itead PIO usage # error SSC0 conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SPI1) # elif defined(CONFIG_SAMA5_SPI1)
# warning SPI1 may conflict with the Itead PIO usage # warning SPI1 may conflict with the Itead PIO usage
# elif defined(CONFIG_SAMA5_ISI) # elif defined(CONFIG_SAMA5_ISI)
# warning ISI may conflict with the Itead PIO usage # warning ISI may conflict with the Itead PIO usage
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Number of Joystick buttons */ /* Number of Joystick buttons */
@ -434,4 +434,4 @@ int sam_ajoy_initialization(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/sama5/sama5d3-xplained/README.txt
View File

@ -2851,7 +2851,7 @@ Shields
CONFIG_ANALOG=y : Should be automatically selected CONFIG_ANALOG=y : Should be automatically selected
CONFIG_ADC=y : Should be automatically selected CONFIG_ADC=y : Should be automatically selected
CONFIG_INPUT=y : Select input device support CONFIG_INPUT=y : Select input device support
CONFIG_AJOYSTICK=y : Select analog joystick support CONFIG_INPUT_AJOYSTICK=y : Select analog joystick support
System Type -> ADC Configuration System Type -> ADC Configuration
CONFIG_SAMA5_ADC_CHAN0=y : These settings enable the sequencer to collect CONFIG_SAMA5_ADC_CHAN0=y : These settings enable the sequencer to collect

2
boards/arm/sama5/sama5d3-xplained/src/Makefile
View File

@ -75,7 +75,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += sam_adc.c CSRCS += sam_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += sam_ajoystick.c CSRCS += sam_ajoystick.c
endif endif
endif endif

16
boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c
View File

@ -45,29 +45,29 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1) # elif !defined(CONFIG_SAMA5_ADC_CHAN0) || !defined(CONFIG_SAMA5_ADC_CHAN1)
# error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick # error CONFIG_SAMA5_ADC_CHAN0 and 1 are required for Itead joystick
# elif !defined(CONFIG_SAMA5_PIOC_IRQ) # elif !defined(CONFIG_SAMA5_PIOC_IRQ)
# error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick # error CONFIG_SAMA5_PIOC_IRQ is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_EMACA) # elif defined(CONFIG_SAMA5_EMACA)
# error EMAC conflicts with the Itead PIO usage # error EMAC conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SSC0) # elif defined(CONFIG_SAMA5_SSC0)
# error SSC0 conflicts with the Itead PIO usage # error SSC0 conflicts with the Itead PIO usage
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif defined(CONFIG_SAMA5_SPI1) # elif defined(CONFIG_SAMA5_SPI1)
# warning SPI1 may conflict with the Itead PIO usage # warning SPI1 may conflict with the Itead PIO usage
# elif defined(CONFIG_SAMA5_ISI) # elif defined(CONFIG_SAMA5_ISI)
# warning ISI may conflict with the Itead PIO usage # warning ISI may conflict with the Itead PIO usage
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Number of Joystick buttons */ /* Number of Joystick buttons */
@ -434,4 +434,4 @@ int sam_ajoy_initialization(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/stm32/nucleo-f446re/Kconfig
View File

@ -14,7 +14,7 @@ config NUCLEO_F446RE_AJOY_MINBUTTONS
bool "Minimal Joystick Buttons" bool "Minimal Joystick Buttons"
default n if !STM32_USART1 default n if !STM32_USART1
default y if STM32_USART1 default y if STM32_USART1
depends on AJOYSTICK depends on INPUT_AJOYSTICK
---help--- ---help---
The Itead Joystick shield supports analog X/Y position and up to 5 The Itead Joystick shield supports analog X/Y position and up to 5
buttons. Some of these buttons may conflict with other resources buttons. Some of these buttons may conflict with other resources

2
boards/arm/stm32/nucleo-f446re/README.txt
View File

@ -488,7 +488,7 @@ Shields
CONFIG_ANALOG=y : Should be automatically selected CONFIG_ANALOG=y : Should be automatically selected
CONFIG_ADC=y : Should be automatically selected CONFIG_ADC=y : Should be automatically selected
CONFIG_INPUT=y : Select input device support CONFIG_INPUT=y : Select input device support
CONFIG_AJOYSTICK=y : Select analog joystick support CONFIG_INPUT_AJOYSTICK=y : Select analog joystick support
There is nothing in the configuration that currently uses the joystick. There is nothing in the configuration that currently uses the joystick.
For testing, you can add the following configuration options to enable the For testing, you can add the following configuration options to enable the

2
boards/arm/stm32/nucleo-f446re/src/Make.defs
View File

@ -34,7 +34,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c CSRCS += stm32_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += stm32_ajoystick.c CSRCS += stm32_ajoystick.c
endif endif
endif endif

2
boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h
View File

@ -300,7 +300,7 @@ int stm32_can_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
int board_ajoy_initialize(void); int board_ajoy_initialize(void);
#endif #endif

4
boards/arm/stm32/nucleo-f446re/src/stm32_adc.c
View File

@ -57,7 +57,7 @@
/* Identifying number of each ADC channel. */ /* Identifying number of each ADC channel. */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
#ifdef CONFIG_ADC_DMA #ifdef CONFIG_ADC_DMA
/* The Itead analog joystick gets inputs on ADC_IN0 and ADC_IN1 */ /* The Itead analog joystick gets inputs on ADC_IN0 and ADC_IN1 */
@ -92,7 +92,7 @@ static const uint32_t g_adc1_pinlist[ADC1_NCHANNELS] =
}; };
#endif /* CONFIG_ADC_DMA */ #endif /* CONFIG_ADC_DMA */
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

12
boards/arm/stm32/nucleo-f446re/src/stm32_ajoystick.c
View File

@ -45,17 +45,17 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_STM32_ADC1) # elif !defined(CONFIG_STM32_ADC1)
# error CONFIG_STM32_ADC1 is required for Itead joystick # error CONFIG_STM32_ADC1 is required for Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* A no-ADC, buttons only version can be built for testing */ /* A no-ADC, buttons only version can be built for testing */
@ -485,4 +485,4 @@ int board_ajoy_initialize(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c
View File

@ -145,7 +145,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Initialize and register the joystick driver */ /* Initialize and register the joystick driver */
ret = board_ajoy_initialize(); ret = board_ajoy_initialize();

2
boards/arm/stm32/nucleo-f4x1re/Kconfig
View File

@ -14,7 +14,7 @@ config NUCLEO_F401RE_AJOY_MINBUTTONS
bool "Minimal Joystick Buttons" bool "Minimal Joystick Buttons"
default n if !STM32_USART1 default n if !STM32_USART1
default y if STM32_USART1 default y if STM32_USART1
depends on AJOYSTICK depends on INPUT_AJOYSTICK
---help--- ---help---
The Itead Joystick shield supports analog X/Y position and up to 5 The Itead Joystick shield supports analog X/Y position and up to 5
buttons. Some of these buttons may conflict with other resources buttons. Some of these buttons may conflict with other resources

2
boards/arm/stm32/nucleo-f4x1re/README.txt
View File

@ -513,7 +513,7 @@ Shields
CONFIG_ANALOG=y : Should be automatically selected CONFIG_ANALOG=y : Should be automatically selected
CONFIG_ADC=y : Should be automatically selected CONFIG_ADC=y : Should be automatically selected
CONFIG_INPUT=y : Select input device support CONFIG_INPUT=y : Select input device support
CONFIG_AJOYSTICK=y : Select analog joystick support CONFIG_INPUT_AJOYSTICK=y : Select analog joystick support
There is nothing in the configuration that currently uses the joystick. There is nothing in the configuration that currently uses the joystick.
For testing, you can add the following configuration options to enable the For testing, you can add the following configuration options to enable the

2
boards/arm/stm32/nucleo-f4x1re/src/Make.defs
View File

@ -34,7 +34,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c CSRCS += stm32_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += stm32_ajoystick.c CSRCS += stm32_ajoystick.c
endif endif
endif endif

2
boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h
View File

@ -295,7 +295,7 @@ int stm32_adc_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
int board_ajoy_initialize(void); int board_ajoy_initialize(void);
#endif #endif

4
boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
View File

@ -58,7 +58,7 @@
/* Identifying number of each ADC channel. */ /* Identifying number of each ADC channel. */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
#ifdef CONFIG_ADC_DMA #ifdef CONFIG_ADC_DMA
/* The Itead analog joystick gets inputs on ADC_IN0 and ADC_IN1 */ /* The Itead analog joystick gets inputs on ADC_IN0 and ADC_IN1 */
@ -92,7 +92,7 @@ static const uint32_t g_adc1_pinlist[ADC1_NCHANNELS] =
}; };
#endif /* CONFIG_ADC_DMA */ #endif /* CONFIG_ADC_DMA */
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

12
boards/arm/stm32/nucleo-f4x1re/src/stm32_ajoystick.c
View File

@ -45,17 +45,17 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_STM32_ADC1) # elif !defined(CONFIG_STM32_ADC1)
# error CONFIG_STM32_ADC1 is required for Itead joystick # error CONFIG_STM32_ADC1 is required for Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* A no-ADC, buttons only version can be built for testing */ /* A no-ADC, buttons only version can be built for testing */
@ -484,4 +484,4 @@ int board_ajoy_initialize(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c
View File

@ -150,7 +150,7 @@ int stm32_bringup(void)
} }
#endif #endif
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Initialize and register the joystick driver */ /* Initialize and register the joystick driver */
ret = board_ajoy_initialize(); ret = board_ajoy_initialize();

2
boards/arm/stm32l4/nucleo-l476rg/Kconfig
View File

@ -9,7 +9,7 @@ config NUCLEO_L476RG_AJOY_MINBUTTONS
bool "Minimal Joystick Buttons" bool "Minimal Joystick Buttons"
default n if !STM32_USART1 default n if !STM32_USART1
default y if STM32_USART1 default y if STM32_USART1
depends on AJOYSTICK depends on INPUT_AJOYSTICK
---help--- ---help---
The Itead Joystick shield supports analog X/Y position and up to 5 The Itead Joystick shield supports analog X/Y position and up to 5
buttons. Some of these buttons may conflict with other resources buttons. Some of these buttons may conflict with other resources

2
boards/arm/stm32l4/nucleo-l476rg/README.txt
View File

@ -488,7 +488,7 @@ Shields
CONFIG_ANALOG=y : Should be automatically selected CONFIG_ANALOG=y : Should be automatically selected
CONFIG_ADC=y : Should be automatically selected CONFIG_ADC=y : Should be automatically selected
CONFIG_INPUT=y : Select input device support CONFIG_INPUT=y : Select input device support
CONFIG_AJOYSTICK=y : Select analog joystick support CONFIG_INPUT_AJOYSTICK=y : Select analog joystick support
There is nothing in the configuration that currently uses the joystick. There is nothing in the configuration that currently uses the joystick.
For testing, you can add the following configuration options to enable the For testing, you can add the following configuration options to enable the

2
boards/arm/stm32l4/nucleo-l476rg/src/Makefile
View File

@ -38,7 +38,7 @@ endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c CSRCS += stm32_adc.c
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += stm32_ajoystick.c CSRCS += stm32_ajoystick.c
endif endif
endif endif

2
boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h
View File

@ -372,7 +372,7 @@ int stm32l4_adc_setup(void);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
int board_ajoy_initialize(void); int board_ajoy_initialize(void);
#endif #endif

4
boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c
View File

@ -57,7 +57,7 @@
/* Identifying number of each ADC channel. */ /* Identifying number of each ADC channel. */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
#ifdef CONFIG_ADC_DMA #ifdef CONFIG_ADC_DMA
/* The Itead analog joystick gets inputs on ADC_IN1 and ADC_IN2 */ /* The Itead analog joystick gets inputs on ADC_IN1 and ADC_IN2 */
@ -93,7 +93,7 @@ static const uint32_t g_adc1_pinlist[ADC1_NCHANNELS] =
}; };
#endif /* CONFIG_ADC_DMA */ #endif /* CONFIG_ADC_DMA */
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions

12
boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c
View File

@ -44,17 +44,17 @@
/* Check for pre-requisites and pin conflicts */ /* Check for pre-requisites and pin conflicts */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
# if !defined(CONFIG_ADC) # if !defined(CONFIG_ADC)
# error CONFIG_ADC is required for the Itead joystick # error CONFIG_ADC is required for the Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# elif !defined(CONFIG_STM32L4_ADC1) # elif !defined(CONFIG_STM32L4_ADC1)
# error CONFIG_STM32L4_ADC1 is required for Itead joystick # error CONFIG_STM32L4_ADC1 is required for Itead joystick
# undef CONFIG_AJOYSTICK # undef CONFIG_INPUT_AJOYSTICK
# endif # endif
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* A no-ADC, buttons only version can be built for testing */ /* A no-ADC, buttons only version can be built for testing */
@ -484,4 +484,4 @@ int board_ajoy_initialize(void)
return ret; return ret;
} }
#endif /* CONFIG_AJOYSTICK */ #endif /* CONFIG_INPUT_AJOYSTICK */

2
boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
View File

@ -288,7 +288,7 @@ int board_app_initialize(uintptr_t arg)
} }
#endif #endif
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Initialize and register the joystick driver */ /* Initialize and register the joystick driver */
ret = board_ajoy_initialize(); ret = board_ajoy_initialize();

2
boards/arm/stm32l4/stm32l476vg-disco/README.txt
View File

@ -315,7 +315,7 @@ Shields
CONFIG_ANALOG=y : Should be automatically selected CONFIG_ANALOG=y : Should be automatically selected
CONFIG_ADC=y : Should be automatically selected CONFIG_ADC=y : Should be automatically selected
CONFIG_INPUT=y : Select input device support CONFIG_INPUT=y : Select input device support
CONFIG_AJOYSTICK=y : Select analog joystick support CONFIG_INPUT_AJOYSTICK=y : Select analog joystick support
There is nothing in the configuration that currently uses the joystick. There is nothing in the configuration that currently uses the joystick.
For testing, you can add the following configuration options to enable the For testing, you can add the following configuration options to enable the

2
boards/sim/sim/sim/src/sim_bringup.c
View File

@ -250,7 +250,7 @@ int sim_bringup(void)
} }
#endif #endif
#ifdef CONFIG_AJOYSTICK #ifdef CONFIG_INPUT_AJOYSTICK
/* Initialize the simulated analog joystick input device */ /* Initialize the simulated analog joystick input device */
sim_ajoy_initialize(); sim_ajoy_initialize();

8
drivers/input/Kconfig
View File

@ -490,7 +490,7 @@ config INPUT_DJOYSTICK_NPOLLWAITERS
endif # INPUT_DJOYSTICK endif # INPUT_DJOYSTICK
config AJOYSTICK config INPUT_AJOYSTICK
bool "Analog Joystick" bool "Analog Joystick"
default n default n
---help--- ---help---
@ -500,13 +500,13 @@ config AJOYSTICK
to-Digital Conversion (ADC). The analog positional data may also to-Digital Conversion (ADC). The analog positional data may also
be accompanied by discrete button data. be accompanied by discrete button data.
if AJOYSTICK if INPUT_AJOYSTICK
config AJOYSTICK_NPOLLWAITERS config INPUT_AJOYSTICK_NPOLLWAITERS
int "Max Number of Poll Waiters" int "Max Number of Poll Waiters"
default 2 default 2
endif # AJOYSTICK endif # INPUT_AJOYSTICK
config INPUT_NUNCHUCK config INPUT_NUNCHUCK
bool "Nintendo Wii Nunchuck Joystick (White Model)" bool "Nintendo Wii Nunchuck Joystick (White Model)"

2
drivers/input/Make.defs
View File

@ -76,7 +76,7 @@ ifeq ($(CONFIG_INPUT_DJOYSTICK),y)
CSRCS += djoystick.c CSRCS += djoystick.c
endif endif
ifeq ($(CONFIG_AJOYSTICK),y) ifeq ($(CONFIG_INPUT_AJOYSTICK),y)
CSRCS += ajoystick.c CSRCS += ajoystick.c
endif endif

10
drivers/input/ajoystick.c
View File

@ -99,7 +99,7 @@ struct ajoy_open_s
* driver events. * driver events.
*/ */
FAR struct pollfd *ao_fds[CONFIG_AJOYSTICK_NPOLLWAITERS]; FAR struct pollfd *ao_fds[CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS];
}; };
/**************************************************************************** /****************************************************************************
@ -192,7 +192,7 @@ static void ajoy_enable(FAR struct ajoy_upperhalf_s *priv)
{ {
/* Are there any poll waiters? */ /* Are there any poll waiters? */
for (i = 0; i < CONFIG_AJOYSTICK_NPOLLWAITERS; i++) for (i = 0; i < CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS; i++)
{ {
if (opriv->ao_fds[i]) if (opriv->ao_fds[i])
{ {
@ -299,7 +299,7 @@ static void ajoy_sample(FAR struct ajoy_upperhalf_s *priv)
{ {
/* Yes.. Notify all waiters */ /* Yes.. Notify all waiters */
for (i = 0; i < CONFIG_AJOYSTICK_NPOLLWAITERS; i++) for (i = 0; i < CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS; i++)
{ {
FAR struct pollfd *fds = opriv->ao_fds[i]; FAR struct pollfd *fds = opriv->ao_fds[i];
if (fds) if (fds)
@ -708,7 +708,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
* slot for the poll structure reference * slot for the poll structure reference
*/ */
for (i = 0; i < CONFIG_AJOYSTICK_NPOLLWAITERS; i++) for (i = 0; i < CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS; i++)
{ {
/* Find an available slot */ /* Find an available slot */
@ -722,7 +722,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
} }
} }
if (i >= CONFIG_AJOYSTICK_NPOLLWAITERS) if (i >= CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS)
{ {
ierr("ERROR: Too man poll waiters\n"); ierr("ERROR: Too man poll waiters\n");
fds->priv = NULL; fds->priv = NULL;

4
include/nuttx/input/ajoystick.h
View File

@ -51,8 +51,8 @@
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifndef CONFIG_AJOYSTICK_NPOLLWAITERS #ifndef CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS
# define CONFIG_AJOYSTICK_NPOLLWAITERS 2 # define CONFIG_INPUT_AJOYSTICK_NPOLLWAITERS 2
#endif #endif
/* Joystick Interface *******************************************************/ /* Joystick Interface *******************************************************/