From 451a5e227df60b925790bccb5ee5963a9e3ff585 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 19 Mar 2012 17:38:24 -0700 Subject: Started some cleanup in the ADC headers and convenience code. --- lib/stm32/f1/adc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/stm32/f1') diff --git a/lib/stm32/f1/adc.c b/lib/stm32/f1/adc.c index 7df1835..a8d8037 100644 --- a/lib/stm32/f1/adc.c +++ b/lib/stm32/f1/adc.c @@ -197,9 +197,9 @@ void adc_enable_external_trigger_regular(u32 adc, u8 trigger) { u32 reg32; - reg32 = (ADC_CR2(adc) & 0xfff1ffff); /* Clear bits [19:17]. */ + reg32 = (ADC_CR2(adc) & ~(ADC_CR2_EXTSEL_MASK)); if (trigger < 8) - reg32 |= (trigger << ADC_CR2_EXTSEL_LSB); + reg32 |= (trigger); ADC_CR2(adc) = reg32; ADC_CR2(adc) |= ADC_CR2_EXTTRIG; } @@ -213,9 +213,9 @@ void adc_enable_external_trigger_injected(u32 adc, u8 trigger) { u32 reg32; - reg32 = (ADC_CR2(adc) & 0xffff8fff); /* Clear bits [12:14]. */ + reg32 = (ADC_CR2(adc) & ~(ADC_CR2_JEXTSEL_MASK)); /* Clear bits [12:14]. */ if (trigger < 8) - reg32 |= (trigger << ADC_CR2_JEXTSEL_LSB); + reg32 |= (trigger); ADC_CR2(adc) = reg32; ADC_CR2(adc) |= ADC_CR2_JEXTTRIG; } -- cgit v1.2.3