diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
| commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
| tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /wirish | |
| parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
| parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
| download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip | |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/time.h | 11 | ||||
| -rw-r--r-- | wirish/wirish.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/wirish/time.h b/wirish/time.h index c925f74..8d3d074 100644 --- a/wirish/time.h +++ b/wirish/time.h @@ -30,17 +30,16 @@ #ifndef _TIME_H #define _TIME_H -#ifdef __cplusplus -extern "C"{ -#endif - +#include "libmaple.h" #include "nvic.h" #include "systick.h" #include "boards.h" -#define US_PER_MS 1000 +#ifdef __cplusplus +extern "C"{ +#endif -extern volatile uint32 systick_timer_millis; +#define US_PER_MS 1000 /** * Returns time (in milliseconds) since the beginning of program diff --git a/wirish/wirish.c b/wirish/wirish.c index db38050..5935f95 100644 --- a/wirish/wirish.c +++ b/wirish/wirish.c @@ -54,7 +54,7 @@ void init(void) { #if NR_DAC_PINS > 0 dac_init(); #endif - + /* initialize clocks */ rcc_clk_init(RCC_CLKSRC_PLL, RCC_PLLSRC_HSE, RCC_PLLMUL_9); rcc_set_prescaler(RCC_PRESCALER_AHB, RCC_AHB_SYSCLK_DIV_1); |