X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=a7755030bb0f5da0bd11d0a1687de17f090cac8b;hb=451b8e1950510db8c8779455bae50879b172e872;hp=8c6f149e19534d93326a7df4abf290a8a37044ed;hpb=b1226e2bd4adc31d81d02faf507f3d9c5dfe850e;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 8c6f149..a775503 100644
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -22,7 +22,7 @@
  */
 
 #![no_std]
-#![crate_type="staticlib"]
+#![no_main]
 #[link(name="libcommon.rlib")]
 
 extern crate common;
@@ -35,12 +35,16 @@ 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 jump_to_application(address: u32);
+    fn enable_interrupts();
+    fn disable_interrupts();
+
+    fn jump_to_application(address: u32) -> !;
 }
 
 #[cfg(bootloader_type = "intermediate")]
@@ -49,17 +53,29 @@ 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();
 
     while !systick::has_timeout_ms(start_ticks, 3000) {
-        if (gpio::get(gpio::GPIOE) & (1 << 24)) == 0 {
+        if (gpio::get(gpio::GPIOE) & (1 << 31)) == 0 {
             return true;
         }
     }
@@ -67,24 +83,41 @@ fn bootloader_requested() -> bool {
     false
 }
 
+#[inline(never)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {
+    }
+}
+
 #[no_mangle]
-pub unsafe extern fn main() {
+pub unsafe extern "C" fn _start() -> ! {
+    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);
+    // Configure middle left push button.
+    gpio::set_direction(gpio::GPIOE, 1 << 31, gpio::Direction::Input);
+    port::set_af(port::PORTE, 31, 1);
+    port::set_pull(port::PORTE, 31, port::Pull::Up);
+
+    enable_interrupts();
 
     if application_missing() || bootloader_requested() {
-        usb_serial::init(0xf055, 0x635c);
+        usb_serial::init(0xf055, USB_PID);
 
         let mut b = bootloader::Bootloader::new();
 
         while b.run() || application_missing() {
         }
+
+        usb_serial::shutdown();
     }
 
+    disable_interrupts();
+
+    clock::reset();
+
     jump_to_application(APPLICATION_ADDR);
 }