From 77ad54e193b9dadf94f9bf40e1d002b23489763f Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 27 Apr 2021 18:55:05 +0800 Subject: [PATCH] fix hosted mode compatibility issues --- services/susres/src/api.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/susres/src/api.rs b/services/susres/src/api.rs index 0eb2f050f..26acc7836 100644 --- a/services/susres/src/api.rs +++ b/services/susres/src/api.rs @@ -1,3 +1,4 @@ +#[cfg(target_os = "none")] use utralib::generated::*; pub(crate) const SERVER_NAME_SUSRES: &str = "_Suspend/resume manager_"; @@ -20,11 +21,13 @@ pub(crate) enum ExecGateOpcode { SuspendNow, } +#[cfg(target_os = "none")] #[derive(Debug, Copy, Clone)] pub enum RegOrField { Field(Field), Reg(Register), } +#[cfg(target_os = "none")] #[derive(Debug, Copy, Clone)] pub struct ManagedReg { /// register, or a field of a register @@ -34,7 +37,9 @@ pub struct ManagedReg { /// the saved value of the field or register pub value: Option, } + //#[derive(Debug)] +#[cfg(target_os = "none")] pub struct RegManager { pub csr: CSR, pub registers: [Option; N], @@ -43,6 +48,7 @@ pub struct RegManager { pub res_prologue: Option, pub res_epilogue: Option, } +#[cfg(target_os = "none")] impl RegManager:: where ManagedReg: core::marker::Copy { pub fn new(reg_base: *mut u32) -> RegManager:: { RegManager:: { @@ -72,10 +78,12 @@ impl RegManager:: where ManagedReg: core::marker::Copy { panic!("Ran out of space pushing to suspend/resume manager structure. Please increase the allocated size!"); } } +#[cfg(target_os = "none")] pub trait SuspendResume { fn suspend(&mut self); fn resume(&mut self); } +#[cfg(target_os = "none")] impl SuspendResume for RegManager { fn suspend(&mut self) { if let Some(sp) = self.sus_prologue { @@ -119,10 +127,12 @@ impl SuspendResume for RegManager { // because the volatile memory regions can be potentially large (128kiB), but fewer (maybe 5-6 total in the system), // we allocate these as stand-alone structures and manage them explicitly. +#[cfg(target_os = "none")] pub struct ManagedMem { pub mem: xous::MemoryRange, pub backing: [u32; N], } +#[cfg(target_os = "none")] impl SuspendResume for ManagedMem { fn suspend(&mut self) { let src = self.mem.as_ptr() as *const u32;