projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
application: Extract time and position from GPS NMEA messages.
[gps-watch.git]
/
src
/
bootloader
/
main.rs
diff --git
a/src/bootloader/main.rs
b/src/bootloader/main.rs
index 50c32a4e12f5a0b409047fb40d77aa741431dda1..815429ed1410645a15910edbc56eaac5a719bd11 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")]
@@
-49,12
+53,24
@@
const APPLICATION_ADDR: u32 = 0x0;
#[cfg(bootloader_type = "final")]
const APPLICATION_ADDR: u32 = 0x8000;
#[cfg(bootloader_type = "final")]
const APPLICATION_ADDR: u32 = 0x8000;
+#[cfg(bootloader_type = "intermediate")]
+const USB_PID: u16 = 0x635b;
+
+#[cfg(bootloader_type = "final")]
+const USB_PID: u16 = 0x635c;
+
unsafe fn application_missing() -> bool {
let first_app_word = Reg32::new(APPLICATION_ADDR);
first_app_word.read() == 0xffffffff
}
unsafe fn application_missing() -> bool {
let first_app_word = Reg32::new(APPLICATION_ADDR);
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();
@@
-68,7
+84,8
@@
fn bootloader_requested() -> bool {
}
#[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();
@@
-78,8
+95,10
@@
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() {
if application_missing() || bootloader_requested() {
- usb_serial::init(0xf055,
0x635c
);
+ usb_serial::init(0xf055,
USB_PID
);
let mut b = bootloader::Bootloader::new();
let mut b = bootloader::Bootloader::new();
@@
-89,5
+108,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);
}