[incubator-nuttx] branch master updated: input/uinput: fix codesyle issue

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new ef66c62  input/uinput: fix codesyle issue
ef66c62 is described below

commit ef66c620c464b6662bf96694cad9093bdbc71211
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Mon Jan 24 12:43:13 2022 +0800

    input/uinput: fix codesyle issue
    
    Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
 drivers/input/uinput.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/drivers/input/uinput.c b/drivers/input/uinput.c
index f78d780..cc4ab5c 100644
--- a/drivers/input/uinput.c
+++ b/drivers/input/uinput.c
@@ -21,8 +21,6 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
-#include <assert.h>
-#include <debug.h>
 #include <errno.h>
 #include <stdio.h>
 
@@ -89,8 +87,8 @@ static ssize_t uinput_touch_write(FAR struct touch_lowerhalf_s *lower,
                                   FAR const char *buffer, size_t buflen)
 {
   FAR const struct touch_sample_s *sample;
-  sample = (FAR const struct touch_sample_s *)buffer;
 
+  sample = (FAR const struct touch_sample_s *)buffer;
   if (sample == NULL)
     {
       return -EINVAL;
@@ -107,6 +105,10 @@ static ssize_t uinput_touch_write(FAR struct touch_lowerhalf_s *lower,
  * Name: uinput_button_write
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: uinput_button_write
+ ****************************************************************************/
+
 static ssize_t uinput_button_write(FAR const struct btn_lowerhalf_s *lower,
                                    FAR const char *buffer, size_t buflen)
 {
@@ -143,9 +145,14 @@ uinput_button_buttons(FAR const struct btn_lowerhalf_s *lower)
 {
   FAR struct uinput_button_lowerhalf_s *ubtn_lower =
              (FAR struct uinput_button_lowerhalf_s *)lower;
+
   return ubtn_lower->buttons;
 }
 
+/****************************************************************************
+ * Name: uinput_button_enable
+ ****************************************************************************/
+
 static void uinput_button_enable(FAR const struct btn_lowerhalf_s *lower,
                                  btn_buttonset_t press,
                                  btn_buttonset_t release,
@@ -153,6 +160,7 @@ static void uinput_button_enable(FAR const struct btn_lowerhalf_s *lower,
 {
   FAR struct uinput_button_lowerhalf_s *ubtn_lower =
     (FAR struct uinput_button_lowerhalf_s *)lower;
+
   ubtn_lower->arg     = arg;
   ubtn_lower->handler = handler;
 }
@@ -180,12 +188,14 @@ static void uinput_button_enable(FAR const struct btn_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
+#ifdef CONFIG_INPUT_TOUCHSCREEN
 int uinput_touch_initialize(FAR const char *name, int maxpoint, int buffnums)
 {
   char devname[UINPUT_NAME_SIZE];
   FAR struct touch_lowerhalf_s *lower;
+  int ret;
 
-  lower = kmm_malloc(sizeof(struct touch_lowerhalf_s));
+  lower = kmm_zalloc(sizeof(struct touch_lowerhalf_s));
   if (!lower)
     {
       return -ENOMEM;
@@ -195,16 +205,39 @@ int uinput_touch_initialize(FAR const char *name, int maxpoint, int buffnums)
 
   lower->write    = uinput_touch_write;
   lower->maxpoint = maxpoint;
+
   snprintf(devname, UINPUT_NAME_SIZE, "/dev/%s", name);
+  ret = touch_register(lower, devname, buffnums);
+  if (ret < 0)
+    {
+      kmm_free(lower);
+    }
 
-  return touch_register(lower, devname, buffnums);
+  return ret;
 }
+#endif
+
+/****************************************************************************
+ * Name: uinput_button_initialize
+ *
+ * Description:
+ *   Initialized the uinput button device
+ *
+ * Input Parameters:
+ *   name:      Button devices name
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is
+ *   returned to indicate the nature of the failure.
+ *
+ ****************************************************************************/
 
 #ifdef CONFIG_INPUT_BUTTONS
 int uinput_button_initialize(FAR const char *name)
 {
   char devname[UINPUT_NAME_SIZE];
   FAR struct uinput_button_lowerhalf_s *ubtn_lower;
+  int ret;
 
   ubtn_lower = kmm_zalloc(sizeof(struct uinput_button_lowerhalf_s));
   ubtn_lower->lower.bl_buttons   = uinput_button_buttons;
@@ -213,6 +246,12 @@ int uinput_button_initialize(FAR const char *name)
   ubtn_lower->lower.bl_write     = uinput_button_write;
 
   snprintf(devname, UINPUT_NAME_SIZE, "/dev/%s", name);
-  return btn_register(devname, &ubtn_lower->lower);
+  ret = btn_register(devname, &ubtn_lower->lower);
+  if (ret < 0)
+    {
+      kmm_free(ubtn_lower);
+    }
+
+  return ret;
 }
 #endif /* CONFIG_INPUT_BUTTONS */