X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=a5fe9832d30a7cf6d18ed9ca3e130e5477818163;hb=ce5666c12eb4333fd71adb58d8d5ad740fcffe8b;hp=0d2954909572a02f26432aef8147c5894dfaff47;hpb=69f57fcaee4e0a62192a87b21ed31142624ce009;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 0d29549..a5fe983 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -30,13 +30,20 @@ extern crate common;
 mod flash;
 mod bootloader;
 
+use common::register;
 use common::clock;
 use common::systick;
 use common::port;
 use common::gpio;
+use common::watchdog;
 use common::usb_serial;
 
+type Reg32 = register::Register<u32>;
+
 extern {
+    fn enable_interrupts();
+    fn disable_interrupts();
+
     fn jump_to_application(address: u32);
 }
 
@@ -46,6 +53,24 @@ const APPLICATION_ADDR: u32 = 0x0;
 #[cfg(bootloader_type = "final")]
 const APPLICATION_ADDR: u32 = 0x8000;
 
+#[cfg(bootloader_type = "intermediate")]
+const USB_PID: u16 = 0x635b;
+
+#[cfg(bootloader_type = "final")]
+const USB_PID: u16 = 0x635c;
+
+unsafe fn application_missing() -> bool {
+    let first_app_word = Reg32::new(APPLICATION_ADDR);
+
+    first_app_word.read() == 0xffffffff
+}
+
+#[cfg(bootloader_type = "intermediate")]
+fn bootloader_requested() -> bool {
+    true
+}
+
+#[cfg(bootloader_type = "final")]
 fn bootloader_requested() -> bool {
     let start_ticks = systick::now();
 
@@ -60,22 +85,32 @@ fn bootloader_requested() -> bool {
 
 #[no_mangle]
 pub unsafe extern fn main() {
+    watchdog::disable();
     clock::configure();
     systick::init();
+    port::init();
 
     // Configure lower left push button.
     gpio::set_direction(gpio::GPIOE, 1 << 24, gpio::Direction::Input);
     port::set_af(port::PORTE, 24, 1);
     port::set_pull(port::PORTE, 24, port::Pull::Up);
 
-    if bootloader_requested() {
-        usb_serial::init(0xf055, 0x635c);
+    enable_interrupts();
+
+    if application_missing() || bootloader_requested() {
+        usb_serial::init(0xf055, USB_PID);
 
         let mut b = bootloader::Bootloader::new();
 
-        while b.run() {
+        while b.run() || application_missing() {
         }
+
+        usb_serial::shutdown();
     }
 
+    disable_interrupts();
+
+    clock::reset();
+
     jump_to_application(APPLICATION_ADDR);
 }