aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-03-19 20:20:05 -0700
committerPiotr Esden-Tempski2012-03-19 20:20:05 -0700
commitec34e21ead89ab750b3e7cc88c42f05f071992b5 (patch)
treee9f00f83bedb969440d337094998834ac7cce4da
parent451a5e227df60b925790bccb5ee5963a9e3ff585 (diff)
Changed parameter size for trigger enable.
-rw-r--r--include/libopencm3/stm32/f1/adc.h6
-rw-r--r--lib/stm32/f1/adc.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index 838bbeb..563e75d 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 a8d8037..f07164f 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;