From b275b1d3c22e14eedd0f47e77e69e40856e6a341 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 10 Jan 2022 13:48:49 +0800 Subject: [PATCH] move some low-level hardware facing services to "Late" suspend status So far it's been no problem to suspend these in any order, but as more services come to rely upon them it's better if they suspend after any client applications have been suspended. --- services/codec/src/main.rs | 2 +- services/com/src/main.rs | 2 +- services/engine-25519/src/main.rs | 2 +- services/engine-sha512/src/main.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/codec/src/main.rs b/services/codec/src/main.rs index 2ee2f9a91..e433fcaa5 100644 --- a/services/codec/src/main.rs +++ b/services/codec/src/main.rs @@ -39,7 +39,7 @@ fn xmain() -> ! { // register a suspend/resume listener let sr_cid = xous::connect(codec_sid).expect("couldn't create suspend callback connection"); - let mut susres = susres::Susres::new(None, &xns, api::Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); + let mut susres = susres::Susres::new(Some(susres::SuspendOrder::Late), &xns, api::Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); /* let trng = trng::Trng::new(&xns).unwrap(); let mut noise: [u32; codec::FIFO_DEPTH] = [0; codec::FIFO_DEPTH]; diff --git a/services/com/src/main.rs b/services/com/src/main.rs index a3760dfa1..bb944720b 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -342,7 +342,7 @@ fn xmain() -> ! { // 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(None, &xns, Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); + let mut susres = susres::Susres::new(Some(susres::SuspendOrder::Late), &xns, Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); // create an array to track return connections for battery stats let mut battstats_conns: [Option; 32] = [None; 32]; diff --git a/services/engine-25519/src/main.rs b/services/engine-25519/src/main.rs index b6ca23a77..f2f3294e4 100644 --- a/services/engine-25519/src/main.rs +++ b/services/engine-25519/src/main.rs @@ -749,7 +749,7 @@ fn susres_thread(engine_arg: usize) { // register a suspend/resume listener let sr_cid = xous::connect(susres_sid).expect("couldn't create suspend callback connection"); - let mut susres = susres::Susres::new(None, &xns, api::SusResOps::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); + let mut susres = susres::Susres::new(Some(susres::SuspendOrder::Late), &xns, api::SusResOps::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); log::trace!("starting engine25519 suspend/resume manager loop"); loop { diff --git a/services/engine-sha512/src/main.rs b/services/engine-sha512/src/main.rs index 59b98bff7..70c0f770d 100644 --- a/services/engine-sha512/src/main.rs +++ b/services/engine-sha512/src/main.rs @@ -278,7 +278,7 @@ fn susres_thread(sid0: usize, sid1: usize, sid2: usize, sid3: usize) { // register a suspend/resume listener let sr_cid = xous::connect(susres_sid).expect("couldn't create suspend callback connection"); - let mut susres = susres::Susres::new(None, &xns, api::SusResOps::SuspendResume as u32, sr_cid) + let mut susres = susres::Susres::new(Some(susres::SuspendOrder::Late), &xns, api::SusResOps::SuspendResume as u32, sr_cid) .expect("couldn't create suspend/resume object"); log::trace!("starting Sha512 suspend/resume manager loop");