diff options
Diffstat (limited to 'src/log.rs')
-rw-r--r-- | src/log.rs | 34 |
1 files changed, 27 insertions, 7 deletions
@@ -1,16 +1,36 @@ -use core::fmt::Write; +use core::fmt::{write, Arguments}; use gd32vf103xx_hal::{ - pac::USART1, serial::Tx, + pac::USART1, }; +use riscv::interrupt::{self, Mutex}; + +#[macro_export] +macro_rules! log { + ($($args:tt)+) => { + $crate::log::log_args(core::format_args!($($args)+)); + } +} + +#[macro_export] +macro_rules! logln { + () => ({ kprint!("\r\n") }); + ($fmt: literal $(, $($arg: tt)+)?) => { + log!(concat!($fmt, "\n") $(, $($arg)+)?); + } +} -static mut TX: Option<Tx<USART1>> = None; +static mut TX: Mutex<Option<Tx<USART1>>> = Mutex::new(None); -pub unsafe fn new(tx: Tx<USART1>) { - TX = Some(tx); +pub fn init(tx: Tx<USART1>) { + interrupt::free(|_cs| { + unsafe { TX.get_mut().insert(tx) }; + }); } -pub unsafe fn log(str: &str) { - TX.as_mut().map(|tx| tx.write_str(str)); +pub fn log_args(args: Arguments) { + interrupt::free(|_cs| { + unsafe { TX.get_mut().as_mut().map(|tx| write(tx, args)) }; + }); } |