X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=d83702e734c5369c31cbabd84d6174e7aff12825;hb=94010950b20f843266d509e0da9b7f212440d08f;hp=9a0cbb4f48706007e934c35d35b7ffa1db38dcb3;hpb=f7d432a397a62bfc5cd60873ce4fb6aa6267a3ea;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 9a0cbb4..d83702e 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -27,12 +27,30 @@
 
 extern crate common;
 
+mod flash;
+mod bootloader;
+
 use common::clock;
+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();
 
-    loop {
+    if true {
+        usb_serial::init();
+
+        let mut b = bootloader::Bootloader::new();
+
+        while b.run() {
+        }
     }
+
+    jump_to_application(__application_addr);
 }