dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

delete unused IOCTL SENSORIOCGPOLLRATE

This commit is contained in:
Daniel Agar 2018-11-03 16:07:00 -04:00 committed by Lorenz Meier
parent 9cd3e3d1cf
commit 8dfd55fc9e
37 changed files with 6 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/barometer/bmp280/bmp280.cpp
View File

@ -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)) {

7
src/drivers/barometer/lps22hb/LPS22HB.cpp
View File

@ -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();

7
src/drivers/barometer/lps25h/lps25h.cpp
View File

@ -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)) {

7
src/drivers/barometer/mpl3115a2/mpl3115a2.cpp
View File

@ -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)) {

7
src/drivers/barometer/ms5611/ms5611.cpp
View File

@ -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)) {

7
src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp
View File

@ -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;

7
src/drivers/distance_sensor/ll40ls/LidarLite.cpp
View File

@ -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;

7
src/drivers/distance_sensor/mb12xx/mb12xx.cpp
View File

@ -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;

7
src/drivers/distance_sensor/sf0x/sf0x.cpp
View File

@ -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;

7
src/drivers/distance_sensor/sf1xx/sf1xx.cpp
View File

@ -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;

7
src/drivers/distance_sensor/srf02/srf02.cpp
View File

@ -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;

7
src/drivers/distance_sensor/teraranger/teraranger.cpp
View File

@ -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;

7
src/drivers/distance_sensor/tfmini/tfmini.cpp
View File

@ -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;

6
src/drivers/drv_sensor.h
View File

@ -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 */

9
src/drivers/imu/adis16448/adis16448.cpp
View File

@ -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);

8
src/drivers/imu/adis16477/ADIS16477.cpp
View File

@ -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);

7
src/drivers/imu/bma180/bma180.cpp
View File

@ -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)) {

7
src/drivers/imu/bmi055/BMI055_accel.cpp
View File

@ -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)) {

7
src/drivers/imu/bmi055/BMI055_gyro.cpp
View File

@ -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)) {

8
src/drivers/imu/bmi160/bmi160.cpp
View File

@ -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);

7
src/drivers/imu/fxas21002c/fxas21002c.cpp
View File

@ -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)) {

14
src/drivers/imu/fxos8701cq/fxos8701cq.cpp
View File

@ -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)) {

7
src/drivers/imu/l3gd20/l3gd20.cpp
View File

@ -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)) {

14
src/drivers/imu/lsm303d/lsm303d.cpp
View File

@ -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)) {

8
src/drivers/imu/mpu6000/mpu6000.cpp
View File

@ -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);

3
src/drivers/imu/mpu9250/mag.cpp
View File

@ -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)) {

8
src/drivers/imu/mpu9250/mpu9250.cpp
View File

@ -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);

7
src/drivers/magnetometer/bmm150/bmm150.cpp
View File

@ -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)) {

7
src/drivers/magnetometer/hmc5883/hmc5883.cpp
View File

@ -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)) {

7
src/drivers/magnetometer/ist8310/ist8310.cpp
View File

@ -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)) {

7
src/drivers/magnetometer/lsm303agr/LSM303AGR.cpp
View File

@ -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();

7
src/drivers/px4flow/px4flow.cpp
View File

@ -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)) {

7
src/lib/drivers/airspeed/airspeed.cpp
View File

@ -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;

14
src/modules/simulator/accelsim/accelsim.cpp
View File

@ -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)) {

7
src/modules/simulator/airspeedsim/airspeedsim.cpp
View File

@ -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)) {

8
src/modules/simulator/gyrosim/gyrosim.cpp
View File

@ -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);

15
src/systemcmds/config/config.c
View File

@ -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);
}