Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers/input: Rename DJOYSTICK configs to INPUT_DJOYSTICK

Browse Source
This commit is contained in:
Gustavo Henrique Nihei
2021-04-08 06:24:25 -03:00
committed by Alan Carvalho de Assis
parent 2efae6928d
commit 3054237d2e
21 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/Kconfig
+5 -5
View File
@@ -472,7 +472,7 @@ config INPUT_BUTTONS_NPOLLWAITERS
endif # INPUT_BUTTONS
config DJOYSTICK
config INPUT_DJOYSTICK
bool "Discrete Joystick"
default n
---help---
@@ -482,13 +482,13 @@ config DJOYSTICK
values like buttons (as opposed to integer values like you might
obtain from an analog joystick).
if DJOYSTICK
if INPUT_DJOYSTICK
config DJOYSTICK_NPOLLWAITERS
config INPUT_DJOYSTICK_NPOLLWAITERS
int "Max Number of Poll Waiters"
default 2
endif # DJOYSTICK
endif # INPUT_DJOYSTICK
config AJOYSTICK
bool "Analog Joystick"
@@ -541,7 +541,7 @@ if INPUT_SPQ10KBD
config SPQ10KBD_DJOY
bool "Joystick Interface for Buttons"
select DJOYSTICK
select INPUT_DJOYSTICK
default n
config SPQ10KBD_REGDBG
drivers/input/Make.defs
+1 -1
View File
@@ -72,7 +72,7 @@ endif
endif
ifeq ($(CONFIG_DJOYSTICK),y)
ifeq ($(CONFIG_INPUT_DJOYSTICK),y)
CSRCS += djoystick.c
endif
drivers/input/djoystick.c
+5 -5
View File
@@ -99,7 +99,7 @@ struct djoy_open_s
* driver events.
*/
FAR struct pollfd *do_fds[CONFIG_DJOYSTICK_NPOLLWAITERS];
FAR struct pollfd *do_fds[CONFIG_INPUT_DJOYSTICK_NPOLLWAITERS];
};
/****************************************************************************
@@ -192,7 +192,7 @@ static void djoy_enable(FAR struct djoy_upperhalf_s *priv)
{
/* Are there any poll waiters? */
for (i = 0; i < CONFIG_DJOYSTICK_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_INPUT_DJOYSTICK_NPOLLWAITERS; i++)
{
if (opriv->do_fds[i])
{
@@ -299,7 +299,7 @@ static void djoy_sample(FAR struct djoy_upperhalf_s *priv)
{
/* Yes.. Notify all waiters */
for (i = 0; i < CONFIG_DJOYSTICK_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_INPUT_DJOYSTICK_NPOLLWAITERS; i++)
{
FAR struct pollfd *fds = opriv->do_fds[i];
if (fds)
@@ -704,7 +704,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
* slot for the poll structure reference
*/
for (i = 0; i < CONFIG_DJOYSTICK_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_INPUT_DJOYSTICK_NPOLLWAITERS; i++)
{
/* Find an available slot */
@@ -718,7 +718,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
}
}
if (i >= CONFIG_DJOYSTICK_NPOLLWAITERS)
if (i >= CONFIG_INPUT_DJOYSTICK_NPOLLWAITERS)
{
ierr("ERROR: Too man poll waiters\n");
fds->priv = NULL;