diff options
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | src/kernel.rs | 2 | ||||
| -rw-r--r-- | src/util/print.rs | 45 |
3 files changed, 3 insertions, 45 deletions
@@ -19,3 +19,4 @@ path = "src/kernel.rs" [dependencies] os_pic = {git="https://git.christiancunningham.xyz/os_pic.git"} +#os_pic = {path="../os_pic"} diff --git a/src/kernel.rs b/src/kernel.rs index 4017b5a..dc8a775 100644 --- a/src/kernel.rs +++ b/src/kernel.rs @@ -19,6 +19,8 @@ #![no_main] #![no_std] +pub use crate::util::print::_serial_print; +use os_pic::{serial_println, serial_vprintln}; mod bsp; mod cpu; mod lib; diff --git a/src/util/print.rs b/src/util/print.rs index 34e808c..9b73f07 100644 --- a/src/util/print.rs +++ b/src/util/print.rs @@ -9,48 +9,3 @@ use core::fmt; pub fn _serial_print(args: fmt::Arguments) { UART_WRITER.write_fmt(args).unwrap(); } - -/// # Print without newline -/// -/// Print formatted arguments without a newline -#[macro_export] -macro_rules! serial_print { - ($($arg:tt)*) => ($crate::util::print::_serial_print(format_args!($($arg)*))); -} - -/// # Print with newline -/// -/// Print formatted arguments with a newline -#[macro_export] -macro_rules! serial_println { - () => ($crate::serial_print!("\n")); - ($($arg:tt)*) => ({ - $crate::util::print::_serial_print(format_args_nl!($($arg)*)); - }) -} - -/// # Debug print without newline -/// -/// Print formatted arguments without a newline but only with `verbose` feature -#[macro_export] -macro_rules! serial_vprint { - ($($arg:tt)*) => ({ - #[cfg(feature="verbose")] - $crate::util::print::_serial_print(format_args!($($arg)*)) - }); -} - -/// # Debug print with newline -/// -/// Print formatted arguments with a newline but only with `verbose` feature -#[macro_export] -macro_rules! serial_vprintln { - () => ({ - #[cfg(feature="verbose")] - $crate::serial_print!("\n") - }); - ($($arg:tt)*) => ({ - #[cfg(feature="verbose")] - $crate::util::print::_serial_print(format_args_nl!($($arg)*)); - }) -} |