diff --git a/src/drivers/drv_range_finder.h b/src/drivers/drv_range_finder.h index 7d27c7f33a..38f49af6bc 100644 --- a/src/drivers/drv_range_finder.h +++ b/src/drivers/drv_range_finder.h @@ -48,21 +48,4 @@ #define RANGE_FINDER0_DEVICE_PATH "/dev/range_finder0" #define MB12XX_MAX_RANGEFINDERS 12 // Maximum number of Maxbotix sensors on bus -/* - * ioctl() definitions - * - * Rangefinder drivers also implement the generic sensor driver - * interfaces from drv_sensor.h - */ - -#define _RANGEFINDERIOCBASE (0x7900) -#define __RANGEFINDERIOC(_n) (_IOC(_RANGEFINDERIOCBASE, _n)) - -/** set the minimum effective distance of the device */ -#define RANGEFINDERIOCSETMINIUMDISTANCE __RANGEFINDERIOC(1) - -/** set the maximum effective distance of the device */ -#define RANGEFINDERIOCSETMAXIUMDISTANCE __RANGEFINDERIOC(2) - - #endif /* _DRV_RANGEFINDER_H */ diff --git a/src/drivers/hc_sr04/hc_sr04.cpp b/src/drivers/hc_sr04/hc_sr04.cpp index 799bad3860..fef934673c 100644 --- a/src/drivers/hc_sr04/hc_sr04.cpp +++ b/src/drivers/hc_sr04/hc_sr04.cpp @@ -452,18 +452,6 @@ HC_SR04::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return CDev::ioctl(filp, cmd, arg); diff --git a/src/drivers/ll40ls/LidarLite.cpp b/src/drivers/ll40ls/LidarLite.cpp index 6406f9590e..e3bb7dccfc 100644 --- a/src/drivers/ll40ls/LidarLite.cpp +++ b/src/drivers/ll40ls/LidarLite.cpp @@ -152,18 +152,6 @@ int LidarLite::ioctl(struct file *filp, int cmd, unsigned long arg) reset_sensor(); return OK; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return OK; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return OK; - } - break; - default: return -EINVAL; } diff --git a/src/drivers/mb12xx/mb12xx.cpp b/src/drivers/mb12xx/mb12xx.cpp index 26da536ccf..b8c0490882 100644 --- a/src/drivers/mb12xx/mb12xx.cpp +++ b/src/drivers/mb12xx/mb12xx.cpp @@ -444,18 +444,6 @@ MB12XX::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg); diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp index 3ccd4ddfd5..8369f57d24 100644 --- a/src/drivers/sf0x/sf0x.cpp +++ b/src/drivers/sf0x/sf0x.cpp @@ -479,18 +479,6 @@ SF0X::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return CDev::ioctl(filp, cmd, arg); diff --git a/src/drivers/sf1xx/sf1xx.cpp b/src/drivers/sf1xx/sf1xx.cpp index f6795260dc..6f470c41ab 100644 --- a/src/drivers/sf1xx/sf1xx.cpp +++ b/src/drivers/sf1xx/sf1xx.cpp @@ -442,18 +442,6 @@ SF1XX::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg); diff --git a/src/drivers/srf02/srf02.cpp b/src/drivers/srf02/srf02.cpp index d2d4281504..1d26b1c4b9 100644 --- a/src/drivers/srf02/srf02.cpp +++ b/src/drivers/srf02/srf02.cpp @@ -445,18 +445,6 @@ SRF02::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg); diff --git a/src/drivers/srf02_i2c/srf02_i2c.cpp b/src/drivers/srf02_i2c/srf02_i2c.cpp index d4e41044a8..5eeb0473c9 100644 --- a/src/drivers/srf02_i2c/srf02_i2c.cpp +++ b/src/drivers/srf02_i2c/srf02_i2c.cpp @@ -446,18 +446,6 @@ SRF02_I2C::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg); diff --git a/src/drivers/teraranger/teraranger.cpp b/src/drivers/teraranger/teraranger.cpp index 610fbfc8a2..38b46dc64b 100644 --- a/src/drivers/teraranger/teraranger.cpp +++ b/src/drivers/teraranger/teraranger.cpp @@ -509,18 +509,6 @@ TERARANGER::ioctl(struct file *filp, int cmd, unsigned long arg) /* XXX implement this */ return -EINVAL; - case RANGEFINDERIOCSETMINIUMDISTANCE: { - set_minimum_distance(*(float *)arg); - return 0; - } - break; - - case RANGEFINDERIOCSETMAXIUMDISTANCE: { - set_maximum_distance(*(float *)arg); - return 0; - } - break; - default: /* give it to the superclass */ return I2C::ioctl(filp, cmd, arg);