jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed parameter size for trigger enable.

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2012-03-19 20:20:05 -07:00
parent 451a5e227d
commit ec34e21ead
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libopencm3/stm32/f1/adc.h
View File

@ -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);

4
lib/stm32/f1/adc.c
View File

@ -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;