bootloader: Sanitize global interrupt handling.

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

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index 8c6f149e19534d93326a7df4abf290a8a37044ed..afd28dc994ca0794e33eb7f8d62d69dfda88d7db 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -40,6 +40,9 @@ use common::usb_serial;
 type Reg32 = register::Register<u32>;
 
 extern {
+    fn enable_interrupts();
+    fn disable_interrupts();
+
     fn jump_to_application(address: u32);
 }
 
@@ -49,6 +52,12 @@ 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);
 
@@ -71,20 +80,27 @@ fn bootloader_requested() -> bool {
 pub unsafe extern fn main() {
     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);
 
+    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();
+
     jump_to_application(APPLICATION_ADDR);
 }