From ec34e21ead89ab750b3e7cc88c42f05f071992b5 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 19 Mar 2012 20:20:05 -0700 Subject: [PATCH] Changed parameter size for trigger enable. --- include/libopencm3/stm32/f1/adc.h | 6 +++--- lib/stm32/f1/adc.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h index 838bbeb5..563e75dc 100644 --- a/include/libopencm3/stm32/f1/adc.h +++ b/include/libopencm3/stm32/f1/adc.h @@ -298,7 +298,7 @@ #define ADC_CR2_JEXTSEL_TIM3_CC4 (0x4 << 12) #define ADC_CR2_JEXTSEL_TIM4_TRGO (0x5 << 12) #define ADC_CR2_JEXTSEL_EXTI15 (0x6 << 12) -#define ADC_CR2_JEXTSEL_JSWSTART (0x7 << 12) +#define ADC_CR2_JEXTSEL_JSWSTART (0x7 << 12) /* Software start. */ /* The following are the different meanings for ADC3 only. */ #define ADC_CR2_JEXTSEL_TIM4_CC3 (0x2 << 12) @@ -511,9 +511,9 @@ void adc_enable_temperature_sensor(u32 adc); void adc_disable_temperature_sensor(u32 adc); void adc_start_conversion_regular(u32 adc); void adc_start_conversion_injected(u32 adc); -void adc_enable_external_trigger_regular(u32 adc, u8 trigger); +void adc_enable_external_trigger_regular(u32 adc, u32 trigger); void adc_disable_external_trigger_regular(u32 adc); -void adc_enable_external_trigger_injected(u32 adc, u8 trigger); +void adc_enable_external_trigger_injected(u32 adc, u32 trigger); void adc_disable_external_trigger_injected(u32 adc); void adc_set_left_aligned(u32 adc); void adc_set_right_aligned(u32 adc); diff --git a/lib/stm32/f1/adc.c b/lib/stm32/f1/adc.c index a8d80373..f07164fd 100644 --- a/lib/stm32/f1/adc.c +++ b/lib/stm32/f1/adc.c @@ -193,7 +193,7 @@ void adc_start_conversion_injected(u32 adc) while (ADC_CR2(adc) & ADC_CR2_JSWSTART); } -void adc_enable_external_trigger_regular(u32 adc, u8 trigger) +void adc_enable_external_trigger_regular(u32 adc, u32 trigger) { u32 reg32; @@ -209,7 +209,7 @@ void adc_disable_external_trigger_regular(u32 adc) ADC_CR2(adc) &= ~ADC_CR2_EXTTRIG; } -void adc_enable_external_trigger_injected(u32 adc, u8 trigger) +void adc_enable_external_trigger_injected(u32 adc, u32 trigger) { u32 reg32;