metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[temp] disable serial console

This commit is contained in:
Berkus Decker 2019-03-02 19:18:49 +02:00
parent 21303497cd
commit 80fb9ede35
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main.rs
View File

@ -55,30 +55,31 @@ static CONSOLE: sync::NullLock<devices::Console> = sync::NullLock::new(devices::
// Kernel entry point
// arch crate is responsible for calling this
fn kmain() -> ! {
let gpio = GPIO::new_default();
// let gpio = GPIO::new_default();
let uart = platform::MiniUart::new_default();
uart.init(&gpio);
CONSOLE.lock(|c| {
// Moves uart into the global CONSOLE. It is not accessible
// anymore for the remaining parts of kernel_entry().
c.replace_with(uart.into());
});
// let uart = platform::MiniUart::new_default();
// uart.init(&gpio);
// CONSOLE.lock(|c| {
// // Moves uart into the global CONSOLE. It is not accessible
// // anymore for the remaining parts of kernel_entry().
// c.replace_with(uart.into());
// });
let uart = platform::PL011Uart::new_default();
// let uart = platform::PL011Uart::new_default();
let mut mbox = platform::mailbox::Mailbox::new();
// let mut mbox = platform::mailbox::Mailbox::new();
// match uart.init(&mut mbox, &gpio) {
// Ok(_) => {
// CONSOLE.lock(|c| {
// // Moves uart into the global CONSOLE. It is not accessible
// // anymore for the remaining parts of kernel_entry().
// c.replace_with(uart.into());
// });
// }
// Err(_) => endless_sleep(),
// }
match uart.init(&mut mbox, &gpio) {
Ok(_) => {
CONSOLE.lock(|c| {
// Moves uart into the global CONSOLE. It is not accessible
// anymore for the remaining parts of kernel_entry().
c.replace_with(uart.into());
});
}
Err(_) => endless_sleep(),
}
let mut out = Output::new();
writeln!(out, "JLink RTT is working!"); // @todo RttConsole