diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-31 09:07:11 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-31 09:07:11 +0000 |
| commit | 19f97afd4d34430062ba5667df170f97772462a0 (patch) | |
| tree | 6d0a87dea2710b3753073c38e78b23f423ecaa5d /os/hal/platforms | |
| parent | 96fb9a85dfe9d3779baed9de1d4a7d5f857810dc (diff) | |
| download | ChibiOS-19f97afd4d34430062ba5667df170f97772462a0.tar.gz ChibiOS-19f97afd4d34430062ba5667df170f97772462a0.tar.bz2 ChibiOS-19f97afd4d34430062ba5667df170f97772462a0.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5001 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms')
| -rw-r--r-- | os/hal/platforms/STM32F3xx/adc_lld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/os/hal/platforms/STM32F3xx/adc_lld.c b/os/hal/platforms/STM32F3xx/adc_lld.c index 35960d84d..22b5bfcad 100644 --- a/os/hal/platforms/STM32F3xx/adc_lld.c +++ b/os/hal/platforms/STM32F3xx/adc_lld.c @@ -118,11 +118,11 @@ static void adc_lld_vreg_off(ADCDriver *adcp) { */
static void adc_lld_analog_on(ADCDriver *adcp) {
- adcp->adcm->CR = ADC_CR_ADEN;
+ adcp->adcm->CR |= ADC_CR_ADEN;
while ((adcp->adcm->ISR & ADC_ISR_ADRDY) == 0)
;
#if STM32_ADC_DUAL_MODE
- adcp->adcs->CR = ADC_CR_ADEN;
+ adcp->adcs->CR |= ADC_CR_ADEN;
while ((adcp->adcs->ISR & ADC_ISR_ADRDY) == 0)
;
#endif
@@ -135,11 +135,11 @@ static void adc_lld_analog_on(ADCDriver *adcp) { */
static void adc_lld_analog_off(ADCDriver *adcp) {
- adcp->adcm->CR = ADC_CR_ADDIS;
+ adcp->adcm->CR |= ADC_CR_ADDIS;
while ((adcp->adcm->CR & ADC_CR_ADDIS) != 0)
;
#if STM32_ADC_DUAL_MODE
- adcp->adcs->CR = ADC_CR_ADDIS;
+ adcp->adcs->CR |= ADC_CR_ADDIS;
while ((adcp->adcs->CR & ADC_CR_ADDIS) != 0)
;
#endif
@@ -531,10 +531,10 @@ void adc_lld_start_conversion(ADCDriver *adcp) { #endif /* !STM32_ADC_DUAL_MODE */
/* ADC configuration.*/
- adcp->adcm->CFGR = cfgr;
+ adcp->adcm->CFGR = cfgr;
/* Starting conversion.*/
- adcp->adcm->CR |= ADC_CR_ADSTART;
+ adcp->adcm->CR |= ADC_CR_ADSTART;
}
/**
|