diff --git a/services/susres/src/api.rs b/services/susres/src/api.rs index a8f483ef4..0eb2f050f 100644 --- a/services/susres/src/api.rs +++ b/services/susres/src/api.rs @@ -2,12 +2,23 @@ use utralib::generated::*; pub(crate) const SERVER_NAME_SUSRES: &str = "_Suspend/resume manager_"; -/* -#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] pub(crate) enum Opcode { - Placeholder, -}*/ + /// requests a suspend + SuspendRequest, + + /// register a subscriber to the suspend event + /// (if you don't register, you just get suspend without any warning!) + SuspendEventSubscribe, + + /// indicate we're ready to suspend + SuspendReady, +} + +#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] +pub(crate) enum ExecGateOpcode { + SuspendNow, +} #[derive(Debug, Copy, Clone)] pub enum RegOrField { diff --git a/services/susres/src/main.rs b/services/susres/src/main.rs index 796a8547a..8597a46d2 100644 --- a/services/susres/src/main.rs +++ b/services/susres/src/main.rs @@ -20,6 +20,8 @@ mod implementation { pub struct SusResHw { /// our CSR csr: utralib::CSR, + /// memory region for the "clean suspend" marker + marker: xous::MemoryRange, /// backing store for the ticktimer value time_backing: Option<[u32; 2]>, } @@ -33,9 +35,16 @@ mod implementation { ) .expect("couldn't map SusRes CSR range"); + let marker = xous::syscall::map_memory( + xous::MemoryAddress::new(0x40FFE000), // this is a special, hard-coded location + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ).expect("couldn't map clean suspend page"); let mut sr = SusResHw { csr: CSR::new(csr.as_mut_ptr() as *mut u32), time_backing: None, + marker, }; xous::claim_interrupt(