From 90769437c91dd523e13e1437c4117dd40c76f372 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Tue, 5 Jun 2012 15:04:06 -0400 Subject: Provide wirish::priv::series_init() on F1. This lets us remove the weak definition in boards.cpp. Signed-off-by: Marti Bolivar --- wirish/boards.cpp | 7 ------- wirish/stm32f1/boards_setup.cpp | 10 +++++++--- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'wirish') diff --git a/wirish/boards.cpp b/wirish/boards.cpp index 471325f..5771df5 100644 --- a/wirish/boards.cpp +++ b/wirish/boards.cpp @@ -75,13 +75,6 @@ void init(void) { boardInit(); } -/* Provide a default no-op series_init() */ -namespace wirish { - namespace priv { - __weak void series_init(void) {} - } -} - /* Provide a default no-op boardInit(). */ __weak void boardInit(void) { } diff --git a/wirish/stm32f1/boards_setup.cpp b/wirish/stm32f1/boards_setup.cpp index da45730..d224ef2 100644 --- a/wirish/stm32f1/boards_setup.cpp +++ b/wirish/stm32f1/boards_setup.cpp @@ -71,9 +71,6 @@ namespace wirish { void board_setup_gpio(void) { gpio_init_all(); - // Initialize AFIO here, too, so peripheral remaps and external - // interrupts work out of the box. - afio_init(); } void board_setup_usb(void) { @@ -81,5 +78,12 @@ namespace wirish { SerialUSB.begin(); #endif } + + void series_init(void) { + // Initialize AFIO here, too, so peripheral remaps and external + // interrupts work out of the box. + afio_init(); + } + } } -- cgit v1.2.3