common: Initialize the usb_serial module with an USB VID and PID pair.

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

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 16255f601b4a0c2ab8874fe19d434174a3312a59..88a9a0bcf263c1cef50b517310bbd2fdbf8f6b88 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -28,18 +28,29 @@
 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();
 
     if true {
-        usb_serial::init();
+        usb_serial::init(0x1fc9, 0x0094);
 
-        loop {
+        let mut b = bootloader::Bootloader::new();
+
+        while b.run() {
         }
     }
+
+    jump_to_application(__application_addr);
 }