diff --git a/kernel/src/platform/cramium/mod.rs b/kernel/src/platform/cramium/mod.rs index f38f9e7e1..c2bc5f633 100644 --- a/kernel/src/platform/cramium/mod.rs +++ b/kernel/src/platform/cramium/mod.rs @@ -12,8 +12,56 @@ pub use rand_fake as rand; #[cfg(any(feature = "debug-print", feature = "print-panics"))] pub mod uart; +#[cfg(feature = "vexii-test")] +use crate::{MemoryFlags, MemoryType, PID, mem::MemoryManager}; +#[cfg(feature = "vexii-test")] +pub const LEGACY_INT_VMEM: usize = 0xffcf_1000; // see https://github.com/betrusted-io/xous-core/blob/master/docs/memory.md + +#[allow(dead_code)] +#[cfg(feature = "vexii-test")] +pub mod legacy_int { + // this enum is vestigal, and currently not used by anything + #[derive(Debug, Copy, Clone)] + pub enum LegacyIntOffset { + MachMask = 0, + MachPending = 1, + SuperMask = 2, + SuperPending = 3, + } + pub const LEGACY_INT_NUMREGS: usize = 4; + + pub const MACH_MASK: utralib::Register = utralib::Register::new(0, 0xffffffff); + pub const MACH_MASK_MACH_MASK: utralib::Field = utralib::Field::new(32, 0, MACH_MASK); + + pub const MACH_PENDING: utralib::Register = utralib::Register::new(1, 0xffffffff); + pub const MACH_PENDING_MACH_PENDING: utralib::Field = utralib::Field::new(32, 0, MACH_PENDING); + + pub const SUPER_MASK: utralib::Register = utralib::Register::new(2, 0xffffffff); + pub const SUPER_MASK_SUPER_MASK: utralib::Field = utralib::Field::new(32, 0, SUPER_MASK); + + pub const SUPER_PENDING: utralib::Register = utralib::Register::new(3, 0xffffffff); + pub const SUPER_PENDING_SUPER_PENDING: utralib::Field = utralib::Field::new(32, 0, SUPER_PENDING); + + pub const HW_LEGACY_INT_BASE: usize = 0xe001d000; +} + /// Precursor specific initialization. pub fn init() { + #[cfg(feature = "vexii-test")] + // Map the interrupt manager shim + MemoryManager::with_mut(|memory_manager| { + memory_manager + .map_range( + legacy_int::HW_LEGACY_INT_BASE as *mut u8, + (LEGACY_INT_VMEM & !4095) as *mut u8, + 4096, + PID::new(1).unwrap(), + MemoryFlags::R | MemoryFlags::W, + MemoryType::Default, + ) + .expect("unable to map legacy interrupt shim for vexii CPU") + }); + self::rand::init(); #[cfg(any(feature = "debug-print", feature = "print-panics"))] self::uart::init();