diff options
| author | Perry Hung <iperry@gmail.com> | 2011-03-21 02:25:23 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-03-21 02:25:23 -0400 |
| commit | 403498a28956507bb3063e6d7c190639c0279f47 (patch) | |
| tree | d68ccd6e85ac82bea1dff4066ad7fbd8003bdecb /wirish | |
| parent | 6245b43b26e47ece1927d28246611488c2f36e67 (diff) | |
| download | librambutan-403498a28956507bb3063e6d7c190639c0279f47.tar.gz librambutan-403498a28956507bb3063e6d7c190639c0279f47.zip | |
Revert "RCC refactor, bugfixes"
This reverts commit e4807a5010f59ab863ad2c96dc14caf65bf1ae60.
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/boards.cpp | 2 | ||||
| -rw-r--r-- | wirish/wirish.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wirish/boards.cpp b/wirish/boards.cpp index 66f008f..1256ba1 100644 --- a/wirish/boards.cpp +++ b/wirish/boards.cpp @@ -304,7 +304,7 @@ PinMapping PIN_MAP[NR_GPIO_PINS] = { /* D98/PG5 */ {GPIOG, 5, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PG}, /* D99/PD10 */ - {GPIOD, 10, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PD} + {GPIOD, 10, ADCx, 0, TIMERx, TIMERx, AFIO_EXTI_PDD} }; #elif defined(BOARD_maple_mini) diff --git a/wirish/wirish.cpp b/wirish/wirish.cpp index c5a9e30..65d0262 100644 --- a/wirish/wirish.cpp +++ b/wirish/wirish.cpp @@ -53,7 +53,7 @@ void init(void) { #endif /* initialize clocks */ - rcc_clk_init(RCC_CLKSRC_PLL, RCC_CFGR_PLLSRC_HSE, RCC_CFGR_PLLMUL_9); + rcc_clk_init(RCC_CLKSRC_PLL, RCC_PLLSRC_HSE, RCC_PLLMUL_9); rcc_set_prescaler(RCC_PRESCALER_AHB, RCC_AHB_SYSCLK_DIV_1); rcc_set_prescaler(RCC_PRESCALER_APB1, RCC_APB1_HCLK_DIV_2); rcc_set_prescaler(RCC_PRESCALER_APB2, RCC_APB2_HCLK_DIV_1); |