stm32: adc-v2: pull up start_regular

Little steps are easy to review, and easy to test.

4 files changed, 3 insertions, 5 deletions

diff --git a/include/libopencm3/stm32/common/adc_common_v2.h b/include/libopencm3/stm32/common/adc_common_v2.h
index 27cb5dea..a3ec05eb 100644
--- a/include/libopencm3/stm32/common/adc_common_v2.h
+++ b/include/libopencm3/stm32/common/adc_common_v2.h
@@ -201,6 +201,7 @@ void adc_disable_overrun_interrupt(uint32_t adc);
 bool adc_get_overrun_flag(uint32_t adc);
 void adc_clear_overrun_flag(uint32_t adc);
 uint32_t adc_read_regular(uint32_t adc);
+void adc_start_conversion_regular(uint32_t adc);
 
 END_DECLS
 
diff --git a/include/libopencm3/stm32/common/adc_common_v2_multi.h b/include/libopencm3/stm32/common/adc_common_v2_multi.h
index fb630415..4f1fd14d 100644
--- a/include/libopencm3/stm32/common/adc_common_v2_multi.h
+++ b/include/libopencm3/stm32/common/adc_common_v2_multi.h
@@ -149,6 +149,8 @@ specific memorymap.h header before including this header file.*/
 
 BEGIN_DECLS
 
+void adc_set_sample_time(uint32_t adc, uint8_t channel, uint8_t time);
+
 END_DECLS
 
 #endif
diff --git a/include/libopencm3/stm32/f0/adc.h b/include/libopencm3/stm32/f0/adc.h
index 8d7fa950..de3d5100 100644
--- a/include/libopencm3/stm32/f0/adc.h
+++ b/include/libopencm3/stm32/f0/adc.h
@@ -166,9 +166,6 @@ void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger,
 				uint32_t polarity);
 void adc_disable_external_trigger_regular(uint32_t adc);
 
-/* Conversion API */
-void adc_start_conversion_regular(uint32_t adc);
-
 /* Interrupt configuration */
 void adc_enable_watchdog_interrupt(uint32_t adc);
 void adc_disable_watchdog_interrupt(uint32_t adc);
diff --git a/include/libopencm3/stm32/f3/adc.h b/include/libopencm3/stm32/f3/adc.h
index b2d406e7..9f4639bb 100644
--- a/include/libopencm3/stm32/f3/adc.h
+++ b/include/libopencm3/stm32/f3/adc.h
@@ -597,11 +597,9 @@ void adc_enable_all_awd_interrupt(uint32_t adc);
 void adc_disable_all_awd_interrupt(uint32_t adc);
 void adc_enable_eos_interrupt(uint32_t adc);
 void adc_disable_eos_interrupt(uint32_t adc);
-void adc_start_conversion_regular(uint32_t adc);
 void adc_start_conversion_injected(uint32_t adc);
 void adc_disable_external_trigger_regular(uint32_t adc);
 void adc_disable_external_trigger_injected(uint32_t adc);
-void adc_set_sample_time(uint32_t adc, uint8_t channel, uint8_t time);
 void adc_set_watchdog_high_threshold(uint32_t adc, uint8_t threshold);
 void adc_set_watchdog_low_threshold(uint32_t adc, uint8_t threshold);
 void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[]);