From bb56af20ed036bed8d9d2f8bf68376ce4d55e79a Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Wed, 24 Aug 2022 19:33:08 -0700 Subject: Rename to serial print --- src/kernel.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/kernel.rs') diff --git a/src/kernel.rs b/src/kernel.rs index 24de020..ff33f48 100644 --- a/src/kernel.rs +++ b/src/kernel.rs @@ -44,9 +44,9 @@ use crate::mem::alloc::allocator; /// - format! /// - UART /// - print! -/// - println! +/// - serial_println! /// - vprint! -/// - vprintln! +/// - vserial_println! /// /// After initialization, jump to /// the regular main. @@ -65,22 +65,22 @@ fn kernel_main() -> ! { #[cfg(feature = "flag")] { draw::draw_ukraine_flag(); - println!(); + serial_println!(); draw::draw_american_flag(); - println!(); + serial_println!(); } - println!( + serial_println!( "\x1b[91mInitialized\x1b[0m \x1b[92m{}\x1b[0m \x1b[93mv{}\x1b[0m", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION") ); - println!( + serial_println!( "\x1b[94mAuthors:\x1b[0m \x1b[95m{}\x1b[0m", env!("CARGO_PKG_AUTHORS") ); use crate::console::interface::Statistics; - println!( + serial_println!( "Characters written to UART: \x1b[91m{}\x1b[0m", console().chars_written() ); @@ -93,7 +93,7 @@ fn kernel_main() -> ! { } fn run_verbose() { - println!("U8: {:?}", mem::alloc::U8_GRAND_ALLOC); + serial_println!("U8: {:?}", mem::alloc::U8_GRAND_ALLOC); { let mut s = String::new(); for _ in 0..128 { @@ -109,7 +109,7 @@ fn run_verbose() { { let a: Box = Box::new(1); assert_eq!(*a, 1); - println!("{}", a); + serial_println!("{}", a); } { let a: Box = Box::new(2); @@ -118,7 +118,7 @@ fn run_verbose() { assert_eq!(*a, 2); assert_eq!(*b, 3); assert_eq!(*c, 4); - println!("{} {} {}", a, b, c); + serial_println!("{} {} {}", a, b, c); } { let a: Box = Box::new(5); @@ -127,10 +127,10 @@ fn run_verbose() { assert_eq!(*a, 5); assert_eq!(*b, 6); assert_eq!(*c, 7); - println!("{} {} {}", a, b, c); + serial_println!("{} {} {}", a, b, c); } use crate::console::interface::Statistics; - println!( + serial_println!( "Characters written to UART: \x1b[91m{}\x1b[0m", console().chars_written() ); -- cgit v1.2.1