From 9a0b07d4deed2e711def110d34aafa0587d64039 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sun, 11 Sep 2016 22:59:24 +0000 Subject: [PATCH] stm32f1: adc: standardize temperature sensor API The TSVREFE bit is defined to only be present on ADC1, so drop the pointless adc argument. This has the added benefit of making the API consistent with all other STM32 adc parts. --- include/libopencm3/stm32/f1/adc.h | 4 ++-- lib/stm32/f1/adc.c | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h index e31181d6..281ae597 100644 --- a/include/libopencm3/stm32/f1/adc.h +++ b/include/libopencm3/stm32/f1/adc.h @@ -407,8 +407,8 @@ BEGIN_DECLS void adc_start_conversion_direct(uint32_t adc); void adc_set_dual_mode(uint32_t mode); -void adc_enable_temperature_sensor(uint32_t adc); -void adc_disable_temperature_sensor(uint32_t adc); +void adc_enable_temperature_sensor(void); +void adc_disable_temperature_sensor(void); void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger); void adc_enable_external_trigger_injected(uint32_t adc, uint32_t trigger); void adc_reset_calibration(uint32_t adc); diff --git a/lib/stm32/f1/adc.c b/lib/stm32/f1/adc.c index bdb899a3..7a108fc4 100644 --- a/lib/stm32/f1/adc.c +++ b/lib/stm32/f1/adc.c @@ -199,13 +199,11 @@ void adc_set_dual_mode(uint32_t mode) This enables both the sensor and the reference voltage measurements on channels 16 and 17. -@param[in] adc Unsigned int32. ADC block register address base @ref -adc_reg_base. */ -void adc_enable_temperature_sensor(uint32_t adc) +void adc_enable_temperature_sensor() { - ADC_CR2(adc) |= ADC_CR2_TSVREFE; + ADC_CR2(ADC1) |= ADC_CR2_TSVREFE; } /*---------------------------------------------------------------------------*/ @@ -213,14 +211,11 @@ void adc_enable_temperature_sensor(uint32_t adc) Disabling this will reduce power consumption from the sensor and the reference voltage measurements. - -@param[in] adc Unsigned int32. ADC block register address base @ref -adc_reg_base. */ -void adc_disable_temperature_sensor(uint32_t adc) +void adc_disable_temperature_sensor() { - ADC_CR2(adc) &= ~ADC_CR2_TSVREFE; + ADC_CR2(ADC1) &= ~ADC_CR2_TSVREFE; }