yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete unused IOCTL MAGIOCSSAMPLERATE

Browse Source
This commit is contained in:
Daniel Agar
2018-11-03 15:38:28 -04:00
committed by Lorenz Meier
parent 04972d196a
commit 60a40ec131
14 changed files with 1 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/drv_mag.h
View File

@@ -69,9 +69,6 @@ struct mag_calibration_s {
#define _MAGIOCBASE (0x2400)
#define _MAGIOC(_n) (_PX4_IOC(_MAGIOCBASE, _n))
/** set the mag internal sample rate to at least (arg) Hz */
#define MAGIOCSSAMPLERATE _MAGIOC(0)
/** return the mag internal sample rate in Hz */
#define MAGIOCGSAMPLERATE _MAGIOC(1)

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

@@ -1160,10 +1160,6 @@ ADIS16448::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
case MAGIOCGSAMPLERATE:
return _sample_rate;
case MAGIOCSSAMPLERATE:
_set_sample_rate(arg);
return OK;
case MAGIOCSSCALE:
/* copy scale in */
memcpy(&_mag_scale, (struct mag_calibration_s *) arg, sizeof(_mag_scale));

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

@@ -983,9 +983,6 @@ FXOS8701CQ::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
reset();
return OK;
case MAGIOCSSAMPLERATE:
return mag_set_samplerate(arg);
case MAGIOCGSAMPLERATE:
return _mag_samplerate;

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

@@ -994,9 +994,6 @@ LSM303D::mag_ioctl(struct file *filp, int cmd, unsigned long arg)
reset();
return OK;
case MAGIOCSSAMPLERATE:
return mag_set_samplerate(arg);
case MAGIOCGSAMPLERATE:
return _mag_samplerate;

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

@@ -353,18 +353,6 @@ MPU9250_mag::ioctl(struct file *filp, int cmd, unsigned long arg)
case MAGIOCGSAMPLERATE:
return MPU9250_AK8963_SAMPLE_RATE;
case MAGIOCSSAMPLERATE:
/*
* We don't currently support any means of changing
* the sampling rate of the mag
*/
if (MPU9250_AK8963_SAMPLE_RATE != arg) {
return -EINVAL;
}
return OK;
case MAGIOCSSCALE:
/* copy scale in */
memcpy(&_mag_scale, (struct mag_scale *) arg, sizeof(_mag_scale));

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

@@ -807,9 +807,6 @@ BMM150::ioctl(struct file *filp, int cmd, unsigned long arg)
case MAGIOCEXSTRAP:
return OK;
case MAGIOCSSAMPLERATE:
return ioctl(filp, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
return 1000000 / _call_interval;

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

@@ -697,10 +697,6 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return reset();
case MAGIOCSSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return ioctl(filp, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return 1000000 / TICK2USEC(_measure_ticks);

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

@@ -677,10 +677,6 @@ IST8310::ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return reset();
case MAGIOCSSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return ioctl(filp, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return 1000000 / TICK2USEC(_measure_ticks);

4
src/drivers/magnetometer/lis3mdl/lis3mdl.cpp
View File

@@ -584,10 +584,6 @@ LIS3MDL::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
case SENSORIOCRESET:
return reset();
case MAGIOCSSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return ioctl(file_pointer, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return 1000000 / TICK2USEC(_measure_ticks);

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

@@ -308,10 +308,6 @@ LSM303AGR::ioctl(struct file *filp, int cmd, unsigned long arg)
case SENSORIOCRESET:
return reset();
case MAGIOCSSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return ioctl(filp, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return 1000000 / TICK2USEC(_measure_ticks);

4
src/drivers/magnetometer/rm3100/rm3100.cpp
View File

@@ -445,10 +445,6 @@ RM3100::ioctl(struct file *file_pointer, int cmd, unsigned long arg)
case SENSORIOCRESET:
return reset();
case MAGIOCSSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return ioctl(file_pointer, SENSORIOCSPOLLRATE, arg);
case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/
return 1000000 / TICK2USEC(_measure_ticks);

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

@@ -659,10 +659,6 @@ ACCELSIM::mag_ioctl(unsigned long cmd, unsigned long arg)
// Nothing to do for simulator
return OK;
case MAGIOCSSAMPLERATE:
// No need to set internal sampling rate for simulator
return OK;
case MAGIOCGSAMPLERATE:
return _mag_samplerate;

4
src/modules/uavcan/sensors/mag.cpp
View File

@@ -118,10 +118,6 @@ int UavcanMagnetometerBridge::ioctl(struct file *filp, int cmd, unsigned long ar
return 1; // declare it external rise it's priority and to allow for correct orientation compensation
}
case MAGIOCSSAMPLERATE: {
return 0; // Pretend that this stuff is supported to keep the sensor app happy
}
case MAGIOCCALIBRATE:
case MAGIOCGSAMPLERATE:
case MAGIOCSRANGE:

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

@@ -223,17 +223,7 @@ do_mag(int argc, char *argv[])
int ret;
if (argc == 3 && !strcmp(argv[0], "sampling")) {
/* set the mag internal sampling rate up to at least i Hz */
ret = ioctl(fd, MAGIOCSSAMPLERATE, strtoul(argv[2], NULL, 0));
if (ret) {
PX4_ERR("sampling rate could not be set");
return 1;
}
} else if (argc == 3 && !strcmp(argv[0], "rate")) {
if (argc == 3 && !strcmp(argv[0], "rate")) {
/* set the driver to poll at i Hz */
ret = ioctl(fd, SENSORIOCSPOLLRATE, strtoul(argv[2], NULL, 0));