mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
handle case of sleep request before resume is fully completed
This commit is contained in:
parent
f5b69a8cef
commit
57574495d8
1 changed files with 4 additions and 2 deletions
|
|
@ -599,7 +599,7 @@ fn xmain() -> ! {
|
||||||
do_hook(hookdata, &mut suspend_subscribers);
|
do_hook(hookdata, &mut suspend_subscribers);
|
||||||
},
|
},
|
||||||
Some(Opcode::SuspendReady) => msg_scalar_unpack!(msg, token, _, _, _, {
|
Some(Opcode::SuspendReady) => msg_scalar_unpack!(msg, token, _, _, _, {
|
||||||
log::trace!("suspendready with token {}", token);
|
//log::trace!("suspendready with token {}", token);
|
||||||
if !suspend_requested {
|
if !suspend_requested {
|
||||||
log::error!("received a SuspendReady message when a suspend wasn't pending. Ignoring.");
|
log::error!("received a SuspendReady message when a suspend wasn't pending. Ignoring.");
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -644,7 +644,9 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
Some(Opcode::SuspendRequest) => {
|
Some(Opcode::SuspendRequest) => {
|
||||||
if allow_suspend {
|
// if the 2-second timeout is still pending from a previous suspend, deny the suspend request.
|
||||||
|
// ...just don't suspend that quickly after resuming???
|
||||||
|
if allow_suspend && !timeout_pending {
|
||||||
suspend_requested = true;
|
suspend_requested = true;
|
||||||
// clear the resume gate
|
// clear the resume gate
|
||||||
SHOULD_RESUME.store(false, Ordering::Relaxed);
|
SHOULD_RESUME.store(false, Ordering::Relaxed);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue