mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
rework ticktimer to use the susres interface
This commit is contained in:
parent
9b9948e8da
commit
e4eeb4603f
2 changed files with 14 additions and 25 deletions
|
|
@ -44,7 +44,13 @@ renode = ["utralib/renode", "susres/renode", "watchdog"]
|
||||||
|
|
||||||
board-dabao = []
|
board-dabao = []
|
||||||
board-baosec = []
|
board-baosec = []
|
||||||
bao1x = ["utralib/bao1x", "utralib/std", "bao1x-api", "rand_chacha"]
|
bao1x = [
|
||||||
|
"utralib/bao1x",
|
||||||
|
"utralib/std",
|
||||||
|
"bao1x-api",
|
||||||
|
"rand_chacha",
|
||||||
|
"susres/bao1x",
|
||||||
|
]
|
||||||
hosted-baosec = []
|
hosted-baosec = []
|
||||||
|
|
||||||
susres = []
|
susres = []
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ use rand_chacha::{
|
||||||
ChaCha8Rng,
|
ChaCha8Rng,
|
||||||
rand_core::{RngCore, SeedableRng},
|
rand_core::{RngCore, SeedableRng},
|
||||||
};
|
};
|
||||||
#[cfg(not(any(target_arch = "arm", feature = "bao1x")))]
|
#[cfg(not(any(target_arch = "arm")))]
|
||||||
use susres::SuspendOrder;
|
use susres::SuspendOrder;
|
||||||
|
|
||||||
fn main() -> ! {
|
fn main() -> ! {
|
||||||
|
|
@ -55,23 +55,23 @@ fn main() -> ! {
|
||||||
ticktimer.reset(); // reset the time to 0
|
ticktimer.reset(); // reset the time to 0
|
||||||
|
|
||||||
// register a suspend/resume listener
|
// register a suspend/resume listener
|
||||||
#[cfg(not(any(target_arch = "arm", feature = "bao1x")))]
|
#[cfg(not(any(target_arch = "arm")))]
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
|
||||||
#[cfg(not(any(target_arch = "arm", feature = "bao1x")))]
|
#[cfg(not(any(target_arch = "arm")))]
|
||||||
let sr_cid = xous::connect(ticktimer_server).expect("couldn't create suspend callback connection");
|
let sr_cid = xous::connect(ticktimer_server).expect("couldn't create suspend callback connection");
|
||||||
|
|
||||||
#[cfg(not(any(target_arch = "arm", feature = "bao1x")))]
|
#[cfg(not(any(target_arch = "arm")))]
|
||||||
let mut susres =
|
let mut susres =
|
||||||
susres::Susres::new(Some(SuspendOrder::Last), &xns, api::Opcode::SuspendResume as u32, sr_cid)
|
susres::Susres::new(Some(SuspendOrder::Last), &xns, api::Opcode::SuspendResume as u32, sr_cid)
|
||||||
.expect("couldn't create suspend/resume object");
|
.expect("couldn't create suspend/resume object");
|
||||||
|
|
||||||
#[cfg(feature = "bao1x")]
|
/* #[cfg(feature = "bao1x")]
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
#[cfg(feature = "bao1x")]
|
#[cfg(feature = "bao1x")]
|
||||||
let wakeup_cid = xns
|
let wakeup_cid = xns
|
||||||
.request_connection(bao1x_api::SERVER_NAME_BAO1X_HAL)
|
.request_connection(bao1x_api::SERVER_NAME_BAO1X_HAL)
|
||||||
.expect("Couldn't connect to bao1x HAL server");
|
.expect("Couldn't connect to bao1x HAL server"); */
|
||||||
#[cfg(feature = "bao1x")]
|
#[cfg(feature = "bao1x")]
|
||||||
let mut csprng = {
|
let mut csprng = {
|
||||||
let mut seed = [0u8; 32];
|
let mut seed = [0u8; 32];
|
||||||
|
|
@ -235,25 +235,8 @@ fn main() -> ! {
|
||||||
|
|
||||||
api::Opcode::SuspendResume => xous::msg_scalar_unpack!(msg, _token, _, _, _, {
|
api::Opcode::SuspendResume => xous::msg_scalar_unpack!(msg, _token, _, _, _, {
|
||||||
ticktimer.suspend();
|
ticktimer.suspend();
|
||||||
#[cfg(not(any(target_arch = "arm", feature = "bao1x")))]
|
#[cfg(not(any(target_arch = "arm")))]
|
||||||
susres.suspend_until_resume(_token).expect("couldn't execute suspend/resume");
|
susres.suspend_until_resume(_token).expect("couldn't execute suspend/resume");
|
||||||
#[cfg(feature = "bao1x")]
|
|
||||||
{
|
|
||||||
log::info!("waiting on good morning");
|
|
||||||
// Do not use the HAL-Service API to avoid creating a circular dependency on the HAL crate
|
|
||||||
xous::send_message(
|
|
||||||
wakeup_cid,
|
|
||||||
xous::Message::new_blocking_scalar(
|
|
||||||
bao1x_api::HalOpcode::GoodNight as usize,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
log::info!("good morning!");
|
|
||||||
}
|
|
||||||
ticktimer.resume();
|
ticktimer.resume();
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue