diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index 2e79ef558cd3a452fa970949df6d77a3c82ae28b..5ff7b954d8bbdc2f8c74436afc981d17b43c5634 100644
--- a/src/drivers/barometer/bmp280/bmp280.cpp
+++ b/src/drivers/barometer/bmp280/bmp280.cpp
@@ -375,13 +375,6 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg)
break;
}
- case SENSORIOCGPOLLRATE:
- if (_report_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (USEC_PER_SEC / USEC_PER_TICK / _report_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/barometer/lps22hb/LPS22HB.cpp b/src/drivers/barometer/lps22hb/LPS22HB.cpp
index b49cefe8a7c85cfd57a905e95b8a5fe181e5439a..dc2ca2eaa9e13382c3ddc1abb8cad93124f73019 100644
--- a/src/drivers/barometer/lps22hb/LPS22HB.cpp
+++ b/src/drivers/barometer/lps22hb/LPS22HB.cpp
@@ -160,13 +160,6 @@ LPS22HB::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
return reset();
diff --git a/src/drivers/barometer/lps25h/lps25h.cpp b/src/drivers/barometer/lps25h/lps25h.cpp
index d6983f49100d5d7b792193d7a6b4968a46c0dd66..521e99ec1b85e61f008c05ba20d494805bcdb022 100644
--- a/src/drivers/barometer/lps25h/lps25h.cpp
+++ b/src/drivers/barometer/lps25h/lps25h.cpp
@@ -494,13 +494,6 @@ LPS25H::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
index e935c49531f64c582a9293ede170719fb6c8126f..655e129af3630483e2f82ecea616bfe9c8943b1f 100644
--- a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
+++ b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
@@ -445,13 +445,6 @@ MPL3115A2::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/barometer/ms5611/ms5611.cpp b/src/drivers/barometer/ms5611/ms5611.cpp
index 64f8f67cdb524489b3b51cd7e272ba67f1a124c5..4a6689d06043c03258d1cc2709700112806df4ec 100644
--- a/src/drivers/barometer/ms5611/ms5611.cpp
+++ b/src/drivers/barometer/ms5611/ms5611.cpp
@@ -520,13 +520,6 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
index b6a5522fd55cf1f329addcdd4e3272e605801af1..0f6c0665a4e37b4f13154c70e649670dbd27beb6 100644
--- a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
+++ b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
@@ -402,13 +402,6 @@ HC_SR04::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
index 6c4cf1bb970eb47e113f864e12d22378914a69f9..c8eba323a79a98da44c563647307e030fdde7002 100644
--- a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
+++ b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
@@ -133,13 +133,6 @@ int LidarLite::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
reset_sensor();
return OK;
diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
index c172a46a5dfaef24ea5a51617eb79a5e3116d650..3b049f149de9a6d0ebde96467b488f4cc0d39c4f 100644
--- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
+++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -398,13 +398,6 @@ MB12XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/sf0x/sf0x.cpp b/src/drivers/distance_sensor/sf0x/sf0x.cpp
index 75f9444927d8ed8160ce980ff931c74acc39800e..291f26ee488682fa93dea1c845b36f27a2abcf15 100644
--- a/src/drivers/distance_sensor/sf0x/sf0x.cpp
+++ b/src/drivers/distance_sensor/sf0x/sf0x.cpp
@@ -379,13 +379,6 @@ SF0X::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
index c5877cbfc606a58a18016bfb9d2d75602c0f122e..985492e3f1b34667db0039a85e73206e33e83198 100644
--- a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
+++ b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
@@ -398,13 +398,6 @@ SF1XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
index 6f8d98cb5763a0cac3bcd308e9dc51f84b848f53..ea4c45ef8a3f69d7aa4ff1baee4a9a62c506dddd 100644
--- a/src/drivers/distance_sensor/srf02/srf02.cpp
+++ b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -398,13 +398,6 @@ SRF02::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/teraranger/teraranger.cpp b/src/drivers/distance_sensor/teraranger/teraranger.cpp
index 71f09be92a2c81ce706d6c30c45b70eae5987782..ce3f1fca8f9b82709fb33429d267abd64a565d96 100644
--- a/src/drivers/distance_sensor/teraranger/teraranger.cpp
+++ b/src/drivers/distance_sensor/teraranger/teraranger.cpp
@@ -476,13 +476,6 @@ TERARANGER::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/distance_sensor/tfmini/tfmini.cpp b/src/drivers/distance_sensor/tfmini/tfmini.cpp
index c66ca3a0a0097fc0696daf0e7eb8fe8026e7cf82..06d95198a93ea83788e088f52d6882a4fdcf2481 100644
--- a/src/drivers/distance_sensor/tfmini/tfmini.cpp
+++ b/src/drivers/distance_sensor/tfmini/tfmini.cpp
@@ -416,13 +416,6 @@ TFMINI::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h
index 4d314b2a5f74601e489a043681e6626211e1b0b4..e66f8bb3b326f64b6bfcea2c0e390374c8554a9f 100644
--- a/src/drivers/drv_sensor.h
+++ b/src/drivers/drv_sensor.h
@@ -126,12 +126,6 @@
*/
#define SENSORIOCSPOLLRATE _SENSORIOC(0)
-/**
- * Return the driver's approximate polling rate in Hz, or one of the
- * SENSOR_POLLRATE values.
- */
-#define SENSORIOCGPOLLRATE _SENSORIOC(1)
-
#define SENSOR_POLLRATE_MANUAL 1000000 /**< poll when read */
#define SENSOR_POLLRATE_MAX 1000002 /**< poll at device maximum rate */
#define SENSOR_POLLRATE_DEFAULT 1000003 /**< poll at driver normal rate */
diff --git a/src/drivers/imu/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp
index d296521067a6a9c3fc6a916adb7cb5fbd21b1c4a..da1789b2907c358f90c2d85524d01e549ceb69fe 100644
--- a/src/drivers/imu/adis16448/adis16448.cpp
+++ b/src/drivers/imu/adis16448/adis16448.cpp
@@ -1043,13 +1043,6 @@ ADIS16448::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -1095,7 +1088,6 @@ ADIS16448::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
@@ -1135,7 +1127,6 @@ ADIS16448::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
diff --git a/src/drivers/imu/adis16477/ADIS16477.cpp b/src/drivers/imu/adis16477/ADIS16477.cpp
index 4ff2c0a260d2ade11e77896b91fe8aacb460eb11..2b0ce286a81415ca58d26b0db9cf1b0483e8b1ab 100644
--- a/src/drivers/imu/adis16477/ADIS16477.cpp
+++ b/src/drivers/imu/adis16477/ADIS16477.cpp
@@ -400,13 +400,6 @@ ADIS16477::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case ACCELIOCSSCALE: {
/* copy scale, but only if off by a few percent */
struct accel_calibration_s *s = (struct accel_calibration_s *) arg;
@@ -434,7 +427,6 @@ ADIS16477::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
index 5b67bcb3083469038b77683db1a6f309938d42ce..f3792af0cc03a164fb7f03ae25b05e3dca427735 100644
--- a/src/drivers/imu/bma180/bma180.cpp
+++ b/src/drivers/imu/bma180/bma180.cpp
@@ -444,13 +444,6 @@ BMA180::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 2) || (arg > 100)) {
diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp
index 884e9fbd1394f604ccbfd908f43fa0bec6fe658e..de74e9a7bcfa25bb5aa31d77cdcd8fb7a2a267eb 100644
--- a/src/drivers/imu/bmi055/BMI055_accel.cpp
+++ b/src/drivers/imu/bmi055/BMI055_accel.cpp
@@ -390,13 +390,6 @@ BMI055_accel::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/bmi055/BMI055_gyro.cpp b/src/drivers/imu/bmi055/BMI055_gyro.cpp
index 9ac471e9563197f68bd977a341e7c8e605531d9b..577e70076024a98f5482b42c5acbed1020feca30 100644
--- a/src/drivers/imu/bmi055/BMI055_gyro.cpp
+++ b/src/drivers/imu/bmi055/BMI055_gyro.cpp
@@ -374,13 +374,6 @@ BMI055_gyro::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp
index 7b1e3012d6e6f75d8579316ef1f08f9ff16c67d1..c1ab84364c8ea64be71b6833a1fc9bdf74651341 100644
--- a/src/drivers/imu/bmi160/bmi160.cpp
+++ b/src/drivers/imu/bmi160/bmi160.cpp
@@ -626,13 +626,6 @@ BMI160::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -678,7 +671,6 @@ BMI160::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp
index b7d02b5147b4b096cf39fc3b09505b9899fd1e52..4e7e6d278f8013dd7b1fcf51310c519d3fa87c97 100644
--- a/src/drivers/imu/fxas21002c/fxas21002c.cpp
+++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp
@@ -705,13 +705,6 @@ FXAS21002C::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index b9091c8de5de16d7164ccf957dac4e4d6cb71163..6af2a978fd32c75ec3a14de9e9e251f6df7f2e6e 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -853,13 +853,6 @@ FXOS8701CQ::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_accel_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_accel_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -954,13 +947,6 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_mag_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_mag_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp
index bc9a3d728abec2adc9e6525881c47eb517ba0fda..b8e88b30a0d8e812206da29dc904c29cce5ba8a0 100644
--- a/src/drivers/imu/l3gd20/l3gd20.cpp
+++ b/src/drivers/imu/l3gd20/l3gd20.cpp
@@ -629,13 +629,6 @@ L3GD20::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp
index 18f842507663953333c2f911792dfe271b2386c7..03a88b6c3e9e4860d6781ccd7aebdd65bb4fdf96 100644
--- a/src/drivers/imu/lsm303d/lsm303d.cpp
+++ b/src/drivers/imu/lsm303d/lsm303d.cpp
@@ -865,13 +865,6 @@ LSM303D::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_accel_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_accel_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -965,13 +958,6 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_mag_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_mag_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp
index e8ea9a2fc1203d3ad138f383facdbd2f2fb4eb98..6a5ec834460d74ff3539bd885a9909a281e12df2 100644
--- a/src/drivers/imu/mpu6000/mpu6000.cpp
+++ b/src/drivers/imu/mpu6000/mpu6000.cpp
@@ -1334,13 +1334,6 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -1386,7 +1379,6 @@ MPU6000::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
diff --git a/src/drivers/imu/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp
index 0be1739830e5d744141e07c4e3b78d3aa7dbcfa8..1ef4a000fb5f4260184cb806aaf56dd9608a3ccf 100644
--- a/src/drivers/imu/mpu9250/mag.cpp
+++ b/src/drivers/imu/mpu9250/mag.cpp
@@ -329,9 +329,6 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- return MPU9250_AK8963_SAMPLE_RATE;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp
index 806dde61f1a5ede2dbd9a91460bef89441f3df3b..748688f080eec2ff3e0330bbd4706fdd3ac60387 100644
--- a/src/drivers/imu/mpu9250/mpu9250.cpp
+++ b/src/drivers/imu/mpu9250/mpu9250.cpp
@@ -800,13 +800,6 @@ MPU9250::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -852,7 +845,6 @@ MPU9250::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return ioctl(filp, cmd, arg);
diff --git a/src/drivers/magnetometer/bmm150/bmm150.cpp b/src/drivers/magnetometer/bmm150/bmm150.cpp
index a58c1f404993992c57bf454dfcf89657158bf6da..5c04cd56345d1f464d0aa9ff48b323a632d257fa 100644
--- a/src/drivers/magnetometer/bmm150/bmm150.cpp
+++ b/src/drivers/magnetometer/bmm150/bmm150.cpp
@@ -767,13 +767,6 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883.cpp b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
index dfc019211f2a05d72470d1e424327b85008775ba..0d81d2d619e2a5595508bda39585a85f5ef4b29e 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
@@ -669,13 +669,6 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / TICK2USEC(_measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/magnetometer/ist8310/ist8310.cpp b/src/drivers/magnetometer/ist8310/ist8310.cpp
index 117df6935140ce297463edd200bdb87f0aa30f1e..83a6401c80d634a45bb4e8c7b669cddbe2b079e6 100644
--- a/src/drivers/magnetometer/ist8310/ist8310.cpp
+++ b/src/drivers/magnetometer/ist8310/ist8310.cpp
@@ -649,13 +649,6 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / TICK2USEC(_measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
index 33eff5c662a68a210753b80881c6e8319722321b..9b974768e3c8474de23c4e8829f8ecc93f69ae67 100644
--- a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
+++ b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
@@ -298,13 +298,6 @@ LSM303AGR::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / TICK2USEC(_measure_ticks);
-
case SENSORIOCRESET:
return reset();
diff --git a/src/drivers/px4flow/px4flow.cpp b/src/drivers/px4flow/px4flow.cpp
index 50b2fc6774e1aa2746d9a8d390cd91fa20f90774..931f3cc4781d9f11aa82d5fb5eeada0401fa92da 100644
--- a/src/drivers/px4flow/px4flow.cpp
+++ b/src/drivers/px4flow/px4flow.cpp
@@ -388,13 +388,6 @@ PX4FLOW::ioctl(struct file *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/lib/drivers/airspeed/airspeed.cpp b/src/lib/drivers/airspeed/airspeed.cpp
index bb606eddd8d9c31e69c9de268cf76d123bd7155e..3cc31ee90e095ef2a3c55c3997dc38fede38c6a3 100644
--- a/src/lib/drivers/airspeed/airspeed.cpp
+++ b/src/lib/drivers/airspeed/airspeed.cpp
@@ -195,13 +195,6 @@ Airspeed::ioctl(device::file_t *filp, int cmd, unsigned long arg)
}
break;
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCRESET:
/* XXX implement this */
return -EINVAL;
diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp
index 0b039c116a1fafa14950f2e236191a03add7d369..afcd17b90e5783bd7934cbb1382df7a20b8c7505 100644
--- a/src/modules/simulator/accelsim/accelsim.cpp
+++ b/src/modules/simulator/accelsim/accelsim.cpp
@@ -541,13 +541,6 @@ ACCELSIM::devIOCTL(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (m_sample_interval_usecs == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / m_sample_interval_usecs;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((ul_arg < 1) || (ul_arg > 100)) {
@@ -635,13 +628,6 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_mag->m_sample_interval_usecs == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _mag->m_sample_interval_usecs;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/modules/simulator/airspeedsim/airspeedsim.cpp b/src/modules/simulator/airspeedsim/airspeedsim.cpp
index 191a88280979bf953dcda9d147c927960a45e77e..0b998a854f678bedec455884a305dd5fbab03a27 100644
--- a/src/modules/simulator/airspeedsim/airspeedsim.cpp
+++ b/src/modules/simulator/airspeedsim/airspeedsim.cpp
@@ -223,13 +223,6 @@ AirspeedSim::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_measure_ticks == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return (1000 / _measure_ticks);
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
diff --git a/src/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp
index f4a248b832cc599883615965956a1ed317fc2983..de50df6243ebf32d6c31b99763ed339cbd92db6d 100644
--- a/src/modules/simulator/gyrosim/gyrosim.cpp
+++ b/src/modules/simulator/gyrosim/gyrosim.cpp
@@ -676,13 +676,6 @@ GYROSIM::devIOCTL(unsigned long cmd, unsigned long arg)
}
}
- case SENSORIOCGPOLLRATE:
- if (_call_interval == 0) {
- return SENSOR_POLLRATE_MANUAL;
- }
-
- return 1000000 / _call_interval;
-
case SENSORIOCSQUEUEDEPTH: {
/* lower bound is mandatory, upper bound is a sanity check */
if ((arg < 1) || (arg > 100)) {
@@ -723,7 +716,6 @@ GYROSIM::gyro_ioctl(unsigned long cmd, unsigned long arg)
/* these are shared with the accel side */
case SENSORIOCSPOLLRATE:
- case SENSORIOCGPOLLRATE:
case SENSORIOCRESET:
return devIOCTL(cmd, arg);
diff --git a/src/systemcmds/config/config.c b/src/systemcmds/config/config.c
index bdf2dda0291cb2e27efff5ed8296f4e3181d8422..b5e0eb4505d3bb43dfccc86be53525616a05bef1 100644
--- a/src/systemcmds/config/config.c
+++ b/src/systemcmds/config/config.c
@@ -193,14 +193,13 @@ do_gyro(int argc, char *argv[])
return 1;
}
- int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0);
int32_t calibration_id = 0;
param_get(param_find("CAL_GYRO0_ID"), &(calibration_id));
- PX4_INFO("gyro: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz",
- id, calibration_id, prate);
+ PX4_INFO("gyro: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)",
+ id, calibration_id);
close(fd);
}
@@ -248,14 +247,13 @@ do_mag(int argc, char *argv[])
return 1;
}
- int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0);
int32_t calibration_id = 0;
param_get(param_find("CAL_MAG0_ID"), &(calibration_id));
- PX4_INFO("mag: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz",
- id, calibration_id, prate);
+ PX4_INFO("mag: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)",
+ id, calibration_id);
close(fd);
}
@@ -293,14 +291,13 @@ do_accel(int argc, char *argv[])
return 1;
}
- int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0);
int32_t calibration_id = 0;
param_get(param_find("CAL_ACC0_ID"), &(calibration_id));
- PX4_INFO("accel: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz",
- id, calibration_id, prate);
+ PX4_INFO("accel: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)",
+ id, calibration_id);
close(fd);
}