From 65f9005bc67cb4609b72006a2b36666a6dd053b5 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 14 Dec 2017 11:59:41 -0500 Subject: [PATCH] delete unused RC_INPUT_GET --- src/drivers/drv_rc_input.h | 3 --- src/drivers/px4io/px4io.cpp | 38 ------------------------------------- 2 files changed, 41 deletions(-) diff --git a/src/drivers/drv_rc_input.h b/src/drivers/drv_rc_input.h index d5f0ab8918..674dd78b31 100644 --- a/src/drivers/drv_rc_input.h +++ b/src/drivers/drv_rc_input.h @@ -88,9 +88,6 @@ typedef uint16_t rc_input_t; #define _RC_INPUT_BASE 0x2b00 -/** Fetch R/C input values into (rc_input_values *)arg */ -#define RC_INPUT_GET _IOC(_RC_INPUT_BASE, 0) - /** Enable RSSI input via ADC */ #define RC_INPUT_ENABLE_RSSI_ANALOG _IOC(_RC_INPUT_BASE, 1) diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index b5f21c7686..2b46bbb063 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -2764,44 +2764,6 @@ PX4IO::ioctl(file *filep, int cmd, unsigned long arg) break; } - case RC_INPUT_GET: { - uint16_t status; - rc_input_values *rc_val = (rc_input_values *)arg; - - ret = io_reg_get(PX4IO_PAGE_STATUS, PX4IO_P_STATUS_FLAGS, &status, 1); - - if (ret != OK) { - break; - } - - /* if no R/C input, don't try to fetch anything */ - if (!(status & PX4IO_P_STATUS_FLAGS_RC_OK)) { - ret = -ENOTCONN; - break; - } - - /* sort out the source of the values */ - if (status & PX4IO_P_STATUS_FLAGS_RC_PPM) { - rc_val->input_source = input_rc_s::RC_INPUT_SOURCE_PX4IO_PPM; - - } else if (status & PX4IO_P_STATUS_FLAGS_RC_DSM) { - rc_val->input_source = input_rc_s::RC_INPUT_SOURCE_PX4IO_SPEKTRUM; - - } else if (status & PX4IO_P_STATUS_FLAGS_RC_SBUS) { - rc_val->input_source = input_rc_s::RC_INPUT_SOURCE_PX4IO_SBUS; - - } else if (status & PX4IO_P_STATUS_FLAGS_RC_ST24) { - rc_val->input_source = input_rc_s::RC_INPUT_SOURCE_PX4IO_ST24; - - } else { - rc_val->input_source = input_rc_s::RC_INPUT_SOURCE_UNKNOWN; - } - - /* read raw R/C input values */ - ret = io_reg_get(PX4IO_PAGE_RAW_RC_INPUT, PX4IO_P_RAW_RC_BASE, &(rc_val->values[0]), _max_rc_input); - break; - } - case PX4IO_SET_DEBUG: /* set the debug level */ ret = io_reg_set(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_SET_DEBUG, arg);