From 8ad59160c9333f869fc1c7be9df9f02017d9781f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 3 Nov 2018 14:20:34 -0400
Subject: [PATCH] delete unused IOCTL ACCELIOCGSAMPLERATE
---
src/drivers/drv_accel.h | 3 ---
src/drivers/imu/adis16448/adis16448.cpp | 3 ---
src/drivers/imu/adis16477/ADIS16477.cpp | 3 ---
src/drivers/imu/bma180/bma180.cpp | 3 ---
src/drivers/imu/bmi055/BMI055_accel.cpp | 3 ---
src/drivers/imu/bmi160/bmi160.cpp | 3 ---
src/drivers/imu/fxos8701cq/fxos8701cq.cpp | 3 ---
src/drivers/imu/lsm303d/lsm303d.cpp | 3 ---
src/drivers/imu/mpu6000/mpu6000.cpp | 3 ---
src/drivers/imu/mpu9250/mpu9250.cpp | 3 ---
src/modules/simulator/accelsim/accelsim.cpp | 3 ---
src/modules/simulator/gyrosim/gyrosim.cpp | 3 ---
src/systemcmds/config/config.c | 5 ++---
13 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/src/drivers/drv_accel.h b/src/drivers/drv_accel.h
index 9016fe8264..6f7c679792 100644
--- a/src/drivers/drv_accel.h
+++ b/src/drivers/drv_accel.h
@@ -79,9 +79,6 @@ struct accel_calibration_s {
#define ACCEL_SAMPLERATE_DEFAULT 1000003 /**< default sample rate */
-/** return the accel internal sample rate in Hz */
-#define ACCELIOCGSAMPLERATE _ACCELIOC(1)
-
/** set the accel scaling constants to the structure pointed to by (arg) */
#define ACCELIOCSSCALE _ACCELIOC(5)
diff --git a/src/drivers/imu/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp
index 165999f578..4181aa2dd5 100644
--- a/src/drivers/imu/adis16448/adis16448.cpp
+++ b/src/drivers/imu/adis16448/adis16448.cpp
@@ -1068,9 +1068,6 @@ ADIS16448::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return _sample_rate;
-
case ACCELIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
diff --git a/src/drivers/imu/adis16477/ADIS16477.cpp b/src/drivers/imu/adis16477/ADIS16477.cpp
index 9eae367cd0..3bbd653ae2 100644
--- a/src/drivers/imu/adis16477/ADIS16477.cpp
+++ b/src/drivers/imu/adis16477/ADIS16477.cpp
@@ -407,9 +407,6 @@ ADIS16477::ioctl(struct file *filp, int cmd, unsigned long arg)
return 1000000 / _call_interval;
- case ACCELIOCGSAMPLERATE:
- return _sample_rate;
-
case ACCELIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
diff --git a/src/drivers/imu/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp
index 4470ebe315..319a6bb97a 100644
--- a/src/drivers/imu/bma180/bma180.cpp
+++ b/src/drivers/imu/bma180/bma180.cpp
@@ -476,9 +476,6 @@ BMA180::ioctl(struct file *filp, int cmd, unsigned long arg)
case ACCELIOCSSAMPLERATE: /* sensor sample rate is not (really) adjustable */
return -EINVAL;
- case ACCELIOCGSAMPLERATE:
- return 1200; /* always operating in low-noise mode */
-
case ACCELIOCSSCALE:
/* copy scale in */
memcpy(&_accel_scale, (struct accel_calibration_s *) arg, sizeof(_accel_scale));
diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp
index 5108c3d7ff..24f701e417 100644
--- a/src/drivers/imu/bmi055/BMI055_accel.cpp
+++ b/src/drivers/imu/bmi055/BMI055_accel.cpp
@@ -415,9 +415,6 @@ BMI055_accel::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return _accel_sample_rate;
-
case ACCELIOCSSAMPLERATE:
return accel_set_sample_rate(arg);
diff --git a/src/drivers/imu/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp
index c66382b828..ace9a2b776 100644
--- a/src/drivers/imu/bmi160/bmi160.cpp
+++ b/src/drivers/imu/bmi160/bmi160.cpp
@@ -651,9 +651,6 @@ BMI160::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return _accel_sample_rate;
-
case ACCELIOCSSAMPLERATE:
return accel_set_sample_rate(arg);
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index a033c7c6f2..570c7997e9 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -885,9 +885,6 @@ FXOS8701CQ::ioctl(struct file *filp, int cmd, unsigned long arg)
case ACCELIOCSSAMPLERATE:
return accel_set_samplerate(arg);
- case ACCELIOCGSAMPLERATE:
- return _accel_samplerate;
-
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/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp
index 48185549d5..ca8b0b9e01 100644
--- a/src/drivers/imu/lsm303d/lsm303d.cpp
+++ b/src/drivers/imu/lsm303d/lsm303d.cpp
@@ -897,9 +897,6 @@ LSM303D::ioctl(struct file *filp, int cmd, unsigned long arg)
case ACCELIOCSSAMPLERATE:
return accel_set_samplerate(arg);
- case ACCELIOCGSAMPLERATE:
- return _accel_samplerate;
-
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/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp
index c7af04272e..73bcd7bcc0 100644
--- a/src/drivers/imu/mpu6000/mpu6000.cpp
+++ b/src/drivers/imu/mpu6000/mpu6000.cpp
@@ -1367,9 +1367,6 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return _sample_rate;
-
case ACCELIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
diff --git a/src/drivers/imu/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp
index 725bfda703..130c961394 100644
--- a/src/drivers/imu/mpu9250/mpu9250.cpp
+++ b/src/drivers/imu/mpu9250/mpu9250.cpp
@@ -827,9 +827,6 @@ MPU9250::ioctl(struct file *filp, int cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return _sample_rate;
-
case ACCELIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
diff --git a/src/modules/simulator/accelsim/accelsim.cpp b/src/modules/simulator/accelsim/accelsim.cpp
index 100f8ab67a..12c99c48bf 100644
--- a/src/modules/simulator/accelsim/accelsim.cpp
+++ b/src/modules/simulator/accelsim/accelsim.cpp
@@ -569,9 +569,6 @@ ACCELSIM::devIOCTL(unsigned long cmd, unsigned long arg)
// No need to set internal sampling rate for simulator
return OK;
- case ACCELIOCGSAMPLERATE:
- return _accel_samplerate;
-
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/modules/simulator/gyrosim/gyrosim.cpp b/src/modules/simulator/gyrosim/gyrosim.cpp
index e713bfba90..ecfcd78bed 100644
--- a/src/modules/simulator/gyrosim/gyrosim.cpp
+++ b/src/modules/simulator/gyrosim/gyrosim.cpp
@@ -700,9 +700,6 @@ GYROSIM::devIOCTL(unsigned long cmd, unsigned long arg)
return OK;
}
- case ACCELIOCGSAMPLERATE:
- return 1e6 / m_sample_interval_usecs;
-
case ACCELIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
diff --git a/src/systemcmds/config/config.c b/src/systemcmds/config/config.c
index d736d0e42d..150b2543f2 100644
--- a/src/systemcmds/config/config.c
+++ b/src/systemcmds/config/config.c
@@ -347,7 +347,6 @@ do_accel(int argc, char *argv[])
return 1;
}
- int srate = ioctl(fd, ACCELIOCGSAMPLERATE, 0);
int prate = ioctl(fd, SENSORIOCGPOLLRATE, 0);
int range = ioctl(fd, ACCELIOCGRANGE, 0);
int id = ioctl(fd, DEVIOCGDEVICEID, 0);
@@ -355,8 +354,8 @@ do_accel(int argc, char *argv[])
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\tsample rate:\t%d Hz\n\tread rate:\t%d Hz\n\trange:\t%d G",
- id, calibration_id, srate, prate, range);
+ PX4_INFO("accel: \n\tdevice id:\t0x%X\t(calibration is for device id 0x%X)\n\tread rate:\t%d Hz\n\trange:\t%d G",
+ id, calibration_id, prate, range);
close(fd);
}
--
GitLab