diff --git a/services/xous-swapper/src/lib.rs b/services/xous-swapper/src/lib.rs index cad535839..c5824f6a7 100644 --- a/services/xous-swapper/src/lib.rs +++ b/services/xous-swapper/src/lib.rs @@ -3,7 +3,7 @@ pub mod api; #[cfg(feature = "spinor")] pub mod spinor; -pub const PAGE_SIZE: usize = 4096; +pub const PAGE_SIZE: usize = xous::arch::PAGE_SIZE; /// public userspace & swapper handler -> swapper userspace ABI #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] diff --git a/services/xous-swapper/src/main.rs b/services/xous-swapper/src/main.rs index 9d3673c20..20c8af548 100644 --- a/services/xous-swapper/src/main.rs +++ b/services/xous-swapper/src/main.rs @@ -56,9 +56,10 @@ use std::collections::BinaryHeap; use std::fmt::Debug; use debug::*; -use loader::swap::{SWAP_CFG_VADDR, SWAP_COUNT_VADDR, SWAP_PT_VADDR, SWAP_RPT_VADDR, SwapAlloc, SwapSpec}; +use loader::swap::{SwapAlloc, SwapSpec}; use num_traits::*; use platform::{PAGE_SIZE, SwapHal}; +use xous::arch::{SWAP_CFG_VADDR, SWAP_COUNT_VADDR, SWAP_PT_VADDR, SWAP_RPT_VADDR}; use xous::{MemoryFlags, MemoryRange, PID, Result}; use xous_swapper::Opcode; diff --git a/services/xous-swapper/src/platform/cramium/hw.rs b/services/xous-swapper/src/platform/cramium/hw.rs index c166d4f3e..7acf5bbab 100644 --- a/services/xous-swapper/src/platform/cramium/hw.rs +++ b/services/xous-swapper/src/platform/cramium/hw.rs @@ -6,11 +6,12 @@ use cramium_api::*; use cramium_hal::board::SPIM_RAM_IFRAM_ADDR; use cramium_hal::ifram::IframRange; use cramium_hal::udma::*; -use loader::swap::{SWAP_HAL_VADDR, SwapSpec}; +use loader::swap::SwapSpec; +use xous::arch::SWAP_HAL_VADDR; use crate::debug::*; -pub const PAGE_SIZE: usize = 4096; +pub const PAGE_SIZE: usize = xous::arch::PAGE_SIZE; /// This is an implementation for SMTs that are accessible only through a SPI /// register interface. The base and bounds must be translated to SPI accesses diff --git a/services/xous-swapper/src/platform/precursor/hw.rs b/services/xous-swapper/src/platform/precursor/hw.rs index c97117370..e2e0e4806 100644 --- a/services/xous-swapper/src/platform/precursor/hw.rs +++ b/services/xous-swapper/src/platform/precursor/hw.rs @@ -6,7 +6,7 @@ use loader::swap::{SWAP_HAL_VADDR, SwapSpec}; use crate::debug::DebugUart; -pub const PAGE_SIZE: usize = 4096; +pub const PAGE_SIZE: usize = xous::arch::PAGE_SIZE; /// This defines a set of functions to get and receive MACs (message /// authentication codes, also referred to as the tag in AES-GCM-SIV.