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

feat: ✨ Add info!/warn! to plain println! 

These functions additionally log current time.
This commit is contained in:
Berkus Decker 2023-07-29 21:36:14 +03:00 committed by Berkus Decker
parent 84fbdcc707
commit 0f435d7152
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nucleus/src/main.rs
View File

@ -39,13 +39,13 @@ use {
machine::{ machine::{
arch, arch,
console::console, console::console,
entry, memory, entry, info, memory,
platform::rpi3::{ platform::rpi3::{
display::{Color, DrawError}, display::{Color, DrawError},
mailbox::{channel, Mailbox, MailboxOps}, mailbox::{channel, Mailbox, MailboxOps},
vc::VC, vc::VC,
}, },
println, println, warn,
}, },
}; };
@ -105,7 +105,7 @@ fn init_mmu() {
panic!("MMU: {}", e); panic!("MMU: {}", e);
} }
} }
println!("[!] MMU initialised"); info!("[!] MMU initialised");
print_mmu_state_and_features(); print_mmu_state_and_features();
} }
@ -118,7 +118,7 @@ fn init_exception_traps() {
arch::traps::set_vbar_el1_checked(__EXCEPTION_VECTORS_START.get() as u64) arch::traps::set_vbar_el1_checked(__EXCEPTION_VECTORS_START.get() as u64)
.expect("Vector table properly aligned!"); .expect("Vector table properly aligned!");
} }
println!("[!] Exception traps set up"); info!("[!] Exception traps set up");
} }
// fn init_uart_serial() { // fn init_uart_serial() {
@ -167,7 +167,7 @@ fn command_prompt() {
'cmd_loop: loop { 'cmd_loop: loop {
let mut buf = [0u8; 64]; let mut buf = [0u8; 64];
match console().command_prompt(&mut buf) { match machine::console::command_prompt(&mut buf) {
b"mmu" => init_mmu(), b"mmu" => init_mmu(),
b"feats" => print_mmu_state_and_features(), b"feats" => print_mmu_state_and_features(),
b"disp" => check_display_init(), b"disp" => check_display_init(),
@ -177,7 +177,7 @@ fn command_prompt() {
b"led off" => set_led(false), b"led off" => set_led(false),
b"help" => print_help(), b"help" => print_help(),
b"end" => break 'cmd_loop, b"end" => break 'cmd_loop,
x => println!("[!] Unknown command {:?}, try 'help'", x), x => warn!("[!] Unknown command {:?}, try 'help'", x),
} }
} }
} }
@ -203,8 +203,8 @@ fn set_led(enable: bool) {
mbox.call(channel::PropertyTagsArmToVc) mbox.call(channel::PropertyTagsArmToVc)
.map_err(|e| { .map_err(|e| {
println!("Mailbox call returned error {}", e); warn!("Mailbox call returned error {}", e);
println!("Mailbox contents: {:?}", mbox); warn!("Mailbox contents: {:?}", mbox);
}) })
.ok(); .ok();
} }
@ -212,12 +212,12 @@ fn set_led(enable: bool) {
fn reboot() -> ! { fn reboot() -> ! {
cfg_if! { cfg_if! {
if #[cfg(feature = "qemu")] { if #[cfg(feature = "qemu")] {
println!("Bye, shutting down QEMU"); info!("Bye, shutting down QEMU");
machine::qemu::semihosting::exit_success() machine::qemu::semihosting::exit_success()
} else { } else {
use machine::platform::rpi3::power::Power; use machine::platform::rpi3::power::Power;
println!("Bye, going to reset now"); info!("Bye, going to reset now");
Power::default().reset() Power::default().reset()
} }
} }
@ -226,17 +226,17 @@ fn reboot() -> ! {
fn check_display_init() { fn check_display_init() {
display_graphics() display_graphics()
.map_err(|e| { .map_err(|e| {
println!("Error in display: {}", e); warn!("Error in display: {}", e);
}) })
.ok(); .ok();
} }
fn display_graphics() -> Result<(), DrawError> { fn display_graphics() -> Result<(), DrawError> {
if let Ok(mut display) = VC::init_fb(800, 600, 32) { if let Ok(mut display) = VC::init_fb(800, 600, 32) {
println!("Display created"); info!("Display created");
display.clear(Color::black()); display.clear(Color::black());
println!("Display cleared"); info!("Display cleared");
display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64)); display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64));
display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255))?; display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255))?;
@ -266,7 +266,7 @@ fn check_data_abort_trap() {
let big_addr: u64 = 3 * 1024 * 1024 * 1024; let big_addr: u64 = 3 * 1024 * 1024 * 1024;
unsafe { core::ptr::read_volatile(big_addr as *mut u64) }; unsafe { core::ptr::read_volatile(big_addr as *mut u64) };
println!("[i] Whoa! We recovered from an exception."); info!("[i] Whoa! We recovered from an exception.");
} }
#[cfg(test)] #[cfg(test)]