X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fbootloader%2Fmain.rs;h=52a14738f62e0008d6ad4cc95b362432ab0f6170;hb=e44d325020a027013b5518aad1c059d3d0d5ad16;hp=ca459fdc2eccf1c406b52b6423e8d40aab307be9;hpb=ba2d74b93676c335eb41cdb6d75978cf20a9340a;p=gps-watch.git

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index ca459fd..52a1473 100644
--- 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);
 }