diff --git a/libs/xous-bio/Cargo.toml b/libs/xous-bio/Cargo.toml index 424c4226d..a2bd4100a 100644 --- a/libs/xous-bio/Cargo.toml +++ b/libs/xous-bio/Cargo.toml @@ -8,7 +8,9 @@ edition = "2021" [dependencies] log = "0.4.14" defmt = { version = "0.3", optional = true } -utralib = { version = "0.1.24", default-features = false, features = ["cramium-soc"] } +utralib = { version = "0.1.24", default-features = false, features = [ + "cramium-soc", +] } [target.'cfg(target_os = "xous")'.dependencies] xous = "0.9.61" diff --git a/libs/xous-bio/src/bio_tests/i2c.rs b/libs/xous-bio/src/bio_tests/i2c.rs new file mode 100644 index 000000000..c9ee1d54d --- /dev/null +++ b/libs/xous-bio/src/bio_tests/i2c.rs @@ -0,0 +1,5 @@ +use crate::*; + +pub fn i2c_test() { + print!("I2C tests\r"); +} diff --git a/libs/xous-bio/src/bio_tests/mod.rs b/libs/xous-bio/src/bio_tests/mod.rs index 10b13edb8..a1c545d0f 100644 --- a/libs/xous-bio/src/bio_tests/mod.rs +++ b/libs/xous-bio/src/bio_tests/mod.rs @@ -1,3 +1,5 @@ +mod debug; +pub mod i2c; pub mod spi; pub mod units; @@ -88,6 +90,7 @@ pub fn report_api(d: u32) { pub fn bio_tests() { report_api(crate::get_id()); + i2c::i2c_test(); units::fifo_level_tests(); spi::spi_test(); units::hello_world(); diff --git a/libs/xous-bio/src/lib.rs b/libs/xous-bio/src/lib.rs index 0b08994f2..3db770741 100644 --- a/libs/xous-bio/src/lib.rs +++ b/libs/xous-bio/src/lib.rs @@ -32,7 +32,6 @@ use utralib::generated::*; #[cfg(feature = "tests")] pub mod bio_tests; - #[derive(Debug)] pub enum BioError { /// specified state machine is not valid @@ -77,14 +76,11 @@ impl BioSharedState { let imem_slice = unsafe { core::slice::from_raw_parts_mut( utralib::generated::HW_BIO_RAM_MEM as *mut u32, - utralib::generated::HW_BIO_RAM_MEM_LEN + utralib::generated::HW_BIO_RAM_MEM_LEN, ) }; - BioSharedState { - bio: CSR::new(utra::bio::HW_BIO_BASE as *mut u32), - imem_slice, - } + BioSharedState { bio: CSR::new(utra::bio::HW_BIO_BASE as *mut u32), imem_slice } } #[cfg(not(feature = "baremetal"))] @@ -98,9 +94,7 @@ impl BioSharedState { ) .unwrap(); - BioSharedState { - bio: CSR::new(csr.as_mut_ptr() as *mut u32), - } + BioSharedState { bio: CSR::new(csr.as_mut_ptr() as *mut u32) } } pub fn load_code(&mut self, prog: &[u8], offset_bytes: usize) { @@ -160,4 +154,4 @@ macro_rules! bio_code { ".word .", ); }; -} \ No newline at end of file +}