You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/21 07:03:19 UTC
[incubator-nuttx] 02/07: input: Move uinput initialization from boards/sim to drivers
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 d19aa5aca4a594199a49d6798723824e64471cd0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 19 23:37:11 2022 +0800
input: Move uinput initialization from boards/sim to drivers
since uinput can be used not only on simulator but also on real device
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/sim/sim/sim/src/sim_bringup.c | 17 -----------------
drivers/drivers_initialize.c | 9 +++++++++
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index 848969b..c6404ee 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -36,7 +36,6 @@
#include <nuttx/fs/nxffs.h>
#include <nuttx/fs/rpmsgfs.h>
#include <nuttx/i2c/i2c_master.h>
-#include <nuttx/input/uinput.h>
#include <nuttx/spi/spi_transfer.h>
#include <nuttx/rc/lirc_dev.h>
#include <nuttx/rc/dummy.h>
@@ -319,22 +318,6 @@ int sim_bringup(void)
}
#endif
-#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_TOUCH */
-
-#ifdef CONFIG_UINPUT_BUTTONS
- ret = uinput_button_initialize("ubutton");
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: uinput_button_initialize failed: %d\n", ret);
- }
-#endif /* CONFIG_UINPUT_BUTTONS */
-
#ifdef CONFIG_IEEE802154_LOOPBACK
/* Initialize and register the IEEE802.15.4 MAC network loop device */
diff --git a/drivers/drivers_initialize.c b/drivers/drivers_initialize.c
index 755af2f..ae1ad73 100644
--- a/drivers/drivers_initialize.c
+++ b/drivers/drivers_initialize.c
@@ -25,6 +25,7 @@
#include <nuttx/crypto/crypto.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
+#include <nuttx/input/uinput.h>
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
@@ -119,6 +120,14 @@ void drivers_initialize(void)
devcrypto_register();
#endif
+#ifdef CONFIG_UINPUT_TOUCH
+ uinput_touch_initialize("utouch", 1, 4);
+#endif
+
+#ifdef CONFIG_UINPUT_BUTTONS
+ uinput_button_initialize("ubutton");
+#endif
+
#ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */