application: Factor out the reset_requested() function.

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

diff --git a/src/application/main.rs b/src/application/main.rs
index 4cad3e326ee1720361a991c263b6e7ec3db33d16..247663081a9c25faf12d1f47557d214d947678a3 100644 (file)
--- a/src/application/main.rs
+++ b/src/application/main.rs
@@ -36,6 +36,7 @@ use common::port;
 use common::gpio;
 use common::nvic;
 use common::i2c;
+use common::spi;
 use common::uart;
 use common::usb_serial;
 use common::display;
@@ -75,10 +76,17 @@ impl Timer {
     }
 }
 
+fn reset_requested() -> bool {
+    (gpio::get(gpio::GPIOA) & (1 << 12)) == 0
+}
+
 #[inline(never)]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
     loop {
+        if reset_requested() {
+            nvic::system_reset();
+        }
     }
 }
 
@@ -101,6 +109,20 @@ pub unsafe extern "C" fn _start() -> ! {
     gpio::set_direction(gpio::GPIOB, 1 << 16, gpio::Direction::Output);
     port::set_af(port::PORTB, 16, 1);
 
+    // Configure pin for the MX25L's chip select line.
+    gpio::set_direction(gpio::GPIOD, 1 << 0, gpio::Direction::Output);
+    port::set_af(port::PORTD, 0, 1);
+    gpio::set(gpio::GPIOD, 1 << 0);
+
+    // Configure pins for SPI0.
+    port::set_af(port::PORTD, 1, 2);
+    port::set_af(port::PORTD, 2, 5);
+    port::set_af(port::PORTD, 3, 5);
+
+    spi::configure(spi::SPI0);
+
+    nvic::disable_irq(10); // SPI0
+
     // Configure pins for UART0.
     port::set_af(port::PORTE, 20, 4);
     port::set_af(port::PORTE, 21, 4);
@@ -212,7 +234,7 @@ pub unsafe extern "C" fn _start() -> ! {
             }
         });
 
-        if (gpio::get(gpio::GPIOA) & (1 << 12)) == 0 {
+        if reset_requested() {
             nvic::system_reset();
         }
     }