diff --git a/libs/xous-pio/src/lib.rs b/libs/xous-pio/src/lib.rs index 5ff9db570..e2bdc3af0 100644 --- a/libs/xous-pio/src/lib.rs +++ b/libs/xous-pio/src/lib.rs @@ -3,9 +3,8 @@ use pio::Program; use pio::RP2040_MAX_PROGRAM_SIZE; -mod pio_generated; -use pio_generated::utra::rp_pio; -use pio_generated::*; +use utralib::generated::*; +use utralib::generated::utra::rp_pio; #[cfg(feature="tests")] pub mod pio_tests; diff --git a/libs/xous-pio/src/pio_tests/i2c.rs b/libs/xous-pio/src/pio_tests/i2c.rs index 1ada30f4a..983a6af8d 100644 --- a/libs/xous-pio/src/pio_tests/i2c.rs +++ b/libs/xous-pio/src/pio_tests/i2c.rs @@ -1,4 +1,5 @@ -use crate::pio_generated::utra::rp_pio; +use utralib::generated::utra::rp_pio; + use crate::*; use super::report_api; diff --git a/libs/xous-pio/src/pio_tests/nec.rs b/libs/xous-pio/src/pio_tests/nec.rs index b8f6c9348..f353566f2 100644 --- a/libs/xous-pio/src/pio_tests/nec.rs +++ b/libs/xous-pio/src/pio_tests/nec.rs @@ -1,5 +1,5 @@ use crate::*; -use crate::pio_generated::utra::rp_pio; +use utralib::utra::rp_pio; use super::report_api; const SIM_SCALE_FACTOR: f32 = 200.0; // speedup over real time to have simulation finish in a reasonable amount of time diff --git a/libs/xous-pio/src/pio_tests/spi.rs b/libs/xous-pio/src/pio_tests/spi.rs index 5106b34a8..b9228bae1 100644 --- a/libs/xous-pio/src/pio_tests/spi.rs +++ b/libs/xous-pio/src/pio_tests/spi.rs @@ -1,4 +1,4 @@ -use crate::pio_generated::utra::rp_pio; +use utralib::generated::utra::rp_pio; use crate::*; use super::report_api; diff --git a/libs/xous-pio/src/pio_tests/units.rs b/libs/xous-pio/src/pio_tests/units.rs index ee9a203c2..373c17535 100644 --- a/libs/xous-pio/src/pio_tests/units.rs +++ b/libs/xous-pio/src/pio_tests/units.rs @@ -1,5 +1,5 @@ use pio::RP2040_MAX_PROGRAM_SIZE; -use crate::pio_generated::utra::rp_pio::{self, SFR_FDEBUG, SFR_FLEVEL, SFR_FSTAT, SFR_DBG_CFGINFO}; +use utralib::utra::rp_pio::{self, SFR_FDEBUG, SFR_FLEVEL, SFR_FSTAT, SFR_DBG_CFGINFO}; use crate::*; use super::report_api; diff --git a/libs/xous-pl230/src/pl230_tests/units.rs b/libs/xous-pl230/src/pl230_tests/units.rs index 66031f373..7ad1db3a4 100644 --- a/libs/xous-pl230/src/pl230_tests/units.rs +++ b/libs/xous-pl230/src/pl230_tests/units.rs @@ -131,6 +131,10 @@ pub fn pio_test(pl230: &mut Pl230) -> bool { sm_a.sm_set_enabled(false); a_prog.setup_default_config(&mut sm_a); sm_a.config_set_out_pins(0, 32); + sm_a.sm_set_pindirs_with_mask( + 0xFFFF_FFFF, + 0xFFFF_FFFF + ); sm_a.config_set_clkdiv(133.0); // have it run slow so this test operates in the background sm_a.config_set_out_shift(false, true, 32); sm_a.sm_set_pindirs_with_mask(0x10, 0x10); @@ -170,7 +174,7 @@ pub fn pio_test(pl230: &mut Pl230) -> bool { let mut state = 0x1111_0000; for d in region_a.iter_mut() { *d = state; - state += 1; + state += 0x0101_0101; } cc_struct.channels[0].dst_end_ptr =