diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-06-05 15:04:06 -0400 | 
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-06-07 03:38:29 -0400 | 
| commit | 90769437c91dd523e13e1437c4117dd40c76f372 (patch) | |
| tree | 6ba7d7de1f4abe6a8c56ab134b58d2ab7d9edbb7 | |
| parent | e6ba29161ee79ad8500b4d74ff11d123b9f6a17f (diff) | |
| download | librambutan-90769437c91dd523e13e1437c4117dd40c76f372.tar.gz librambutan-90769437c91dd523e13e1437c4117dd40c76f372.zip | |
Provide wirish::priv::series_init() on F1.
This lets us remove the weak definition in boards.cpp.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| -rw-r--r-- | wirish/boards.cpp | 7 | ||||
| -rw-r--r-- | wirish/stm32f1/boards_setup.cpp | 10 | 
2 files changed, 7 insertions, 10 deletions
| 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(); +        } +      }  } | 
