projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Move panic handler out of libcommon.
[gps-watch.git]
/
src
/
bootloader
/
main.rs
diff --git
a/src/bootloader/main.rs
b/src/bootloader/main.rs
index ca459fdc2eccf1c406b52b6423e8d40aab307be9..2ce598050464a12deedb8c32c94153ca319f653e 100644
(file)
--- a/
src/bootloader/main.rs
+++ b/
src/bootloader/main.rs
@@
-22,7
+22,7
@@
*/
#![no_std]
*/
#![no_std]
-#![
crate_type="staticlib"
]
+#![
no_main
]
#[link(name="libcommon.rlib")]
extern crate common;
#[link(name="libcommon.rlib")]
extern crate common;
@@
-35,12
+35,16
@@
use common::clock;
use common::systick;
use common::port;
use common::gpio;
use common::systick;
use common::port;
use common::gpio;
+use common::watchdog;
use common::usb_serial;
type Reg32 = register::Register<u32>;
extern {
use common::usb_serial;
type Reg32 = register::Register<u32>;
extern {
- fn jump_to_application(address: u32);
+ fn enable_interrupts();
+ fn disable_interrupts();
+
+ fn jump_to_application(address: u32) -> !;
}
#[cfg(bootloader_type = "intermediate")]
}
#[cfg(bootloader_type = "intermediate")]
@@
-61,6
+65,12
@@
unsafe fn application_missing() -> bool {
first_app_word.read() == 0xffffffff
}
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();
fn bootloader_requested() -> bool {
let start_ticks = systick::now();
@@
-73,8
+83,16
@@
fn bootloader_requested() -> bool {
false
}
false
}
+#[inline(never)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+ loop {
+ }
+}
+
#[no_mangle]
#[no_mangle]
-pub unsafe extern fn main() {
+pub unsafe extern "C" fn _start() -> ! {
+ watchdog::disable();
clock::configure();
systick::init();
port::init();
clock::configure();
systick::init();
port::init();
@@
-84,6
+102,8
@@
pub unsafe extern fn main() {
port::set_af(port::PORTE, 24, 1);
port::set_pull(port::PORTE, 24, port::Pull::Up);
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);
if application_missing() || bootloader_requested() {
usb_serial::init(0xf055, USB_PID);
@@
-95,5
+115,9
@@
pub unsafe extern fn main() {
usb_serial::shutdown();
}
usb_serial::shutdown();
}
+ disable_interrupts();
+
+ clock::reset();
+
jump_to_application(APPLICATION_ADDR);
}
jump_to_application(APPLICATION_ADDR);
}