Browse Source

delete unused IOCTL ACCELIOCGEXTERNAL

sbg
Daniel Agar 6 years ago committed by Lorenz Meier
parent
commit
22c9fb7290
  1. 3
      src/drivers/drv_accel.h
  2. 11
      src/drivers/imu/mpu6000/mpu6000.cpp
  3. 4
      src/drivers/imu/mpu6000/mpu6000_i2c.cpp
  4. 6
      src/drivers/imu/mpu6000/mpu6000_spi.cpp
  5. 4
      src/drivers/imu/mpu9250/mag_i2c.cpp
  6. 6
      src/drivers/imu/mpu9250/mpu9250.h
  7. 4
      src/drivers/imu/mpu9250/mpu9250_i2c.cpp
  8. 6
      src/drivers/imu/mpu9250/mpu9250_spi.cpp

3
src/drivers/drv_accel.h

@ -76,7 +76,4 @@ struct accel_calibration_s { @@ -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 */

11
src/drivers/imu/mpu6000/mpu6000.cpp

@ -373,11 +373,7 @@ private: @@ -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) @@ -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) @@ -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);

4
src/drivers/imu/mpu6000/mpu6000_i2c.cpp

@ -102,10 +102,6 @@ MPU6000_I2C::ioctl(unsigned operation, unsigned &arg) @@ -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);

6
src/drivers/imu/mpu6000/mpu6000_spi.cpp

@ -234,12 +234,6 @@ MPU6000_SPI::ioctl(unsigned operation, unsigned &arg) @@ -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);

4
src/drivers/imu/mpu9250/mag_i2c.cpp

@ -100,10 +100,6 @@ AK8963_I2C::ioctl(unsigned operation, unsigned &arg) @@ -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);

6
src/drivers/imu/mpu9250/mpu9250.h

@ -490,11 +490,7 @@ private: @@ -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

4
src/drivers/imu/mpu9250/mpu9250_i2c.cpp

@ -97,10 +97,6 @@ MPU9250_I2C::ioctl(unsigned operation, unsigned &arg) @@ -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);

6
src/drivers/imu/mpu9250/mpu9250_spi.cpp

@ -130,12 +130,6 @@ MPU9250_SPI::ioctl(unsigned operation, unsigned &arg) @@ -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);

Loading…
Cancel
Save