Cleanup in AnalogIn: remove functions that are unnecessary and no longer part of the API.

pull/1501/head
Steven Cooreman 2016-01-06 12:06:34 +01:00
parent f20e96008d
commit b233828ebb
1 changed files with 5 additions and 40 deletions

View File

@ -41,26 +41,16 @@
#include "em_adc.h"
#include "em_cmu.h"
uint8_t analogin_get_index(analogin_t *obj)
{
return 0; //only one module availalbe
}
void analogin_preinit(analogin_t *obj, PinName pin)
{
obj->adc = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT((int) obj->adc != NC);
obj->channel = pin_location(pin, PinMap_ADC);
MBED_ASSERT((int) obj->channel != NC);
}
void analogin_init(analogin_t *obj, PinName pin)
{
static uint8_t adc_initialized = 0;
/* Init structure */
analogin_preinit(obj, pin);
obj->adc = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT((int) obj->adc != NC);
obj->channel = pin_location(pin, PinMap_ADC);
MBED_ASSERT((int) obj->channel != NC);
/* Only initialize the ADC once */
if (!adc_initialized) {
@ -86,31 +76,6 @@ void analogin_init(analogin_t *obj, PinName pin)
}
}
void analogin_enable(analogin_t *obj, uint8_t enable)
{
//not avail for EFM32
}
void analogin_enable_pins(analogin_t *obj, uint8_t enable)
{
//not avail for EFM32
}
void analogin_enable_interrupt(analogin_t *obj, uint32_t address, uint8_t enable)
{
NVIC_SetVector(ADC0_IRQn, address);
if (enable) {
// enable end of conversion interrupt
ADC_IntEnable(obj->adc, ADC_IEN_SCAN);
ADC_IntSet(obj->adc, ADC_IF_SCAN);
NVIC_EnableIRQ(ADC0_IRQn);
} else {
ADC_IntDisable(obj->adc, ADC_IEN_SCAN);
ADC_IntClear(obj->adc, ADC_IF_SCAN);
NVIC_DisableIRQ(ADC0_IRQn);
}
}
uint16_t analogin_read_u16(analogin_t *obj)
{
ADC_TypeDef *adc = obj->adc;