From 09cee19cee8f58007af71e4cc06384d92623576c Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Fri, 20 Oct 2017 08:32:09 -0600 Subject: [PATCH] include/nuttx/sensors/ioctl: deduplicate SNIOC_CFGR --- include/nuttx/sensors/ioctl.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/include/nuttx/sensors/ioctl.h b/include/nuttx/sensors/ioctl.h index 83b2d9b701..62d33b9f52 100644 --- a/include/nuttx/sensors/ioctl.h +++ b/include/nuttx/sensors/ioctl.h @@ -115,10 +115,13 @@ #define SNIOC_RESET _SNIOC(0x0028) /* Arg: None */ #define SNIOC_OVERSAMPLING _SNIOC(0x0029) /* Arg: uint16_t value */ +/* IOCTL commands to the HTS221 & LPS25H */ + +#define SNIOC_CFGR _SNIOC(0x002a) + /* IOCTL commands unique to the HTS221 */ -#define SNIOC_GET_DEV_ID _SNIOC(0x002a) -#define SNIOC_CFGR _SNIOC(0x002b) +#define SNIOC_GET_DEV_ID _SNIOC(0x002b) #define SNIOC_START_CONVERSION _SNIOC(0x002c) #define SNIOC_CHECK_STATUS_REG _SNIOC(0x002d) #define SNIOC_READ_RAW_DATA _SNIOC(0x002e) @@ -128,19 +131,18 @@ /* IOCTL commands unique to the LPS25H */ #define SNIOC_GET_DEV_ID _SNIOC(0x0031) -#define SNIOC_CFGR _SNIOC(0x0032) -#define SNIOC_TEMPERATURE_OUT _SNIOC(0x0033) -#define SNIOC_PRESSURE_OUT _SNIOC(0x0034) -#define SNIOC_SENSOR_OFF _SNIOC(0x0035) +#define SNIOC_TEMPERATURE_OUT _SNIOC(0x0032) +#define SNIOC_PRESSURE_OUT _SNIOC(0x0033) +#define SNIOC_SENSOR_OFF _SNIOC(0x0034) /* IOCTL commands unique to the LIS2DH */ -#define SNIOC_WRITESETUP _SNIOC(0x0036) /* Arg: uint8_t value */ -#define SNIOC_WRITE_INT1THRESHOLD _SNIOC(0x0037) /* Arg: uint8_t value */ -#define SNIOC_WRITE_INT2THRESHOLD _SNIOC(0x0038) /* Arg: uint8_t value */ -#define SNIOC_RESET_HPFILTER _SNIOC(0x0039) /* Arg: uint8_t value */ -#define SNIOC_START_SELFTEST _SNIOC(0x003a) /* Arg: uint8_t value */ -#define SNIOC_WHO_AM_I _SNIOC(0x003b) -#define SNIOC_READ_TEMP _SNIOC(0x003c) /* Arg: int16_t value */ +#define SNIOC_WRITESETUP _SNIOC(0x0035) /* Arg: uint8_t value */ +#define SNIOC_WRITE_INT1THRESHOLD _SNIOC(0x0036) /* Arg: uint8_t value */ +#define SNIOC_WRITE_INT2THRESHOLD _SNIOC(0x0037) /* Arg: uint8_t value */ +#define SNIOC_RESET_HPFILTER _SNIOC(0x0038) /* Arg: uint8_t value */ +#define SNIOC_START_SELFTEST _SNIOC(0x0039) /* Arg: uint8_t value */ +#define SNIOC_WHO_AM_I _SNIOC(0x003a) +#define SNIOC_READ_TEMP _SNIOC(0x003b) /* Arg: int16_t value */ #endif /* __INCLUDE_NUTTX_SENSORS_IOCTL_H */