From dd0baaee91243f259fc14e058ab101a5ed277770 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 3 Nov 2018 16:29:24 -0400
Subject: [PATCH] delete IOCTL SENSORIOCSQUEUEDEPTH
- only used in test routines
---
src/drivers/barometer/bmp280/bmp280.cpp | 29 ----------
src/drivers/barometer/lps25h/lps25h.cpp | 27 ----------
src/drivers/barometer/mpl3115a2/mpl3115a2.cpp | 27 ----------
src/drivers/barometer/ms5611/ms5611.cpp | 27 ----------
src/drivers/drv_sensor.h | 8 ---
src/drivers/imu/adis16448/adis16448.cpp | 54 -------------------
src/drivers/imu/bma180/bma180.cpp | 18 -------
src/drivers/imu/bmi055/BMI055_accel.cpp | 18 -------
src/drivers/imu/bmi055/BMI055_gyro.cpp | 18 -------
src/drivers/imu/bmi160/bmi160.cpp | 36 -------------
src/drivers/imu/fxas21002c/fxas21002c.cpp | 18 -------
src/drivers/imu/fxos8701cq/fxos8701cq.cpp | 36 -------------
src/drivers/imu/l3gd20/l3gd20.cpp | 18 -------
src/drivers/imu/lsm303d/lsm303d.cpp | 36 -------------
src/drivers/imu/mpu6000/mpu6000.cpp | 36 -------------
src/drivers/imu/mpu9250/mag.cpp | 18 -------
src/drivers/imu/mpu9250/mpu9250.cpp | 36 -------------
src/drivers/magnetometer/bmm150/bmm150.cpp | 18 -------
src/drivers/magnetometer/hmc5883/hmc5883.cpp | 28 ----------
src/drivers/magnetometer/ist8310/ist8310.cpp | 28 ----------
src/drivers/magnetometer/lis3mdl/lis3mdl.cpp | 18 -------
.../magnetometer/lis3mdl/lis3mdl_main.cpp | 6 ---
src/drivers/magnetometer/rm3100/rm3100.cpp | 18 -------
.../magnetometer/rm3100/rm3100_main.cpp | 12 -----
src/drivers/pwm_input/pwm_input.cpp | 18 -------
src/drivers/px4flow/px4flow.cpp | 18 -------
src/modules/simulator/accelsim/accelsim.cpp | 26 ---------
.../simulator/airspeedsim/airspeedsim.cpp | 17 ------
src/modules/simulator/gyrosim/gyrosim.cpp | 26 ---------
src/modules/uavcan/sensors/baro.cpp | 18 -------
src/modules/uavcan/sensors/mag.cpp | 3 --
31 files changed, 714 deletions(-)
diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index 94e627de87..fb7c10650f 100644
--- a/src/drivers/barometer/bmp280/bmp280.cpp
+++ b/src/drivers/barometer/bmp280/bmp280.cpp
@@ -372,23 +372,6 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg)
break;
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
- return OK;
- }
-
case SENSORIOCRESET:
/*
* Since we are initialized, we do not need to do anything, since the
@@ -723,18 +706,6 @@ test(enum BMP280_BUS busid)
print_message(report);
- /* set the queue depth to 10 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- PX4_ERR("failed to set queue depth");
- exit(1);
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- PX4_ERR("failed to set 2Hz poll rate");
- exit(1);
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/barometer/lps25h/lps25h.cpp b/src/drivers/barometer/lps25h/lps25h.cpp
index e51a361945..b6a9af0dfe 100644
--- a/src/drivers/barometer/lps25h/lps25h.cpp
+++ b/src/drivers/barometer/lps25h/lps25h.cpp
@@ -487,23 +487,6 @@ LPS25H::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
- return OK;
- }
-
case SENSORIOCRESET:
return reset();
@@ -896,16 +879,6 @@ test(enum LPS25H_BUS busid)
print_message(report);
- /* set the queue depth to 10 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- errx(1, "failed to set queue depth");
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- errx(1, "failed to set 2Hz poll rate");
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
index 635c68f2c4..f454bef45d 100644
--- a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
+++ b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
@@ -438,23 +438,6 @@ MPL3115A2::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
- return OK;
- }
-
case SENSORIOCRESET: {
/*
* Since we are initialized, we do not need to do anything, since the
@@ -827,16 +810,6 @@ test(enum MPL3115A2_BUS busid)
print_message(report);
- /* set the queue depth to 10 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- errx(1, "failed to set queue depth");
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- errx(1, "failed to set 2Hz poll rate");
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/barometer/ms5611/ms5611.cpp b/src/drivers/barometer/ms5611/ms5611.cpp
index 1995d5a027..3890c859ee 100644
--- a/src/drivers/barometer/ms5611/ms5611.cpp
+++ b/src/drivers/barometer/ms5611/ms5611.cpp
@@ -513,23 +513,6 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
- return OK;
- }
-
case SENSORIOCRESET:
/*
* Since we are initialized, we do not need to do anything, since the
@@ -1030,16 +1013,6 @@ test(enum MS5611_BUS busid)
print_message(report);
- /* set the queue depth to 10 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- errx(1, "failed to set queue depth");
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- errx(1, "failed to set 2Hz poll rate");
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h
index 29b315bc0a..d77a279dd6 100644
--- a/src/drivers/drv_sensor.h
+++ b/src/drivers/drv_sensor.h
@@ -128,14 +128,6 @@
#define SENSOR_POLLRATE_DEFAULT 1000003 /**< poll at driver normal rate */
-/**
- * Set the internal queue depth to (arg) entries, must be at least 1
- *
- * This sets the upper bound on the number of readings that can be
- * read from the driver.
- */
-#define SENSORIOCSQUEUEDEPTH _SENSORIOC(2)
-
/**
* Reset the sensor to its default configuration
*/
diff --git a/src/drivers/imu/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp
index a6275ffc65..6bdb1d4b9b 100644
--- a/src/drivers/imu/adis16448/adis16448.cpp
+++ b/src/drivers/imu/adis16448/adis16448.cpp
@@ -1034,24 +1034,6 @@ ADIS16448::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -1082,24 +1064,6 @@ ADIS16448::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_gyro_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
@@ -1121,24 +1085,6 @@ ADIS16448::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_mag_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case MAGIOCSSCALE:
/* copy scale in */
memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale));
diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
index 6c2815eb80..77f773a519 100644
--- a/src/drivers/imu/bma180/bma180.cpp
+++ b/src/drivers/imu/bma180/bma180.cpp
@@ -437,24 +437,6 @@ BMA180::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 2) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
/* XXX implement */
return -EINVAL;
diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp
index c1427d7cf2..f97d0e8735 100644
--- a/src/drivers/imu/bmi055/BMI055_accel.cpp
+++ b/src/drivers/imu/bmi055/BMI055_accel.cpp
@@ -381,24 +381,6 @@ BMI055_accel::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
diff --git a/src/drivers/imu/bmi055/BMI055_gyro.cpp b/src/drivers/imu/bmi055/BMI055_gyro.cpp
index 5c0e2ade84..793726479e 100644
--- a/src/drivers/imu/bmi055/BMI055_gyro.cpp
+++ b/src/drivers/imu/bmi055/BMI055_gyro.cpp
@@ -365,24 +365,6 @@ BMI055_gyro::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_gyro_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
diff --git a/src/drivers/imu/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp
index 785071813d..62d3778794 100644
--- a/src/drivers/imu/bmi160/bmi160.cpp
+++ b/src/drivers/imu/bmi160/bmi160.cpp
@@ -617,24 +617,6 @@ BMI160::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -665,24 +647,6 @@ BMI160::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_gyro_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp
index 4c2f6d76d8..d3f9bbfb25 100644
--- a/src/drivers/imu/fxas21002c/fxas21002c.cpp
+++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp
@@ -698,24 +698,6 @@ FXAS21002C::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index 664569832e..b9f5580629 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -844,24 +844,6 @@ FXOS8701CQ::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
@@ -931,24 +913,6 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_mag_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
diff --git a/src/drivers/imu/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp
index 163a15528d..6498588a92 100644
--- a/src/drivers/imu/l3gd20/l3gd20.cpp
+++ b/src/drivers/imu/l3gd20/l3gd20.cpp
@@ -622,24 +622,6 @@ L3GD20::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
diff --git a/src/drivers/imu/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp
index 411fc3ba15..98718e2214 100644
--- a/src/drivers/imu/lsm303d/lsm303d.cpp
+++ b/src/drivers/imu/lsm303d/lsm303d.cpp
@@ -856,24 +856,6 @@ LSM303D::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
@@ -942,24 +924,6 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_mag_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
reset();
return OK;
diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp
index 265592ccf8..58d027c2f9 100644
--- a/src/drivers/imu/mpu6000/mpu6000.cpp
+++ b/src/drivers/imu/mpu6000/mpu6000.cpp
@@ -1325,24 +1325,6 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -1373,24 +1355,6 @@ MPU6000::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_gyro_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
diff --git a/src/drivers/imu/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp
index 31aac0a7f1..8e08c9dcae 100644
--- a/src/drivers/imu/mpu9250/mag.cpp
+++ b/src/drivers/imu/mpu9250/mag.cpp
@@ -317,24 +317,6 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_mag_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case MAGIOCSSCALE:
/* copy scale in */
memcpy(&_mag_scale, (struct mag_scale *) arg, sizeof(_mag_scale));
diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp
index f93d37c3f3..25b88c015a 100644
--- a/src/drivers/imu/mpu9250/mpu9250.cpp
+++ b/src/drivers/imu/mpu9250/mpu9250.cpp
@@ -791,24 +791,6 @@ MPU9250::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_accel_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -839,24 +821,6 @@ MPU9250::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_gyro_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
diff --git a/src/drivers/magnetometer/bmm150/bmm150.cpp b/src/drivers/magnetometer/bmm150/bmm150.cpp
index 464f28749f..cc7d5fe2ca 100644
--- a/src/drivers/magnetometer/bmm150/bmm150.cpp
+++ b/src/drivers/magnetometer/bmm150/bmm150.cpp
@@ -759,24 +759,6 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
return reset();
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883.cpp b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
index 7e226f0793..3b6e5131b5 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
@@ -662,24 +662,6 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
return reset();
@@ -1548,16 +1530,6 @@ test(enum HMC5883_BUS busid)
warnx("device active: %s", ret ? "external" : "onboard");
- /* set the queue depth to 5 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- errx(1, "failed to set queue depth");
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- errx(1, "failed to set 2Hz poll rate");
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/magnetometer/ist8310/ist8310.cpp b/src/drivers/magnetometer/ist8310/ist8310.cpp
index b055c27b33..3dc16aef1d 100644
--- a/src/drivers/magnetometer/ist8310/ist8310.cpp
+++ b/src/drivers/magnetometer/ist8310/ist8310.cpp
@@ -642,24 +642,6 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
return reset();
@@ -1329,16 +1311,6 @@ test(enum IST8310_BUS busid)
errx(1, "failed to get if mag is onboard or external");
}
- /* set the queue depth to 5 */
- if (OK != ioctl(fd, SENSORIOCSQUEUEDEPTH, 10)) {
- errx(1, "failed to set queue depth");
- }
-
- /* start the sensor polling at 2Hz */
- if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
- errx(1, "failed to set 2Hz poll rate");
- }
-
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
struct pollfd fds;
diff --git a/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp b/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp
index 4d4bf21bdc..6935ddfe21 100644
--- a/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp
+++ b/src/drivers/magnetometer/lis3mdl/lis3mdl.cpp
@@ -557,24 +557,6 @@ LIS3MDL::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return PX4_OK;
- }
-
case SENSORIOCRESET:
return reset();
diff --git a/src/drivers/magnetometer/lis3mdl/lis3mdl_main.cpp b/src/drivers/magnetometer/lis3mdl/lis3mdl_main.cpp
index b961aa7fc9..8b2bd1e2bf 100644
--- a/src/drivers/magnetometer/lis3mdl/lis3mdl_main.cpp
+++ b/src/drivers/magnetometer/lis3mdl/lis3mdl_main.cpp
@@ -190,12 +190,6 @@ lis3mdl::test(struct lis3mdl_bus_option &bus)
return PX4_ERROR;
}
- /* set the queue depth to 5 */
- if (ioctl(fd, SENSORIOCSQUEUEDEPTH, 10) != OK) {
- PX4_WARN("failed to set queue depth");
- return PX4_ERROR;
- }
-
/* start the sensor polling at 2Hz */
if (ioctl(fd, SENSORIOCSPOLLRATE, 2) != OK) {
PX4_WARN("failed to set 2Hz poll rate");
diff --git a/src/drivers/magnetometer/rm3100/rm3100.cpp b/src/drivers/magnetometer/rm3100/rm3100.cpp
index b932705e3a..a95156415c 100644
--- a/src/drivers/magnetometer/rm3100/rm3100.cpp
+++ b/src/drivers/magnetometer/rm3100/rm3100.cpp
@@ -418,24 +418,6 @@ RM3100::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return PX4_OK;
- }
-
case SENSORIOCRESET:
return reset();
diff --git a/src/drivers/magnetometer/rm3100/rm3100_main.cpp b/src/drivers/magnetometer/rm3100/rm3100_main.cpp
index 90916d548b..ddeabbadaf 100644
--- a/src/drivers/magnetometer/rm3100/rm3100_main.cpp
+++ b/src/drivers/magnetometer/rm3100/rm3100_main.cpp
@@ -182,18 +182,6 @@ rm3100::test(RM3100_BUS bus_id)
return 1;
}
- /* set the queue depth to 5 */
- if (ioctl(fd, SENSORIOCSQUEUEDEPTH, 10) != OK) {
- PX4_WARN("failed to set queue depth");
- return 1;
- }
-
- /* start the sensor polling at 2Hz */
- if (ioctl(fd, SENSORIOCSPOLLRATE, 2) != OK) {
- PX4_WARN("failed to set 2Hz poll rate");
- return 1;
- }
-
struct pollfd fds;
/* read the sensor 5x and report each value */
diff --git a/src/drivers/pwm_input/pwm_input.cpp b/src/drivers/pwm_input/pwm_input.cpp
index 953689a822..1fd655a4ca 100644
--- a/src/drivers/pwm_input/pwm_input.cpp
+++ b/src/drivers/pwm_input/pwm_input.cpp
@@ -437,24 +437,6 @@ int
PWMIN::ioctl(struct file *filp, int cmd, unsigned long arg)
{
switch (cmd) {
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 500)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
/* user has asked for the timer to be reset. This may
* be needed if the pin was used for a different
diff --git a/src/drivers/px4flow/px4flow.cpp b/src/drivers/px4flow/px4flow.cpp
index 1a2a5295d6..fe81a32b16 100644
--- a/src/drivers/px4flow/px4flow.cpp
+++ b/src/drivers/px4flow/px4flow.cpp
@@ -381,24 +381,6 @@ PX4FLOW::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports->resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp
index a036594c2a..b412ecc653 100644
--- a/src/modules/simulator/accelsim/accelsim.cpp
+++ b/src/modules/simulator/accelsim/accelsim.cpp
@@ -532,19 +532,6 @@ ACCELSIM::devIOCTL(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((ul_arg < 1) || (ul_arg > 100)) {
- return -EINVAL;
- }
-
- if (!_accel_reports->resize(ul_arg)) {
- return -ENOMEM;
- }
-
- return OK;
- }
-
case SENSORIOCRESET:
// Nothing to do for simulator
return OK;
@@ -612,19 +599,6 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- if (!_mag_reports->resize(arg)) {
- return -ENOMEM;
- }
-
- return OK;
- }
-
case SENSORIOCRESET:
// Nothing to do for simulator
return OK;
diff --git a/src/modules/simulator/airspeedsim/airspeedsim.cpp b/src/modules/simulator/airspeedsim/airspeedsim.cpp
index 3c191d0a73..ae4c616b36 100644
--- a/src/modules/simulator/airspeedsim/airspeedsim.cpp
+++ b/src/modules/simulator/airspeedsim/airspeedsim.cpp
@@ -216,23 +216,6 @@ AirspeedSim::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- //irqstate_t flags = px4_enter_critical_section();
- if (!_reports->resize(arg)) {
- //px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- //px4_leave_critical_section(flags);
-
- return OK;
- }
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp
index 922e607bb3..63b2e7be9b 100644
--- a/src/modules/simulator/gyrosim/gyrosim.cpp
+++ b/src/modules/simulator/gyrosim/gyrosim.cpp
@@ -667,19 +667,6 @@ GYROSIM::devIOCTL(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- if (!_accel_reports->resize(arg)) {
- return -ENOMEM;
- }
-
- return OK;
- }
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -710,19 +697,6 @@ GYROSIM::gyro_ioctl(unsigned long cmd, unsigned long arg)
case SENSORIOCRESET:
return devIOCTL(cmd, arg);
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- if (!_gyro_reports->resize(arg)) {
- return -ENOMEM;
- }
-
- return OK;
- }
-
case GYROIOCSSCALE:
/* copy scale in */
memcpy(&_gyro_scale, (struct gyro_calibration_s *) arg, sizeof(_gyro_scale));
diff --git a/src/modules/uavcan/sensors/baro.cpp b/src/modules/uavcan/sensors/baro.cpp
index 79c812d63c..559cc091aa 100644
--- a/src/modules/uavcan/sensors/baro.cpp
+++ b/src/modules/uavcan/sensors/baro.cpp
@@ -103,24 +103,6 @@ int UavcanBarometerBridge::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case SENSORIOCSQUEUEDEPTH: {
- /* lower bound is mandatory, upper bound is a sanity check */
- if ((arg < 1) || (arg > 100)) {
- return -EINVAL;
- }
-
- irqstate_t flags = px4_enter_critical_section();
-
- if (!_reports.resize(arg)) {
- px4_leave_critical_section(flags);
- return -ENOMEM;
- }
-
- px4_leave_critical_section(flags);
-
- return OK;
- }
-
default: {
return CDev::ioctl(filp, cmd, arg);
}
diff --git a/src/modules/uavcan/sensors/mag.cpp b/src/modules/uavcan/sensors/mag.cpp
index 7bfd9f5e1a..4b38c80f4f 100644
--- a/src/modules/uavcan/sensors/mag.cpp
+++ b/src/modules/uavcan/sensors/mag.cpp
@@ -100,9 +100,6 @@ ssize_t UavcanMagnetometerBridge::read(struct file *filp, char *buffer, size_t b
int UavcanMagnetometerBridge::ioctl(struct file *filp, int cmd, unsigned long arg)
{
switch (cmd) {
- case SENSORIOCSQUEUEDEPTH: {
- return OK; // Pretend that this stuff is supported to keep APM happy
- }
case MAGIOCSSCALE: {
std::memcpy(&_scale, reinterpret_cast<const void *>(arg), sizeof(_scale));
--
GitLab