diff --git a/src/drivers/drv_accel.h b/src/drivers/drv_accel.h index 63886530dc..ef19427983 100644 --- a/src/drivers/drv_accel.h +++ b/src/drivers/drv_accel.h @@ -76,7 +76,4 @@ struct accel_calibration_s { /** set the accel scaling constants to the structure pointed to by (arg) */ #define ACCELIOCSSCALE _ACCELIOC(5) -/** determine if hardware is external or onboard */ -#define ACCELIOCGEXTERNAL _ACCELIOC(12) - #endif /* _DRV_ACCEL_H */ diff --git a/src/drivers/imu/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp index 2953132ec6..33965eec7a 100644 --- a/src/drivers/imu/mpu6000/mpu6000.cpp +++ b/src/drivers/imu/mpu6000/mpu6000.cpp @@ -373,11 +373,7 @@ private: * * @return true if the sensor is not on the main MCU board */ - bool is_external() - { - unsigned dummy; - return _interface->ioctl(ACCELIOCGEXTERNAL, dummy); - } + bool is_external() { return _interface->external(); } /** * Measurement self test @@ -1263,8 +1259,6 @@ MPU6000::gyro_read(struct file *filp, char *buffer, size_t buflen) int MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg) { - unsigned dummy = arg; - switch (cmd) { case SENSORIOCRESET: @@ -1380,9 +1374,6 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg) } } - case ACCELIOCGEXTERNAL: - return _interface->ioctl(cmd, dummy); - default: /* give it to the superclass */ return CDev::ioctl(filp, cmd, arg); diff --git a/src/drivers/imu/mpu6000/mpu6000_i2c.cpp b/src/drivers/imu/mpu6000/mpu6000_i2c.cpp index 190bc24bb1..cfb1b8870d 100644 --- a/src/drivers/imu/mpu6000/mpu6000_i2c.cpp +++ b/src/drivers/imu/mpu6000/mpu6000_i2c.cpp @@ -102,10 +102,6 @@ MPU6000_I2C::ioctl(unsigned operation, unsigned &arg) int ret; switch (operation) { - - case ACCELIOCGEXTERNAL: - return external(); - case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg); diff --git a/src/drivers/imu/mpu6000/mpu6000_spi.cpp b/src/drivers/imu/mpu6000/mpu6000_spi.cpp index 2261e1bb86..1a8e21229a 100644 --- a/src/drivers/imu/mpu6000/mpu6000_spi.cpp +++ b/src/drivers/imu/mpu6000/mpu6000_spi.cpp @@ -234,12 +234,6 @@ MPU6000_SPI::ioctl(unsigned operation, unsigned &arg) int ret; switch (operation) { - - case ACCELIOCGEXTERNAL: - external(); - - /* FALLTHROUGH */ - case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg); diff --git a/src/drivers/imu/mpu9250/mag_i2c.cpp b/src/drivers/imu/mpu9250/mag_i2c.cpp index 3f0bb4f225..a3c163ea4a 100644 --- a/src/drivers/imu/mpu9250/mag_i2c.cpp +++ b/src/drivers/imu/mpu9250/mag_i2c.cpp @@ -100,10 +100,6 @@ AK8963_I2C::ioctl(unsigned operation, unsigned &arg) int ret; switch (operation) { - - case ACCELIOCGEXTERNAL: - return external(); - case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg); diff --git a/src/drivers/imu/mpu9250/mpu9250.h b/src/drivers/imu/mpu9250/mpu9250.h index 866662569e..3939e95270 100644 --- a/src/drivers/imu/mpu9250/mpu9250.h +++ b/src/drivers/imu/mpu9250/mpu9250.h @@ -490,11 +490,7 @@ private: * * @return true if the sensor is not on the main MCU board */ - bool is_external() - { - unsigned dummy; - return _interface->ioctl(ACCELIOCGEXTERNAL, dummy); - } + bool is_external() { return _interface->external(); } /** * Measurement self test diff --git a/src/drivers/imu/mpu9250/mpu9250_i2c.cpp b/src/drivers/imu/mpu9250/mpu9250_i2c.cpp index 2b3bf0f5a5..0279d28a12 100644 --- a/src/drivers/imu/mpu9250/mpu9250_i2c.cpp +++ b/src/drivers/imu/mpu9250/mpu9250_i2c.cpp @@ -97,10 +97,6 @@ MPU9250_I2C::ioctl(unsigned operation, unsigned &arg) int ret = PX4_ERROR; switch (operation) { - - case ACCELIOCGEXTERNAL: - return external(); - case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg); diff --git a/src/drivers/imu/mpu9250/mpu9250_spi.cpp b/src/drivers/imu/mpu9250/mpu9250_spi.cpp index 6f3279b291..de62326344 100644 --- a/src/drivers/imu/mpu9250/mpu9250_spi.cpp +++ b/src/drivers/imu/mpu9250/mpu9250_spi.cpp @@ -130,12 +130,6 @@ MPU9250_SPI::ioctl(unsigned operation, unsigned &arg) int ret; switch (operation) { - - case ACCELIOCGEXTERNAL: - external(); - - /* FALLTHROUGH */ - case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg);