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/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new c904b16cd9 Rename touchscreen ioctls for clarity
c904b16cd9 is described below

commit c904b16cd9e07357f1f621aa098c7db42a7256df
Author: TimJTi <[email protected]>
AuthorDate: Fri May 26 11:40:54 2023 +0100

    Rename touchscreen ioctls for clarity
---
 drivers/input/tsc2007.c           | 4 ++--
 include/nuttx/input/touchscreen.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 6a4c89fc20..6f72af4a74 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -1026,7 +1026,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, 
unsigned long arg)
 
   switch (cmd)
     {
-      case TSIOC_SETCALIB:  /* arg: Pointer to int calibration value */
+      case TSIOC_SETXRCAL:  /* arg: Pointer to int calibration value */
         {
           FAR int *ptr = (FAR int *)((uintptr_t)arg);
           DEBUGASSERT(priv->config != NULL && ptr != NULL);
@@ -1034,7 +1034,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, 
unsigned long arg)
         }
         break;
 
-      case TSIOC_GETCALIB:  /* arg: Pointer to int calibration value */
+      case TSIOC_GETXRCAL:  /* arg: Pointer to int calibration value */
         {
           FAR int *ptr = (FAR int *)((uintptr_t)arg);
           DEBUGASSERT(priv->config != NULL && ptr != NULL);
diff --git a/include/nuttx/input/touchscreen.h 
b/include/nuttx/input/touchscreen.h
index 64315bad71..a14e5850eb 100644
--- a/include/nuttx/input/touchscreen.h
+++ b/include/nuttx/input/touchscreen.h
@@ -50,10 +50,10 @@
 
 /* Common TSC IOCTL commands */
 
-#define TSIOC_SETCALIB       _TSIOC(0x0001) /* arg: Pointer to
+#define TSIOC_SETXRCAL       _TSIOC(0x0001) /* arg: Pointer to
                                              * int Xplate R calibration value
                                              */
-#define TSIOC_GETCALIB       _TSIOC(0x0002) /* arg: Pointer to
+#define TSIOC_GETXRCAL       _TSIOC(0x0002) /* arg: Pointer to
                                              * int Xplate R calibration value
                                              */
 #define TSIOC_SETFREQUENCY   _TSIOC(0x0003) /* arg: Pointer to

Reply via email to