From c27bc6e088140d24cf8dcf8ed84f35bbe2377719 Mon Sep 17 00:00:00 2001 From: eupn Date: Wed, 29 Mar 2023 22:44:19 +0400 Subject: [PATCH] xous-log: fix precursor build --- services/xous-log/src/main.rs | 2 +- services/xous-log/src/platform/mod.rs | 3 +++ services/xous-log/src/platform/precursor/debug.rs | 4 ++-- services/xous-log/src/platform/precursor/implementation.rs | 6 +++--- services/xous-log/src/platform/precursor/mod.rs | 1 - 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/services/xous-log/src/main.rs b/services/xous-log/src/main.rs index 13b919c54..340ef9b4d 100644 --- a/services/xous-log/src/main.rs +++ b/services/xous-log/src/main.rs @@ -51,7 +51,7 @@ fn handle_scalar( 1200 => writeln!(output, "Terminating process").unwrap(), 2000 => { #[cfg(any(feature="precursor", feature="renode"))] - crate::debug::DEFAULT.enable_rx(); + crate::platform::debug::DEFAULT.enable_rx(); writeln!(output, "Resuming logger").unwrap(); } _ => writeln!( diff --git a/services/xous-log/src/platform/mod.rs b/services/xous-log/src/platform/mod.rs index df1c36ca7..5ba84b07c 100644 --- a/services/xous-log/src/platform/mod.rs +++ b/services/xous-log/src/platform/mod.rs @@ -5,6 +5,9 @@ pub mod precursor; #[cfg(any(feature="precursor", feature="renode"))] pub use precursor::debug; +#[cfg(any(feature="precursor", feature="renode"))] +pub use precursor::implementation; + #[cfg(not(target_os = "xous"))] #[macro_use] pub mod hosted; diff --git a/services/xous-log/src/platform/precursor/debug.rs b/services/xous-log/src/platform/precursor/debug.rs index b13407951..d061195d8 100644 --- a/services/xous-log/src/platform/precursor/debug.rs +++ b/services/xous-log/src/platform/precursor/debug.rs @@ -7,7 +7,7 @@ macro_rules! print { ($($args:tt)+) => ({ use core::fmt::Write; - let _ = write!(crate::debug::Uart {}, $($args)+); + let _ = write!(crate::platform::debug::Uart {}, $($args)+); }); } #[macro_export] @@ -28,7 +28,7 @@ macro_rules! println fn handle_irq(irq_no: usize, arg: *mut usize) { print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); - while let Some(c) = { crate::debug::Uart {} }.getc() { + while let Some(c) = { crate::platform::debug::Uart {} }.getc() { print!("{}", c as char); } println!(); diff --git a/services/xous-log/src/platform/precursor/implementation.rs b/services/xous-log/src/platform/precursor/implementation.rs index 840b07f79..9570d70b9 100644 --- a/services/xous-log/src/platform/precursor/implementation.rs +++ b/services/xous-log/src/platform/precursor/implementation.rs @@ -12,7 +12,7 @@ pub fn init() -> Output { xous::MemoryFlags::R | xous::MemoryFlags::W, ) .expect("couldn't map serial port"); - unsafe { crate::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() as _ }; + unsafe { crate::platform::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() as _ }; println!("Mapped UART @ {:08x}", uart.as_ptr() as usize); let mut uart_csr = CSR::new(uart.as_mut_ptr() as *mut u32); @@ -55,7 +55,7 @@ impl Output { fn handle_console_irq(_irq_no: usize, arg: *mut usize) { if cfg!(feature = "logging") { let mut inject_csr = CSR::new(arg as *mut u32); - let mut uart_csr = CSR::new(unsafe { crate::debug::DEFAULT_UART_ADDR as *mut u32 }); + let mut uart_csr = CSR::new(unsafe { crate::platform::debug::DEFAULT_UART_ADDR as *mut u32 }); // println!("rxe {}", uart_csr.rf(utra::uart::RXEMPTY_RXEMPTY)); while uart_csr.rf(utra::uart::RXEMPTY_RXEMPTY) == 0 { // I really rather think this is more readable, than the "Rusty" version below. @@ -93,7 +93,7 @@ pub struct OutputWriter {} impl OutputWriter { pub fn putc(&self, c: u8) { if cfg!(feature = "logging") { - let mut uart_csr = CSR::new(unsafe { crate::debug::DEFAULT_UART_ADDR as *mut u32 }); + let mut uart_csr = CSR::new(unsafe { crate::platform::debug::DEFAULT_UART_ADDR as *mut u32 }); // Wait until TXFULL is `0` while uart_csr.r(utra::uart::TXFULL) != 0 {} diff --git a/services/xous-log/src/platform/precursor/mod.rs b/services/xous-log/src/platform/precursor/mod.rs index 6e585ca5e..a05a28ad6 100644 --- a/services/xous-log/src/platform/precursor/mod.rs +++ b/services/xous-log/src/platform/precursor/mod.rs @@ -1,4 +1,3 @@ -#[cfg(feature = "debugprint")] #[macro_use] pub mod debug;