From fbe6aad8bb1c644efaf82631a441d3ec6d4e9f5d Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 22 Apr 2026 01:22:31 +0800 Subject: [PATCH] try to improve suspend/resume stability --- .../bao1x-hal-service/src/servers/keyboard.rs | 2 +- .../bao1x-hal-service/src/servers/susres.rs | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/services/bao1x-hal-service/src/servers/keyboard.rs b/services/bao1x-hal-service/src/servers/keyboard.rs index 652d1a0a9..5b6a3e00c 100644 --- a/services/bao1x-hal-service/src/servers/keyboard.rs +++ b/services/bao1x-hal-service/src/servers/keyboard.rs @@ -489,7 +489,7 @@ fn keyboard_service() { ), ) .unwrap_or_else(|_| { - log::info!("Input overflow, dropping keys!"); + log::info!("Input overflow to {}, dropping keys!", conn); xous::Result::Ok }); } diff --git a/services/bao1x-hal-service/src/servers/susres.rs b/services/bao1x-hal-service/src/servers/susres.rs index 174cfad13..9c4d51af2 100644 --- a/services/bao1x-hal-service/src/servers/susres.rs +++ b/services/bao1x-hal-service/src/servers/susres.rs @@ -379,7 +379,14 @@ fn susres_service() { }), Some(Opcode::Quit) => break, Some(Opcode::PlatformSpecific) => { - msg_blocking_scalar_unpack!(msg, op, _arg2, _arg3, _arg4, { + if let xous::Message::BlockingScalar(xous::ScalarMessage { + id: _id, + arg1: op, + arg2: _arg2, + arg3: _arg3, + arg4: _arg4, + }) = msg.body + { let platform_op = FromPrimitive::from_usize(op); match platform_op { Some(ClockOp::GetVco) => { @@ -403,15 +410,26 @@ fn susres_service() { Some(ClockOp::GetPer) => { xous::return_scalar(msg.sender, clk_mgr.perclk as usize).unwrap() } + _ => panic!("Incorrect PlatformOp"), + } + } + if let xous::Message::Scalar(xous::ScalarMessage { + id: _id, + arg1: op, + arg2: _arg2, + arg3: _arg3, + arg4: _arg4, + }) = msg.body + { + let platform_op = FromPrimitive::from_usize(op); + match platform_op { Some(ClockOp::DeepSleep) => { - log::info!("entering deep sleep"); clk_mgr.deep_sleep(); - xous::return_scalar(msg.sender, 1).ok(); // system is shut down after this point, no code runs } _ => panic!("Incorrect PlatformOp"), } - }) + } } None => { log::error!("couldn't convert opcode");