OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

input/uinput: Rename UINPUT_TOUCHSCREEN to UINPUT_TOUCH 

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-03-20 00:36:35 +08:00 committed by Petro Karashchenko
parent 7fbadb5c16
commit fd5fb26f51
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,13 +319,13 @@ int sim_bringup(void)
}
#endif
#ifdef CONFIG_UINPUT_TOUCHSCREEN
#ifdef CONFIG_UINPUT_TOUCH
ret = uinput_touch_initialize("utouch", 1, 4);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: uinput_touch_initialize failed: %d\n", ret);
}
#endif /* CONFIG_UINPUT_TOUCHSCREEN */
#endif /* CONFIG_UINPUT_TOUCH */
#ifdef CONFIG_UINPUT_BUTTONS
ret = uinput_button_initialize("ubutton");

6
drivers/input/Kconfig
View File

@ -64,13 +64,13 @@ config UINPUT_RPMSG
---help---
Enable support uinput cross core communication
config UINPUT_TOUCHSCREEN
bool "Enable uinput touchscreen"
config UINPUT_TOUCH
bool "Enable uinput touch"
select INPUT_TOUCHSCREEN
select INPUT_UINPUT
default n
---help---
Enable support virtual input touchscreen device driver
Enable support virtual input touch device driver
config UINPUT_BUTTONS
bool "Enable uinput buttons"

12
drivers/input/uinput.c
View File

@ -122,7 +122,7 @@ static void uinput_rpmsg_notify(FAR struct uinput_context_s *ctx,
#endif /* CONFIG_UINPUT_RPMSG */
#ifdef CONFIG_UINPUT_TOUCHSCREEN
#ifdef CONFIG_UINPUT_TOUCH
static ssize_t uinput_touch_notify(FAR void *uinput_lower,
FAR const char *buffer, size_t buflen);
@ -130,7 +130,7 @@ static ssize_t uinput_touch_notify(FAR void *uinput_lower,
static ssize_t uinput_touch_write(FAR struct touch_lowerhalf_s *lower,
FAR const char *buffer, size_t buflen);
#endif /* CONFIG_UINPUT_TOUCHSCREEN */
#endif /* CONFIG_UINPUT_TOUCH */
#ifdef CONFIG_UINPUT_BUTTONS
@ -281,7 +281,7 @@ static void uinput_rpmsg_notify(FAR struct uinput_context_s *ctx,
#endif /* CONFIG_UINPUT_RPMSG */
#ifdef CONFIG_UINPUT_TOUCHSCREEN
#ifdef CONFIG_UINPUT_TOUCH
/****************************************************************************
* Name: uinput_touch_notify
@ -316,7 +316,7 @@ static ssize_t uinput_touch_write(FAR struct touch_lowerhalf_s *lower,
return uinput_touch_notify(utcs_lower, buffer, buflen);
}
#endif /* CONFIG_UINPUT_TOUCHSCREEN */
#endif /* CONFIG_UINPUT_TOUCH */
#ifdef CONFIG_UINPUT_BUTTONS
@ -463,7 +463,7 @@ static ssize_t uinput_keyboard_write(FAR struct keyboard_lowerhalf_s *lower,
*
****************************************************************************/
#ifdef CONFIG_UINPUT_TOUCHSCREEN
#ifdef CONFIG_UINPUT_TOUCH
int uinput_touch_initialize(FAR const char *name, int maxpoint, int buffnums)
{
@ -500,7 +500,7 @@ int uinput_touch_initialize(FAR const char *name, int maxpoint, int buffnums)
return 0;
}
#endif /* CONFIG_UINPUT_TOUCHSCREEN */
#endif /* CONFIG_UINPUT_TOUCH */
/****************************************************************************
* Name: uinput_button_initialize

2
include/nuttx/input/uinput.h
View File

@ -46,7 +46,7 @@
*
****************************************************************************/
#ifdef CONFIG_UINPUT_TOUCHSCREEN
#ifdef CONFIG_UINPUT_TOUCH
int uinput_touch_initialize(FAR const char *name, int maxpoint,
int buffnums);
#endif