*/
#![no_std]
-#![crate_type="staticlib"]
+#![no_main]
#[link(name="libcommon.rlib")]
extern crate common;
fn enable_interrupts();
fn disable_interrupts();
- fn jump_to_application(address: u32);
+ fn jump_to_application(address: u32) -> !;
}
#[cfg(bootloader_type = "intermediate")]
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;
}
}
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();
disable_interrupts();
+ clock::reset();
+
jump_to_application(APPLICATION_ADDR);
}