bootloader: Initialize systick on startup.

[gps-watch.git] / src / bootloader / main.rs

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index fbd3aa0c01c03d6bbe34352e97b5349920f1a6ad..0f863fc4af6338c033edb1df7f847c7465196ce1 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -27,17 +27,32 @@
 
 extern crate common;
 
+mod flash;
+mod bootloader;
+
 use common::clock;
+use common::systick;
 use common::usb_serial;
 
+extern {
+    fn jump_to_application(address: u32);
+}
+
+const APPLICATION_ADDR: u32 = 0x0;
+
 #[no_mangle]
 pub unsafe extern fn main() {
     clock::configure();
+    systick::init();
 
     if true {
-        usb_serial::init();
+        usb_serial::init(0xf055, 0x635c);
+
+        let mut b = bootloader::Bootloader::new();
 
-        loop {
+        while b.run() {
         }
     }
+
+    jump_to_application(__application_addr);
 }