diff --git a/libs/bao1x-api/src/bio.rs b/libs/bao1x-api/src/bio.rs index 865d0dbc9..db4dfb93d 100644 --- a/libs/bao1x-api/src/bio.rs +++ b/libs/bao1x-api/src/bio.rs @@ -100,6 +100,8 @@ pub trait BioApi<'a> { /// Returns a version code for the underlying hardware. fn get_version(&self) -> u32; + + fn debug(&self, core: BioCore); } #[macro_export] @@ -126,6 +128,7 @@ macro_rules! bio_code { } core::arch::global_asm!( + ".option arch, +m", ".align 4", concat!(".globl ", stringify!($name_start)), concat!(stringify!($name_start), ":"), @@ -164,6 +167,8 @@ pub enum BioOp { ClaimDynamicPin, ReleaseDynamicPin, + Debug, + InvalidCall, } diff --git a/libs/bao1x-hal/src/bio.rs b/libs/bao1x-hal/src/bio.rs index 3f982dd4b..24f33de89 100644 --- a/libs/bao1x-hal/src/bio.rs +++ b/libs/bao1x-hal/src/bio.rs @@ -218,6 +218,14 @@ impl<'a> BioApi<'a> for Bio { .map_err(|e| >::into(e))?; Ok(()) } + + fn debug(&self, core: BioCore) { + send_message( + self.conn, + Message::new_blocking_scalar(BioOp::Debug.to_usize().unwrap(), core as usize, 0, 0, 0), + ) + .unwrap(); + } } #[cfg(feature = "std")] diff --git a/libs/bao1x-hal/src/bio_hw.rs b/libs/bao1x-hal/src/bio_hw.rs index 9bc907509..54cfb76e4 100644 --- a/libs/bao1x-hal/src/bio_hw.rs +++ b/libs/bao1x-hal/src/bio_hw.rs @@ -668,6 +668,23 @@ impl<'a> BioApi<'a> for BioSharedState { } Ok(()) } + + fn debug(&self, core: BioCore) { + match core { + BioCore::Core0 => { + crate::println!("DBG_{:?}: {:x}", core, self.bio.r(utralib::utra::bio_bdma::SFR_DBG0)) + } + BioCore::Core1 => { + crate::println!("DBG_{:?}: {:x}", core, self.bio.r(utralib::utra::bio_bdma::SFR_DBG1)) + } + BioCore::Core2 => { + crate::println!("DBG_{:?}: {:x}", core, self.bio.r(utralib::utra::bio_bdma::SFR_DBG2)) + } + BioCore::Core3 => { + crate::println!("DBG_{:?}: {:x}", core, self.bio.r(utralib::utra::bio_bdma::SFR_DBG3)) + } + } + } } #[rustfmt::skip] diff --git a/services/bao1x-hal-service/src/servers/bio.rs b/services/bao1x-hal-service/src/servers/bio.rs index 56619e56b..b4d01d01f 100644 --- a/services/bao1x-hal-service/src/servers/bio.rs +++ b/services/bao1x-hal-service/src/servers/bio.rs @@ -54,6 +54,42 @@ fn bio_service(clk_freq: u32) { } } + BioOp::Debug => { + if let Some(scalar) = msg_opt.as_mut().unwrap().body.scalar_message_mut() { + let core = BioCore::from(scalar.arg1); + match core { + BioCore::Core0 => { + log::info!( + "DBG_{:?}: {:x}", + core, + bio_ss.bio.r(utralib::utra::bio_bdma::SFR_DBG0) + ) + } + BioCore::Core1 => { + log::info!( + "DBG_{:?}: {:x}", + core, + bio_ss.bio.r(utralib::utra::bio_bdma::SFR_DBG1) + ) + } + BioCore::Core2 => { + log::info!( + "DBG_{:?}: {:x}", + core, + bio_ss.bio.r(utralib::utra::bio_bdma::SFR_DBG2) + ) + } + BioCore::Core3 => { + log::info!( + "DBG_{:?}: {:x}", + core, + bio_ss.bio.r(utralib::utra::bio_bdma::SFR_DBG3) + ) + } + } + } + } + BioOp::GetCoreHandle => { if let Some(scalar) = msg_opt.as_mut().unwrap().body.scalar_message_mut() { let index = scalar.arg1;