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/07/20 11:56:51 UTC

[incubator-nuttx] branch master updated: include/sensors/ioctl: remove duplication ioctl cmd

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


The following commit(s) were added to refs/heads/master by this push:
     new 43f0555bfb include/sensors/ioctl: remove duplication ioctl cmd
43f0555bfb is described below

commit 43f0555bfbdf5fa8eac1f5b59ed0c7f70d22aa97
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Wed Jul 20 07:20:19 2022 +0000

    include/sensors/ioctl: remove duplication ioctl cmd
    
    Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
 include/nuttx/sensors/ioctl.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/nuttx/sensors/ioctl.h b/include/nuttx/sensors/ioctl.h
index 5e661f3aa2..3f205469f8 100644
--- a/include/nuttx/sensors/ioctl.h
+++ b/include/nuttx/sensors/ioctl.h
@@ -94,7 +94,6 @@
 
 /* IOCTL commands unique to the MS58XX */
 
-#define SNIOC_MEASURE              _SNIOC(0x0025) /* Arg: None */
 #define SNIOC_TEMPERATURE          _SNIOC(0x0026) /* Arg: int32_t* pointer */
 #define SNIOC_PRESSURE             _SNIOC(0x0027) /* Arg: int32_t* pointer */
 #define SNIOC_RESET                _SNIOC(0x0028) /* Arg: None */
@@ -147,17 +146,15 @@
 
 /* IOCTL commands unique to the LSM6DSL */
 
-#define SNIOC_START                _SNIOC(0x0042) /* Arg: None */
-#define SNIOC_STOP                 _SNIOC(0x0043) /* Arg: None */
 #define SNIOC_LSM6DSLSENSORREAD    _SNIOC(0x0046) /* Arg: file *filep, FAR char *buffer,size_t buflen */
-#define SNIOC_START_SELFTEST       _SNIOC(0x0047) /* Arg: file *filep, FAR char *buffer,size_t mode */
+
+/* SNIOC_START_SELFTEST */                        /* Arg: file *filep, FAR char *buffer,size_t mode */
 
 /* IOCTL commands unique to the LSM303AGR */
 
-#define SNIOC_START                _SNIOC(0x0049) /* Arg: None */
-#define SNIOC_STOP                 _SNIOC(0x0050) /* Arg: None */
 #define SNIOC_LSM303AGRSENSORREAD  _SNIOC(0x0051) /* Arg: file *filep, FAR char *buffer,size_t buflen */
-#define SNIOC_START_SELFTEST       _SNIOC(0x0052) /* Arg: file *filep, FAR char *buffer,size_t mode */
+
+/* SNIOC_START_SELFTEST */                        /* Arg: file *filep, FAR char *buffer,size_t mode */
 
 /* IOCTL commands unique to the MLX90614 */
 
@@ -172,7 +169,8 @@
 /* SNIOC_STOP */                                  /* Arg: None */
 
 /* SNIOC_READ_CONVERT_DATA */                     /* Arg: struct scd30_conv_data_s* */
-#define SNIOC_SET_INTERVAL         _SNIOC(0x0054) /* Arg: uint16_t value (seconds) */
+
+/* SNIOC_SET_INTERVAL */                          /* Arg: uint16_t value (seconds) */
 #define SNIOC_SET_TEMP_OFFSET      _SNIOC(0x0055) /* Arg: uint16_t value (0.01 Kelvin) */
 #define SNIOC_SET_PRESSURE_COMP    _SNIOC(0x0056) /* Arg: uint16_t value (mbar) */
 #define SNIOC_SET_ALTITUDE_COMP    _SNIOC(0x0057) /* Arg: uint16_t value (meters) */