pios_adc: remove DevicePinGet.

flight/PiOS/Common/pios_adc.c

@@ -114,25 +114,6 @@ int32_t PIOS_ADC_Init(uintptr_t *adc_id, const struct pios_adc_driver *driver, u
 	return 0;
 }
 
-/**
- * @brief Gets the ADC value of the given pin of the device
- * \param[in] adc_id pointer to the device to read from
- * \param[in] device_pin pin from device to be read
- * \return the value of the pin or -1 if error
- */
-int32_t PIOS_ADC_DevicePinGet(uintptr_t adc_id, uint32_t device_pin)
-{
-	struct pios_adc_dev * adc_dev = (struct pios_adc_dev *) adc_id;
-
-	if (!PIOS_ADC_validate(adc_dev)) {
-		return -1;
-	}
-	if (adc_dev->driver->get_pin)
-		return (adc_dev->driver->get_pin)(adc_dev->lower_id, device_pin);
-	else
-		return -1;
-}
-
 /**
  * @brief Checks if a given pin is available on the given device
  * \param[in] adc_id handle of the device to read

flight/PiOS/inc/pios_adc.h

@@ -44,7 +44,6 @@ struct pios_adc_driver {
 };
 
 /* Public Functions */
-extern int32_t PIOS_ADC_DevicePinGet(uintptr_t adc_id, uint32_t device_pin);
 extern bool PIOS_ADC_Available(uintptr_t adc_id, uint32_t device_pin);
 extern int32_t PIOS_ADC_GetChannelRaw(uint32_t channel);
 extern float PIOS_ADC_GetChannelVolt(uint32_t channel);

flight/targets/flyingpio/fw/main.c

@@ -152,18 +152,18 @@ static void generate_status_message(int *resp_len)
 
 	resp->valid_messages_recvd = msg_num;
 
-	for (int i=0; i<FPPROTO_MAX_RCCHANS; i++) {
+	for (int i = 0; i < FPPROTO_MAX_RCCHANS; i++) {
 		if (pios_rcvr_group_map[0]) {
 			resp->chan_data[i] =
 				/* 1-offset vs 0-offset grr */
-				PIOS_RCVR_Read(pios_rcvr_group_map[0], i+1);
+				PIOS_RCVR_Read(pios_rcvr_group_map[0], i + 1);
 		} else {
 			resp->chan_data[i] = PIOS_RCVR_NODRIVER;
 		}
 	}
 
-	for (int i=0; i<FPPROTO_MAX_ADCCHANS; i++) {
-		resp->adc_data[i] = PIOS_ADC_DevicePinGet(adc_id, i);
+	for (int i = 0; i < FPPROTO_MAX_ADCCHANS; i++) {
+		resp->adc_data[i] = PIOS_ADC_GetChannelRaw(i);
 	}
 
 	flyingpi_calc_crc(&tx_buf, true, resp_len);