From 99088936bbb28c5e954453a0ad8252ea3c6eded7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 1 Jan 2025 22:46:38 +0800 Subject: [PATCH] have the -fpga variant use the debug UART for console output we only can watch one uart in the simulation environment (for now) --- services/xous-log/src/platform/cramium/debug.rs | 7 ++++--- services/xous-log/src/platform/cramium/implementation.rs | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/xous-log/src/platform/cramium/debug.rs b/services/xous-log/src/platform/cramium/debug.rs index a89b7c4a5..13d13163e 100644 --- a/services/xous-log/src/platform/cramium/debug.rs +++ b/services/xous-log/src/platform/cramium/debug.rs @@ -1,5 +1,6 @@ use core::fmt::{Error, Write}; +#[cfg(feature = "cramium-soc")] use cramium_hal::udma; #[macro_export] @@ -33,10 +34,10 @@ pub static mut DEFAULT_UART_ADDR: *mut usize = 0x0000_0000 as *mut usize; impl Uart { pub fn putc(&self, c: u8) { assert!(unsafe { DEFAULT_UART_ADDR } as usize != 0); - let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 }); + let mut uart_csr = utralib::CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 }); - while uart_csr.r(utra::duart::SFR_SR) != 0 {} - uart_csr.wo(utra::duart::SFR_TXD, c as u32); + while uart_csr.r(utralib::utra::duart::SFR_SR) != 0 {} + uart_csr.wo(utralib::utra::duart::SFR_TXD, c as u32); } } diff --git a/services/xous-log/src/platform/cramium/implementation.rs b/services/xous-log/src/platform/cramium/implementation.rs index 966908c8a..fb9c62c2c 100644 --- a/services/xous-log/src/platform/cramium/implementation.rs +++ b/services/xous-log/src/platform/cramium/implementation.rs @@ -1,7 +1,10 @@ use core::fmt::{Error, Write}; +#[cfg(feature = "cramium-soc")] use std::pin::Pin; +#[cfg(feature = "cramium-soc")] use cramium_hal::board::UART_DMA_TX_BUF_PHYS; +#[cfg(feature = "cramium-soc")] use cramium_hal::udma; use utralib::generated::*;