From 9cd3e3d1cf3db1a33a5d51bd38473161daab0cbf Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 3 Nov 2018 16:01:57 -0400 Subject: [PATCH] distance sensors delete unused IOCTL SENSORIOCSQUEUEDEPTH --- src/drivers/barometer/bmp280/bmp280.cpp | 5 ----- .../distance_sensor/hc_sr04/hc_sr04.cpp | 18 ------------------ .../distance_sensor/ll40ls/LidarLiteI2C.cpp | 18 ------------------ src/drivers/distance_sensor/mb12xx/mb12xx.cpp | 18 ------------------ src/drivers/distance_sensor/sf0x/sf0x.cpp | 18 ------------------ src/drivers/distance_sensor/sf1xx/sf1xx.cpp | 18 ------------------ src/drivers/distance_sensor/srf02/srf02.cpp | 18 ------------------ .../distance_sensor/teraranger/teraranger.cpp | 18 ------------------ src/drivers/distance_sensor/tfmini/tfmini.cpp | 18 ------------------ 9 files changed, 149 deletions(-) diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp index 2ceab70e7c..2e79ef558c 100644 --- a/src/drivers/barometer/bmp280/bmp280.cpp +++ b/src/drivers/barometer/bmp280/bmp280.cpp @@ -339,11 +339,6 @@ BMP280::ioctl(struct file *filp, int cmd, unsigned long arg) switch (arg) { - case SENSOR_POLLRATE_MANUAL: - stop_cycle(); - _report_ticks = 0; - return OK; - case 0: return -EINVAL; diff --git a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp index 6d72a1c816..b6a5522fd5 100644 --- a/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp +++ b/src/drivers/distance_sensor/hc_sr04/hc_sr04.cpp @@ -409,24 +409,6 @@ HC_SR04::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.cpp b/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.cpp index 0e9e72fd44..abf72e5264 100644 --- a/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.cpp +++ b/src/drivers/distance_sensor/ll40ls/LidarLiteI2C.cpp @@ -230,24 +230,6 @@ ok: int LidarLiteI2C::ioctl(device::file_t *filp, int cmd, unsigned long arg) { switch (cmd) { - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - default: { int result = LidarLite::ioctl(filp, cmd, arg); diff --git a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp index 0ecba0f967..c172a46a5d 100644 --- a/src/drivers/distance_sensor/mb12xx/mb12xx.cpp +++ b/src/drivers/distance_sensor/mb12xx/mb12xx.cpp @@ -405,24 +405,6 @@ MB12XX::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/sf0x/sf0x.cpp b/src/drivers/distance_sensor/sf0x/sf0x.cpp index 2614adeb48..75f9444927 100644 --- a/src/drivers/distance_sensor/sf0x/sf0x.cpp +++ b/src/drivers/distance_sensor/sf0x/sf0x.cpp @@ -386,24 +386,6 @@ SF0X::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp index 85ac359198..c5877cbfc6 100644 --- a/src/drivers/distance_sensor/sf1xx/sf1xx.cpp +++ b/src/drivers/distance_sensor/sf1xx/sf1xx.cpp @@ -405,24 +405,6 @@ SF1XX::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp index 78dc8920a1..6f8d98cb57 100644 --- a/src/drivers/distance_sensor/srf02/srf02.cpp +++ b/src/drivers/distance_sensor/srf02/srf02.cpp @@ -405,24 +405,6 @@ SRF02::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/teraranger/teraranger.cpp b/src/drivers/distance_sensor/teraranger/teraranger.cpp index 4f9a72b3b9..71f09be92a 100644 --- a/src/drivers/distance_sensor/teraranger/teraranger.cpp +++ b/src/drivers/distance_sensor/teraranger/teraranger.cpp @@ -483,24 +483,6 @@ TERARANGER::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL; diff --git a/src/drivers/distance_sensor/tfmini/tfmini.cpp b/src/drivers/distance_sensor/tfmini/tfmini.cpp index 3094537314..c66ca3a0a0 100644 --- a/src/drivers/distance_sensor/tfmini/tfmini.cpp +++ b/src/drivers/distance_sensor/tfmini/tfmini.cpp @@ -423,24 +423,6 @@ TFMINI::ioctl(device::file_t *filp, int cmd, unsigned long arg) return (1000 / _measure_ticks); - case SENSORIOCSQUEUEDEPTH: { - /* lower bound is mandatory, upper bound is a sanity check */ - if ((arg < 1) || (arg > 100)) { - return -EINVAL; - } - - ATOMIC_ENTER; - - if (!_reports->resize(arg)) { - ATOMIC_LEAVE; - return -ENOMEM; - } - - ATOMIC_LEAVE; - - return OK; - } - case SENSORIOCRESET: /* XXX implement this */ return -EINVAL;