bootloader: Call clock::reset() before jumping to the application.

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

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index ca459fdc2eccf1c406b52b6423e8d40aab307be9..52a14738f62e0008d6ad4cc95b362432ab0f6170 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -35,11 +35,15 @@ 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);
 }
 
@@ -75,6 +79,7 @@ fn bootloader_requested() -> bool {
 
 #[no_mangle]
 pub unsafe extern fn main() {
+    watchdog::disable();
     clock::configure();
     systick::init();
     port::init();
@@ -84,6 +89,8 @@ pub unsafe extern fn main() {
     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, USB_PID);
 
@@ -95,5 +102,9 @@ pub unsafe extern fn main() {
         usb_serial::shutdown();
     }
 
+    disable_interrupts();
+
+    clock::reset();
+
     jump_to_application(APPLICATION_ADDR);
 }