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

stm32f3: adc: common registers are per master/slave

Browse Source 
They're not a single set just based on ADC1.
This commit is contained in:
Karl Palsson
2015-10-22 22:54:04 +00:00
parent 7373d3ad58
commit ca50f069b6
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/stm32/f3/adc.c
View File

@@ -931,10 +931,10 @@ void adc_power_on(uint32_t adc)
* adc_ccr_adcpre
*/
void adc_set_clk_prescale(uint32_t prescale)
void adc_set_clk_prescale(uint32_t adc, uint32_t prescale)
{
uint32_t reg32 = ((ADC_CCR & ~ADC_CCR_CKMODE_MASK) | prescale);
ADC_CCR = reg32;
uint32_t reg32 = ((ADC_CCR(adc) & ~ADC_CCR_CKMODE_MASK) | prescale);
ADC_CCR(adc) = reg32;
}
/*---------------------------------------------------------------------------*/
@@ -949,9 +949,9 @@ void adc_set_clk_prescale(uint32_t prescale)
* adc_multi_mode
*/
void adc_set_multi_mode(uint32_t mode)
void adc_set_multi_mode(uint32_t adc, uint32_t mode)
{
ADC_CCR |= mode;
ADC_CCR(adc) |= mode;
}
/*---------------------------------------------------------------------------*/
@@ -1177,7 +1177,7 @@ bool adc_awd(uint32_t adc)
void adc_enable_temperature_sensor()
{
ADC_CCR |= ADC_CCR_TSEN;
ADC12_CCR |= ADC_CCR_TSEN;
}
/*---------------------------------------------------------------------------*/
@@ -1192,7 +1192,7 @@ void adc_enable_temperature_sensor()
void adc_disable_temperature_sensor()
{
ADC_CCR &= ~ADC_CCR_TSEN;
ADC12_CCR &= ~ADC_CCR_TSEN;
}
/*---------------------------------------------------------------------------*/