mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
retrofit COM for suspend/resume
This commit is contained in:
parent
a55735fb1f
commit
2d3a643d20
4 changed files with 33 additions and 0 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -303,6 +303,7 @@ dependencies = [
|
||||||
"num-derive",
|
"num-derive",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"rkyv 0.4.3",
|
"rkyv 0.4.3",
|
||||||
|
"susres",
|
||||||
"ticktimer-server",
|
"ticktimer-server",
|
||||||
"typenum",
|
"typenum",
|
||||||
"utralib",
|
"utralib",
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ heapless = "0.5"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
log-server = {path = "../log-server"}
|
log-server = {path = "../log-server"}
|
||||||
ticktimer-server = {path = "../ticktimer-server"}
|
ticktimer-server = {path = "../ticktimer-server"}
|
||||||
|
susres = {path = "../susres"}
|
||||||
typenum = "1.12"
|
typenum = "1.12"
|
||||||
xous = {path = "../../xous-rs"}
|
xous = {path = "../../xous-rs"}
|
||||||
xous-ipc = {path = "../../xous-ipc"}
|
xous-ipc = {path = "../../xous-ipc"}
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,9 @@ pub(crate) enum Opcode {
|
||||||
|
|
||||||
/// stop passive SSID scanning
|
/// stop passive SSID scanning
|
||||||
ScanOff,
|
ScanOff,
|
||||||
|
|
||||||
|
/// suspend/resume callback
|
||||||
|
SuspendResume,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// These enums indicate what kind of callback type we're sending.
|
/// These enums indicate what kind of callback type we're sending.
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ mod implementation {
|
||||||
use com_rs::*;
|
use com_rs::*;
|
||||||
use log::error;
|
use log::error;
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
|
use susres::{RegManager, RegOrField, SuspendResume};
|
||||||
|
|
||||||
use heapless::Vec;
|
use heapless::Vec;
|
||||||
use heapless::consts::U64;
|
use heapless::consts::U64;
|
||||||
|
|
@ -46,6 +47,7 @@ mod implementation {
|
||||||
|
|
||||||
pub struct XousCom {
|
pub struct XousCom {
|
||||||
csr: utralib::CSR<u32>,
|
csr: utralib::CSR<u32>,
|
||||||
|
susres: RegManager::<{utra::com::COM_NUMREGS}>,
|
||||||
ticktimer: ticktimer_server::Ticktimer,
|
ticktimer: ticktimer_server::Ticktimer,
|
||||||
pub workqueue: Vec<WorkRequest, U64>,
|
pub workqueue: Vec<WorkRequest, U64>,
|
||||||
busy: bool,
|
busy: bool,
|
||||||
|
|
@ -73,6 +75,7 @@ mod implementation {
|
||||||
|
|
||||||
let mut xc = XousCom {
|
let mut xc = XousCom {
|
||||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||||
|
susres: RegManager::new(csr.as_mut_ptr() as *mut u32),
|
||||||
ticktimer,
|
ticktimer,
|
||||||
workqueue: Vec::new(),
|
workqueue: Vec::new(),
|
||||||
busy: false,
|
busy: false,
|
||||||
|
|
@ -88,8 +91,22 @@ mod implementation {
|
||||||
(&mut xc) as *mut XousCom as *mut usize,
|
(&mut xc) as *mut XousCom as *mut usize,
|
||||||
)
|
)
|
||||||
.expect("couldn't claim irq");
|
.expect("couldn't claim irq");
|
||||||
|
|
||||||
|
xc.susres.push(RegOrField::Reg(utra::com::CONTROL), None);
|
||||||
|
xc.susres.push_fixed_value(RegOrField::Reg(utra::com::EV_PENDING), 0xFFFF_FFFF);
|
||||||
|
xc.susres.push(RegOrField::Reg(utra::com::EV_ENABLE), None);
|
||||||
|
|
||||||
xc
|
xc
|
||||||
}
|
}
|
||||||
|
pub fn suspend(&mut self) {
|
||||||
|
self.susres.suspend();
|
||||||
|
self.csr.wo(utra::com::EV_ENABLE, 0);
|
||||||
|
}
|
||||||
|
pub fn resume(&mut self) {
|
||||||
|
self.susres.resume();
|
||||||
|
// issue a "link sync" command because the COM had continued running, and we may have sent garbage during suspend
|
||||||
|
self.txrx(ComState::LINK_SYNC.verb);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn txrx(&mut self, tx: u16) -> u16 {
|
pub fn txrx(&mut self, tx: u16) -> u16 {
|
||||||
self.csr.wfo(utra::com::TX_TX, tx as u32);
|
self.csr.wfo(utra::com::TX_TX, tx as u32);
|
||||||
|
|
@ -203,6 +220,8 @@ mod implementation {
|
||||||
busy: false,
|
busy: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub fn suspend(&self) {}
|
||||||
|
pub fn resume(&self) {}
|
||||||
|
|
||||||
pub fn txrx(&mut self, _tx: u16) -> u16 {
|
pub fn txrx(&mut self, _tx: u16) -> u16 {
|
||||||
0xDEAD as u16
|
0xDEAD as u16
|
||||||
|
|
@ -267,6 +286,10 @@ fn xmain() -> ! {
|
||||||
// Create a new com object
|
// Create a new com object
|
||||||
let mut com = XousCom::new();
|
let mut com = XousCom::new();
|
||||||
|
|
||||||
|
// register a suspend/resume listener
|
||||||
|
let sr_cid = xous::connect(com_sid).expect("couldn't create suspend callback connection");
|
||||||
|
let mut susres = susres::Susres::new(&xns, Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object");
|
||||||
|
|
||||||
// create an array to track return connections for battery stats
|
// create an array to track return connections for battery stats
|
||||||
let mut battstats_conns: [Option<xous::CID>; 32] = [None; 32];
|
let mut battstats_conns: [Option<xous::CID>; 32] = [None; 32];
|
||||||
// other future notification vectors shall go here
|
// other future notification vectors shall go here
|
||||||
|
|
@ -276,6 +299,11 @@ fn xmain() -> ! {
|
||||||
let mut msg = xous::receive_message(com_sid).unwrap();
|
let mut msg = xous::receive_message(com_sid).unwrap();
|
||||||
trace!("Message: {:?}", msg);
|
trace!("Message: {:?}", msg);
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
|
Some(Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
|
||||||
|
com.suspend();
|
||||||
|
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
|
||||||
|
com.resume();
|
||||||
|
}),
|
||||||
Some(Opcode::RegisterBattStatsListener) => msg_scalar_unpack!(msg, sid0, sid1, sid2, sid3, {
|
Some(Opcode::RegisterBattStatsListener) => msg_scalar_unpack!(msg, sid0, sid1, sid2, sid3, {
|
||||||
let sid = xous::SID::from_u32(sid0 as _, sid1 as _, sid2 as _, sid3 as _);
|
let sid = xous::SID::from_u32(sid0 as _, sid1 as _, sid2 as _, sid3 as _);
|
||||||
let cid = Some(xous::connect(sid).unwrap());
|
let cid = Some(xous::connect(sid).unwrap());
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue