This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit fd5fb26f5194fefc068723a5ea7c0f88489a3969
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Sun Mar 20 00:36:35 2022 +0800
input/uinput: Rename UINPUT_TOUCHSCREEN to UINPUT_TOUCH
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
boards/sim/sim/sim/src/sim_bringup.c | 4 ++--
drivers/input/Kconfig | 6 +++---
drivers/input/uinput.c | 12 ++++++------
include/nuttx/input/uinput.h | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/boards/sim/sim/sim/src/sim_bringup.c
b/boards/sim/sim/sim/src/sim_bringup.c
index 7d41cda..848969b 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -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");
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 807ee46..d95109e 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -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"
diff --git a/drivers/input/uinput.c b/drivers/input/uinput.c
index 17bef91..2412e7f 100644
--- a/drivers/input/uinput.c
+++ b/drivers/input/uinput.c
@@ -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
diff --git a/include/nuttx/input/uinput.h b/include/nuttx/input/uinput.h
index cbbf6da..675a358 100644
--- a/include/nuttx/input/uinput.h
+++ b/include/nuttx/input/uinput.h
@@ -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
