diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index 94e627de87eaae20ba66381e1f10d587b541704b..fb7c10650f9343261f8af50d0112ada35ea810b3 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 e51a361945983c360cb0caebc79144639ac00b08..b6a9af0dfe0d544dbe1dc79a10b46327a83d8dc6 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 635c68f2c47a5092cfb488c2751e8be434f350b5..f454bef45d847a19c0edd3b239692b9d1661194a 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 1995d5a0276a75059af1db2b6c4f179797ec991b..3890c859ee8e68b079956ab92ff4754a0f422e27 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 29b315bc0a6373caeaaf5c3338564687c2fe4c60..d77a279dd6dc00fc7aad78a89b309f6d507c2ca1 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 a6275ffc6592d3e9f2586d0ddf9e0393d00a20b6..6bdb1d4b9b0c6a0e38cea81a8f3e6c406cdb223d 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 6c2815eb80617f4aad1576fd308c1e99c82faa5e..77f773a519c0d63b4b75377f681f7c9a293e22ea 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 c1427d7cf2755c0bd51d15b352b96b10bcbef912..f97d0e8735afee38dc105a07036366498874f002 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 5c0e2ade84efe626da7448c55ad014c6bad3c9b6..793726479efef99d5ddd08e030e5b0c7503a2dc0 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 785071813d6dc8308fad65c0b198470db748d0db..62d37787941689f9b186e324c49170320a9c84df 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 4c2f6d76d83e0fc01e3c9f1d9be43574af95f82a..d3f9bbfb2579db0af06c88ff40367579a2212828 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 664569832ebc803cb5b9c83668d990903291c288..b9f558062958c382cfd8ef530ecc1d8ca7d45d86 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 163a15528dbab8783c2f1e8fc432bd1561032022..6498588a9204bb2f78ba93d7411b3df14da08f32 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 411fc3ba15d896b1de2142a8fda0601ecf8140bf..98718e2214d078aec641bf862e01c86bcdd4cdb4 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 265592ccf8fb54727a43fff2db02e8dd02c44456..58d027c2f94dce5ffb036707f759e14d1c5afecb 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 31aac0a7f19eab50f900d0453770ebeffe7fefbf..8e08c9dcaeb1e7acb4150a4b9778a27b3eaff893 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 f93d37c3f3c850f7bb52da2ae109c4a37b041041..25b88c015adf3811a4df100a05562868a3d3c4eb 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 464f28749f31be6f1ef875816a2192ab14889607..cc7d5fe2ca855fae7106a1c14aa53b0cca70c0bb 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 7e226f0793750707434f3153f64b844ea62721f6..3b6e5131b50227e114d70674f4a4b2c2d59911f5 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 b055c27b33a5af4fd08f7b98984b555886e94598..3dc16aef1df788d9daebbd9eab597316abda650b 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 4d4bf21bdc0975f28ee7408509a44201b29fec8c..6935ddfe21f5c33c0c4df32eaedbee9e922abaf9 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 b961aa7fc9443992b465c80c9d5831f55d704e38..8b2bd1e2bf3d0f0c9577932f8e29cf6f4b53e1e8 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 b932705e3ac947db0487e07a491676fbdd3d6a33..a95156415c3c6372a16e3d07a1e504afa7520cf7 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 90916d548be348d41c7b039cc9e6bd02f07ba65c..ddeabbadaf14a512a5f17f5c87796a6e08b11156 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 953689a822a4277852813b9be2aafd7a06e06df6..1fd655a4cafb6113cbb9c4c357c22a9460143c70 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 1a2a5295d65fb41e222426b5f2abfe09db0a14d3..fe81a32b16e3061a278b036e50ab48209603b508 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 a036594c2a60b6a8cc7fc393566cadadcf651768..b412ecc6536957d75bd5f92e3f93f33755831c38 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 3c191d0a7350bc1a2071eecf0c353476ac84db0a..ae4c616b36d4bfeaf4413b05b868520d2dc5f656 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 922e607bb3114c1e6f691917b0f24cc7fca75b4a..63b2e7be9b752846a06934cf86692d3c5278ee38 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 79c812d63c9e398114fcf016de31803b7ee917b5..559cc091aacb229b83baf6c5117776dc3ac8adf3 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 7bfd9f5e1a264c88872f49285564a9d088b3a32a..4b38c80f4fda5da1c733e7f2276c614f4360df0f 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));