Some refactoring

1 files changed, 27 insertions, 8 deletions

diff --git a/wirish/wirish.c b/wirish/wirish.c
index e21f792..28e7130 100644
--- a/wirish/wirish.c
+++ b/wirish/wirish.c
@@ -27,21 +27,40 @@
  */
 
 #include "wirish.h"
-#include "rcc.h"
 #include "systick.h"
 #include "gpio.h"
 #include "nvic.h"
 #include "usb.h"
+#include "rcc.h"
+#include "flash.h"
+
+static void inline maple_flash_init(void) {
+   flash_enable_prefetch();
+   flash_set_latency(FLASH_WAIT_STATE_2);
+}
+
+static void inline maple_rcc_init(void) {
+   struct rcc_device maple_rcc_dev = {
+      .apb1_prescale = RCC_APB1_HCLK_DIV_2,
+      .apb2_prescale = RCC_APB2_HCLK_DIV_1,
+      .ahb_prescale  = RCC_AHB_SYSCLK_DIV_1,
+      .sysclk_src    = RCC_CLKSRC_PLL,
+      .pll_src       = RCC_PLLSRC_HSE,
+      .pll_mul       = RCC_PLLMUL_9
+   };
 
+   rcc_init(&maple_rcc_dev);
+}
 void init(void) {
-   rcc_init();
+   maple_flash_init();
+   maple_rcc_init();
    nvic_init();
    systick_init();
    gpio_init();
-   adc_init();
-   timer_init(1, 1);
-   timer_init(2, 1);
-   timer_init(3, 1);
-   timer_init(4, 1);
-   setupUSB();
+//   adc_init();
+//   timer_init(1, 1);
+//   timer_init(2, 1);
+//   timer_init(3, 1);
+//   timer_init(4, 1);
+//   setupUSB();
 }