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/02/27 21:19:30 UTC
[incubator-nuttx] branch master updated (fa761a8 -> f42b56b)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from fa761a8 sched/timer: remove unused variable
new 63c911f input/button: Remove the couple from uinput
new f42b56b input/touch: Remove the couple from uinput
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
drivers/input/button_upper.c | 14 ++------------
drivers/input/touchscreen_upper.c | 13 ++-----------
2 files changed, 4 insertions(+), 23 deletions(-)
[incubator-nuttx] 02/02: input/touch: Remove the couple from uinput
Posted by pk...@apache.org.
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 f42b56b1c4b0881becd338633f276697ed20a6ca
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Feb 26 23:05:03 2022 +0800
input/touch: Remove the couple from uinput
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/input/touchscreen_upper.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/input/touchscreen_upper.c b/drivers/input/touchscreen_upper.c
index 683fbe7..9a510a7 100644
--- a/drivers/input/touchscreen_upper.c
+++ b/drivers/input/touchscreen_upper.c
@@ -76,16 +76,13 @@ static int touch_open(FAR struct file *filep);
static int touch_close(FAR struct file *filep);
static ssize_t touch_read(FAR struct file *filep, FAR char *buffer,
size_t buflen);
+static ssize_t touch_write(FAR struct file *filep, FAR const char *buffer,
+ size_t buflen);
static int touch_ioctl(FAR struct file *filep, int cmd,
unsigned long arg);
static int touch_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);
-#ifdef CONFIG_INPUT_UINPUT
-static ssize_t touch_write(FAR struct file *filep, FAR const char *buffer,
- size_t buflen);
-#endif
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -95,11 +92,7 @@ static const struct file_operations g_touch_fops =
touch_open, /* open */
touch_close, /* close */
touch_read, /* read */
-#ifdef CONFIG_INPUT_UINPUT
touch_write, /* write */
-#else
- NULL, /* write */
-#endif
NULL, /* seek */
touch_ioctl, /* ioctl */
touch_poll /* poll */
@@ -210,7 +203,6 @@ static int touch_close(FAR struct file *filep)
* Name: touch_write
****************************************************************************/
-#ifdef CONFIG_INPUT_UINPUT
static ssize_t touch_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen)
{
@@ -225,7 +217,6 @@ static ssize_t touch_write(FAR struct file *filep, FAR const char *buffer,
return lower->write(lower, buffer, buflen);
}
-#endif
/****************************************************************************
* Name: touch_read
[incubator-nuttx] 01/02: input/button: Remove the couple from uinput
Posted by pk...@apache.org.
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 63c911fb56495f91125ed2cea30db61c75fccf86
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Feb 26 23:06:45 2022 +0800
input/button: Remove the couple from uinput
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/input/button_upper.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index b6899be..2493724 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -124,16 +124,13 @@ static int btn_open(FAR struct file *filep);
static int btn_close(FAR struct file *filep);
static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
size_t buflen);
+static ssize_t btn_write(FAR struct file *filep, FAR const char *buffer,
+ size_t buflen);
static int btn_ioctl(FAR struct file *filep, int cmd,
unsigned long arg);
static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);
-#ifdef CONFIG_INPUT_UINPUT
-static ssize_t btn_write(FAR struct file *filep, FAR const char *buffer,
- size_t buflen);
-#endif
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -143,11 +140,7 @@ static const struct file_operations btn_fops =
btn_open, /* open */
btn_close, /* close */
btn_read, /* read */
-#ifdef CONFIG_INPUT_UINPUT
btn_write, /* write */
-#else
- NULL, /* write */
-#endif
NULL, /* seek */
btn_ioctl, /* ioctl */
btn_poll /* poll */
@@ -544,8 +537,6 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
* Name: btn_write
****************************************************************************/
-#ifdef CONFIG_INPUT_UINPUT
-
static ssize_t btn_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen)
{
@@ -596,7 +587,6 @@ static ssize_t btn_write(FAR struct file *filep, FAR const char *buffer,
btn_givesem(&priv->bu_exclsem);
return (ssize_t)ret;
}
-#endif
/****************************************************************************
* Name: btn_ioctl