EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32f0: adc: external trigger selection to unshifted

Browse Source 
Cleanup one function at a time.  Use the correct doxygen references, use
unshifted forms in user facing apis.  Yes, only the trigger at the
moment, as the polarity is shared.

Signed-off-by: Karl Palsson <karlp@tweak.au>
This commit is contained in:
Karl Palsson
2023-02-02 22:47:44 +00:00
parent 69e4ade399
commit e54650fba4
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/libopencm3/stm32/f0/adc.h
View File

@@ -78,8 +78,7 @@
/* EXTSEL[2:0]: External trigger selection for regular group */
#define ADC_CFGR1_EXTSEL_SHIFT 6
#define ADC_CFGR1_EXTSEL (0x7 << ADC_CFGR1_EXTSEL_SHIFT)
#define ADC_CFGR1_EXTSEL_VAL(x) ((x) << ADC_CFGR1_EXTSEL_SHIFT)
#define ADC_CFGR1_EXTSEL_MASK 0x7
/** @defgroup adc_cfgr1_extsel ADC external trigger selection values
*@{*/
#define ADC_CFGR1_EXTSEL_TIM1_TRGO 0x0

16
lib/stm32/f0/adc.c
View File

@@ -155,18 +155,18 @@ void adc_set_operation_mode(uint32_t adc, enum adc_opmode opmode)
* sets the polarity of the trigger event: rising or falling edge or both. Note
* that if the trigger polarity is zero, triggering is disabled.
*
* @param[in] adc Unsigned int32. ADC base address (@ref adc_reg_base)
* @param[in] trigger Unsigned int32. Trigger identifier
* @ref adc_trigger_regular
* @param[in] polarity Unsigned int32. Trigger polarity @ref
* adc_trigger_polarity_regular
* @param[in] adc peripheral of choice (@ref adc_reg_base)
* @param[in] trigger external trigger @ref adc_cfgr1_extsel
* @param[in] polarity Trigger polarity @ref adc_cfgr1_exten
*/
void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger,
uint32_t polarity)
{
ADC_CFGR1(adc) = (ADC_CFGR1(adc) & ~ADC_CFGR1_EXTSEL) | trigger;
ADC_CFGR1(adc) = (ADC_CFGR1(adc) & ~ADC_CFGR1_EXTEN_MASK) | polarity;
uint32_t reg = ADC_CFGR1(adc);
reg &= ~(ADC_CFGR1_EXTSEL_MASK << ADC_CFGR1_EXTSEL_SHIFT);
reg &= ~(ADC_CFGR1_EXTEN_MASK);
reg |= polarity | (trigger << ADC_CFGR1_EXTSEL_SHIFT);
ADC_CFGR1(adc) = reg;
}
/*---------------------------------------------------------------------------*/