From 77d02a128b05c127263640240589888c14963499 Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Sun, 24 Mar 2024 21:25:12 +0800 Subject: [PATCH] fix: entry.rs: test console deadlock --- kernel/src/entry.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/kernel/src/entry.rs b/kernel/src/entry.rs index 573cb36..a3ad447 100644 --- a/kernel/src/entry.rs +++ b/kernel/src/entry.rs @@ -35,11 +35,15 @@ pub extern "C" fn rust_main(hart_id: usize, device_tree_addr: usize) -> ! { Hardware::enable_interrupt(); loop { - if let Some(ch) = CONSOLE.lock().try_read() { - debug!("Key: {}", ch); - if ch == b'q' { - break; - } + let data = CONSOLE.lock().try_read(); + match data { + Some(ch) => { + debug!("Key: {}", ch as char); + if ch == b'q' { + break; + } + }, + None => continue, } }