From d2ed091a1d62eac14d4820151f74264ced740d74 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 3 Nov 2018 16:18:13 -0400
Subject: [PATCH] delete IOCTL SENSOR_POLLRATE_MAX
- only SENSOR_POLLRATE_DEFAULT is needed
---
src/drivers/barometer/bmp280/bmp280.cpp | 3 ---
src/drivers/barometer/lps22hb/LPS22HB.cpp | 3 +--
src/drivers/barometer/lps25h/lps25h.cpp | 3 +--
src/drivers/barometer/mpl3115a2/mpl3115a2.cpp | 3 +--
src/drivers/barometer/ms5611/ms5611.cpp | 3 +--
src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp | 3 +--
src/drivers/distance_sensor/ll40ls/LidarLite.cpp | 3 +--
src/drivers/distance_sensor/mb12xx/mb12xx.cpp | 3 +--
src/drivers/distance_sensor/sf0x/sf0x.cpp | 3 +--
src/drivers/distance_sensor/sf1xx/sf1xx.cpp | 3 +--
src/drivers/distance_sensor/srf02/srf02.cpp | 3 +--
src/drivers/distance_sensor/teraranger/teraranger.cpp | 3 +--
src/drivers/distance_sensor/tfmini/tfmini.cpp | 3 +--
src/drivers/drv_sensor.h | 1 -
src/drivers/imu/adis16448/adis16448.cpp | 5 +----
src/drivers/imu/adis16477/ADIS16477.cpp | 5 +----
src/drivers/imu/bma180/bma180.cpp | 3 +--
src/drivers/imu/bmi055/BMI055_accel.cpp | 5 +----
src/drivers/imu/bmi055/BMI055_gyro.cpp | 5 +----
src/drivers/imu/bmi160/bmi160.cpp | 5 +----
src/drivers/imu/fxas21002c/fxas21002c.cpp | 3 +--
src/drivers/imu/fxos8701cq/fxos8701cq.cpp | 8 ++------
src/drivers/imu/l3gd20/l3gd20.cpp | 3 +--
src/drivers/imu/lsm303d/lsm303d.cpp | 8 ++------
src/drivers/imu/mpu6000/mpu6000.cpp | 5 +----
src/drivers/imu/mpu9250/mag.cpp | 5 +----
src/drivers/imu/mpu9250/mpu9250.cpp | 5 +----
src/drivers/magnetometer/bmm150/bmm150.cpp | 10 ++++------
src/drivers/magnetometer/hmc5883/hmc5883.cpp | 3 +--
src/drivers/magnetometer/ist8310/ist8310.cpp | 3 +--
src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp | 3 +--
src/drivers/px4flow/px4flow.cpp | 5 ++---
src/lib/drivers/airspeed/airspeed.cpp | 3 +--
src/modules/simulator/accelsim/accelsim.cpp | 8 ++------
src/modules/simulator/airspeedsim/airspeedsim.cpp | 3 +--
src/modules/simulator/gyrosim/gyrosim.cpp | 5 +----
36 files changed, 41 insertions(+), 107 deletions(-)
diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index 5ff7b954d8..94e627de87 100644
--- a/src/drivers/barometer/bmp280/bmp280.cpp
+++ b/src/drivers/barometer/bmp280/bmp280.cpp
@@ -342,9 +342,6 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- case SENSOR_POLLRATE_MAX:
-
- /* FALLTHROUGH */
case SENSOR_POLLRATE_DEFAULT:
ticks = _max_mesure_ticks;
diff --git a/src/drivers/barometer/lps22hb/LPS22HB.cpp b/src/drivers/barometer/lps22hb/LPS22HB.cpp
index 10d191629f..d87b1d4eb0 100644
--- a/src/drivers/barometer/lps22hb/LPS22HB.cpp
+++ b/src/drivers/barometer/lps22hb/LPS22HB.cpp
@@ -110,8 +110,7 @@ LPS22HB::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/barometer/lps25h/lps25h.cpp b/src/drivers/barometer/lps25h/lps25h.cpp
index b624d3b631..e51a361945 100644
--- a/src/drivers/barometer/lps25h/lps25h.cpp
+++ b/src/drivers/barometer/lps25h/lps25h.cpp
@@ -445,8 +445,7 @@ LPS25H::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
index 94574a3f92..635c68f2c4 100644
--- a/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
+++ b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
@@ -396,8 +396,7 @@ MPL3115A2::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/barometer/ms5611/ms5611.cpp b/src/drivers/barometer/ms5611/ms5611.cpp
index 89a35f8ae2..1995d5a027 100644
--- a/src/drivers/barometer/ms5611/ms5611.cpp
+++ b/src/drivers/barometer/ms5611/ms5611.cpp
@@ -471,8 +471,7 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
index 3d6a683211..8bcb06a4d1 100644
--- a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
+++ b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
@@ -352,8 +352,7 @@ HC_SR04::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
index 8dfaf47ec7..d9e0022832 100644
--- a/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
+++ b/src/drivers/distance_sensor/ll40ls/LidarLite.cpp
@@ -84,8 +84,7 @@ int LidarLite::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
index 91a0475dcd..bfbc435db2 100644
--- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
+++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp
@@ -348,8 +348,7 @@ MB12XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/sf0x/sf0x.cpp b/src/drivers/distance_sensor/sf0x/sf0x.cpp
index 67ee21f30d..a821f2e1ad 100644
--- a/src/drivers/distance_sensor/sf0x/sf0x.cpp
+++ b/src/drivers/distance_sensor/sf0x/sf0x.cpp
@@ -329,8 +329,7 @@ SF0X::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
index aa052f4b89..f376514353 100644
--- a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
+++ b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp
@@ -348,8 +348,7 @@ SF1XX::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
index 625386715a..e484094170 100644
--- a/src/drivers/distance_sensor/srf02/srf02.cpp
+++ b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -348,8 +348,7 @@ SRF02::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/teraranger/teraranger.cpp b/src/drivers/distance_sensor/teraranger/teraranger.cpp
index 6dd209bba2..6851cc9e36 100644
--- a/src/drivers/distance_sensor/teraranger/teraranger.cpp
+++ b/src/drivers/distance_sensor/teraranger/teraranger.cpp
@@ -427,8 +427,7 @@ TERARANGER::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/distance_sensor/tfmini/tfmini.cpp b/src/drivers/distance_sensor/tfmini/tfmini.cpp
index 8a58912ba4..e16318bfd6 100644
--- a/src/drivers/distance_sensor/tfmini/tfmini.cpp
+++ b/src/drivers/distance_sensor/tfmini/tfmini.cpp
@@ -366,8 +366,7 @@ TFMINI::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h
index 30246cf021..29b315bc0a 100644
--- a/src/drivers/drv_sensor.h
+++ b/src/drivers/drv_sensor.h
@@ -126,7 +126,6 @@
*/
#define SENSORIOCSPOLLRATE _SENSORIOC(0)
-#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 bef711671e..a6275ffc65 100644
--- a/src/drivers/imu/adis16448/adis16448.cpp
+++ b/src/drivers/imu/adis16448/adis16448.cpp
@@ -984,10 +984,7 @@ ADIS16448::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, ADIS16448_ACCEL_DEFAULT_RATE);
diff --git a/src/drivers/imu/adis16477/ADIS16477.cpp b/src/drivers/imu/adis16477/ADIS16477.cpp
index ab3b783895..7f5e7b997a 100644
--- a/src/drivers/imu/adis16477/ADIS16477.cpp
+++ b/src/drivers/imu/adis16477/ADIS16477.cpp
@@ -348,10 +348,7 @@ ADIS16477::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, ADIS16477_ACCEL_DEFAULT_RATE);
diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
index 3f05754c07..6c2815eb80 100644
--- a/src/drivers/imu/bma180/bma180.cpp
+++ b/src/drivers/imu/bma180/bma180.cpp
@@ -405,8 +405,7 @@ BMA180::ioctl(struct file *filp, int cmd, unsigned long arg)
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* With internal low pass filters enabled, 250 Hz is sufficient */
return ioctl(filp, SENSORIOCSPOLLRATE, 250);
diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp
index dafffc5b61..c1427d7cf2 100644
--- a/src/drivers/imu/bmi055/BMI055_accel.cpp
+++ b/src/drivers/imu/bmi055/BMI055_accel.cpp
@@ -334,10 +334,7 @@ BMI055_accel::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_ACCEL_MAX_RATE);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
// Polling at the highest frequency. We may get duplicate values on the sensors
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_ACCEL_DEFAULT_RATE);
diff --git a/src/drivers/imu/bmi055/BMI055_gyro.cpp b/src/drivers/imu/bmi055/BMI055_gyro.cpp
index 0d7c366368..5c0e2ade84 100644
--- a/src/drivers/imu/bmi055/BMI055_gyro.cpp
+++ b/src/drivers/imu/bmi055/BMI055_gyro.cpp
@@ -320,10 +320,7 @@ BMI055_gyro::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_GYRO_MAX_RATE);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, BMI055_GYRO_DEFAULT_RATE);
diff --git a/src/drivers/imu/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp
index a875571c4d..785071813d 100644
--- a/src/drivers/imu/bmi160/bmi160.cpp
+++ b/src/drivers/imu/bmi160/bmi160.cpp
@@ -559,10 +559,7 @@ BMI160::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, BMI160_GYRO_MAX_RATE);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
if (BMI160_GYRO_DEFAULT_RATE > BMI160_ACCEL_DEFAULT_RATE) {
return ioctl(filp, SENSORIOCSPOLLRATE, BMI160_GYRO_DEFAULT_RATE);
diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp
index 842756bae2..4c2f6d76d8 100644
--- a/src/drivers/imu/fxas21002c/fxas21002c.cpp
+++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp
@@ -660,8 +660,7 @@ FXAS21002C::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, FXAS21002C_DEFAULT_RATE);
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index bd85560920..664569832e 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -808,10 +808,7 @@ FXOS8701CQ::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1600);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, FXOS8701C_ACCEL_DEFAULT_RATE);
@@ -902,8 +899,7 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(filp, SENSORIOCSPOLLRATE, 100);
diff --git a/src/drivers/imu/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp
index d608b1ba95..163a15528d 100644
--- a/src/drivers/imu/l3gd20/l3gd20.cpp
+++ b/src/drivers/imu/l3gd20/l3gd20.cpp
@@ -580,8 +580,7 @@ L3GD20::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
if (_is_l3g4200d) {
return ioctl(filp, SENSORIOCSPOLLRATE, L3G4200D_DEFAULT_RATE);
diff --git a/src/drivers/imu/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp
index 70a21da2db..411fc3ba15 100644
--- a/src/drivers/imu/lsm303d/lsm303d.cpp
+++ b/src/drivers/imu/lsm303d/lsm303d.cpp
@@ -820,10 +820,7 @@ LSM303D::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1600);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, LSM303D_ACCEL_DEFAULT_RATE);
@@ -913,8 +910,7 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(filp, SENSORIOCSPOLLRATE, 100);
diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp
index 64b5a52f06..265592ccf8 100644
--- a/src/drivers/imu/mpu6000/mpu6000.cpp
+++ b/src/drivers/imu/mpu6000/mpu6000.cpp
@@ -1270,10 +1270,7 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU6000_ACCEL_DEFAULT_RATE);
diff --git a/src/drivers/imu/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp
index 70a4ee3867..31aac0a7f1 100644
--- a/src/drivers/imu/mpu9250/mag.cpp
+++ b/src/drivers/imu/mpu9250/mag.cpp
@@ -302,10 +302,7 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 100);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU9250_AK8963_SAMPLE_RATE);
diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp
index f73793c0e9..f93d37c3f3 100644
--- a/src/drivers/imu/mpu9250/mpu9250.cpp
+++ b/src/drivers/imu/mpu9250/mpu9250.cpp
@@ -739,10 +739,7 @@ MPU9250::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return ioctl(filp, SENSORIOCSPOLLRATE, 1000);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, MPU9250_ACCEL_DEFAULT_RATE);
diff --git a/src/drivers/magnetometer/bmm150/bmm150.cpp b/src/drivers/magnetometer/bmm150/bmm150.cpp
index 4b727c2608..464f28749f 100644
--- a/src/drivers/magnetometer/bmm150/bmm150.cpp
+++ b/src/drivers/magnetometer/bmm150/bmm150.cpp
@@ -139,13 +139,12 @@ void test(bool external_bus)
fd = open(path, O_RDONLY);
if (fd < 0) {
- PX4_ERR("%s open failed (try 'bmm150 start' if the driver is not running)",
- path);
+ PX4_ERR("%s open failed (try 'bmm150 start' if the driver is not running)", path);
exit(1);
}
- /* reset to Max polling rate*/
- if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MAX) < 0) {
+ /* reset to default polling rate*/
+ if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("reset to Max polling rate");
exit(1);
}
@@ -730,8 +729,7 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return ioctl(filp, SENSORIOCSPOLLRATE, BMM150_MAX_DATA_RATE);
diff --git a/src/drivers/magnetometer/hmc5883/hmc5883.cpp b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
index 1c4e73d591..7e226f0793 100644
--- a/src/drivers/magnetometer/hmc5883/hmc5883.cpp
+++ b/src/drivers/magnetometer/hmc5883/hmc5883.cpp
@@ -620,8 +620,7 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/magnetometer/ist8310/ist8310.cpp b/src/drivers/magnetometer/ist8310/ist8310.cpp
index df7e04f4c5..b055c27b33 100644
--- a/src/drivers/magnetometer/ist8310/ist8310.cpp
+++ b/src/drivers/magnetometer/ist8310/ist8310.cpp
@@ -600,8 +600,7 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
index 6bf15864b5..1da84874bb 100644
--- a/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
+++ b/src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
@@ -249,8 +249,7 @@ LSM303AGR::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/drivers/px4flow/px4flow.cpp b/src/drivers/px4flow/px4flow.cpp
index 1fe5c2265a..1a2a5295d6 100644
--- a/src/drivers/px4flow/px4flow.cpp
+++ b/src/drivers/px4flow/px4flow.cpp
@@ -339,8 +339,7 @@ PX4FLOW::ioctl(struct file *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
@@ -811,7 +810,7 @@ start(int argc, char *argv[])
break;
}
- if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MAX) < 0) {
+ if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
break;
}
diff --git a/src/lib/drivers/airspeed/airspeed.cpp b/src/lib/drivers/airspeed/airspeed.cpp
index 45ea0c03f2..37e090f5e7 100644
--- a/src/lib/drivers/airspeed/airspeed.cpp
+++ b/src/lib/drivers/airspeed/airspeed.cpp
@@ -145,8 +145,7 @@ Airspeed::ioctl(device::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp
index bd879b8e83..a036594c2a 100644
--- a/src/modules/simulator/accelsim/accelsim.cpp
+++ b/src/modules/simulator/accelsim/accelsim.cpp
@@ -501,10 +501,7 @@ ACCELSIM::devIOCTL(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return devIOCTL(SENSORIOCSPOLLRATE, 1600);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return devIOCTL(SENSORIOCSPOLLRATE, ACCELSIM_ACCEL_DEFAULT_RATE);
@@ -586,8 +583,7 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
/* 100 Hz is max for mag */
return mag_ioctl(SENSORIOCSPOLLRATE, 100);
diff --git a/src/modules/simulator/airspeedsim/airspeedsim.cpp b/src/modules/simulator/airspeedsim/airspeedsim.cpp
index 23c50fe444..3c191d0a73 100644
--- a/src/modules/simulator/airspeedsim/airspeedsim.cpp
+++ b/src/modules/simulator/airspeedsim/airspeedsim.cpp
@@ -174,8 +174,7 @@ AirspeedSim::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT: {
/* do we need to start internal polling? */
bool want_start = (_measure_ticks == 0);
diff --git a/src/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp
index 29d89c5f1b..922e607bb3 100644
--- a/src/modules/simulator/gyrosim/gyrosim.cpp
+++ b/src/modules/simulator/gyrosim/gyrosim.cpp
@@ -637,10 +637,7 @@ GYROSIM::devIOCTL(unsigned long cmd, unsigned long arg)
case 0:
return -EINVAL;
- /* set default/max polling rate */
- case SENSOR_POLLRATE_MAX:
- return devIOCTL(SENSORIOCSPOLLRATE, 1000);
-
+ /* set default polling rate */
case SENSOR_POLLRATE_DEFAULT:
return devIOCTL(SENSORIOCSPOLLRATE, GYROSIM_ACCEL_DEFAULT_RATE);
--
GitLab