projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Add the i2c module.
[gps-watch.git]
/
src
/
bootloader
/
main.rs
diff --git
a/src/bootloader/main.rs
b/src/bootloader/main.rs
index afd28dc994ca0794e33eb7f8d62d69dfda88d7db..52a14738f62e0008d6ad4cc95b362432ab0f6170 100644
(file)
--- a/
src/bootloader/main.rs
+++ b/
src/bootloader/main.rs
@@
-35,6
+35,7
@@
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>;
use common::usb_serial;
type Reg32 = register::Register<u32>;
@@
-78,6
+79,7
@@
fn bootloader_requested() -> bool {
#[no_mangle]
pub unsafe extern fn main() {
#[no_mangle]
pub unsafe extern fn main() {
+ watchdog::disable();
clock::configure();
systick::init();
port::init();
clock::configure();
systick::init();
port::init();
@@
-102,5
+104,7
@@
pub unsafe extern fn main() {
disable_interrupts();
disable_interrupts();
+ clock::reset();
+
jump_to_application(APPLICATION_ADDR);
}
jump_to_application(APPLICATION_ADDR);
}