refactor: 依赖新版本 rustsbi

Author: YdrMaster

Cargo.lock

@@ -7,12 +7,10 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = { git = "https://github.com/rustsbi/rustsbi.git", rev = "40c2985" }
+rustsbi = { git = "https://github.com/YdrMaster/rustsbi.git", rev = "bdd67f8" }
 riscv = "0.8"
-embedded-hal = "0.2.7"
 spin = "0.9"
 r0 = "1"
-nb = "1"
 buddy_system_allocator = "0.8"
 uart_16550 = "0.2"
 dtb-walker = { git = "https://github.com/YdrMaster/dtb-walker.git", rev = "0ef2209" }

rustsbi-qemu/Cargo.toml

@@ -38,7 +38,7 @@ impl Clint {
     }
 }
 
-impl Ipi for &'static Clint {
+impl Ipi for Clint {
     #[inline]
     fn send_ipi_many(&self, hart_mask: HartMask) -> SbiRet {
         let hsm = crate::HSM.wait();
@@ -51,7 +51,7 @@ impl Ipi for &'static Clint {
     }
 }
 
-impl Timer for &'static Clint {
+impl Timer for Clint {
     #[inline]
     fn set_timer(&self, time_value: u64) {
         unsafe {

rustsbi-qemu/src/clint.rs

@@ -110,6 +110,9 @@ use core::sync::atomic::{AtomicBool, Ordering::AcqRel};
 use device_tree::BoardInfo;
 use spin::Once;
 
+#[link_section = ".bss.uninit"]
+static mut SERIAL: Option<ns16550a::Ns16550a> = None;
+
 #[link_section = ".bss.uninit"]
 static HSM: Once<qemu_hsm::QemuHsm> = Once::new();
 
@@ -133,13 +136,13 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) {
         // 初始化外设
         clint::init(board_info.clint.start);
         test_device::init(board_info.test.start);
-        let uart = unsafe { ns16550a::Ns16550a::new(board_info.uart.start) };
+        unsafe { SERIAL = Some(ns16550a::Ns16550a::new(board_info.uart.start)) };
         let hsm = HSM.call_once(|| qemu_hsm::QemuHsm::new(clint::get(), NUM_HART_MAX, opaque));
         // 初始化 SBI 服务
-        rustsbi::legacy_stdio::init_legacy_stdio_embedded_hal(uart);
+        rustsbi::legacy_stdio::init_legacy_stdio(unsafe { SERIAL.as_mut() }.unwrap());
         rustsbi::init_ipi(clint::get());
         rustsbi::init_timer(clint::get());
-        rustsbi::init_reset(test_device::get().clone());
+        rustsbi::init_reset(test_device::get());
         rustsbi::init_hsm(hsm);
         // 打印启动信息
         print!(
@@ -156,7 +159,7 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) {
 [rustsbi] Supervisor Address : {SUPERVISOR_ENTRY:#x}
 ",
             ver_sbi = rustsbi::VERSION,
-            logo = rustsbi::LOGO,
+            logo = rustsbi::logo(),
             ver_impl = env!("CARGO_PKG_VERSION"),
             model = board_info.model,
             smp = board_info.smp,

rustsbi-qemu/src/main.rs

@@ -1,5 +1,4 @@
-use core::convert::Infallible;
-use embedded_hal::serial::{Read, Write};
+use rustsbi::legacy_stdio::LegacyStdio;
 use uart_16550::MmioSerialPort;
 
 pub(crate) struct Ns16550a(MmioSerialPort);
@@ -10,23 +9,12 @@ impl Ns16550a {
     }
 }
 
-impl Read<u8> for Ns16550a {
-    type Error = Infallible;
-
-    fn read(&mut self) -> nb::Result<u8, Self::Error> {
-        Ok(self.0.receive())
-    }
-}
-
-impl Write<u8> for Ns16550a {
-    type Error = Infallible;
-
-    fn write(&mut self, word: u8) -> nb::Result<(), Self::Error> {
-        self.0.send(word);
-        Ok(())
+impl LegacyStdio for Ns16550a {
+    fn getchar(&mut self) -> u8 {
+        self.0.receive()
     }
 
-    fn flush(&mut self) -> nb::Result<(), Self::Error> {
-        Ok(())
+    fn putchar(&mut self, ch: u8) {
+        self.0.send(ch);
     }
 }

rustsbi-qemu/src/ns16550a.rs

@@ -194,7 +194,7 @@ impl QemuHsm {
 }
 
 // Adapt RustSBI interface to RustSBI-QEMU's QemuHsm.
-impl rustsbi::Hsm for &'static QemuHsm {
+impl rustsbi::Hsm for QemuHsm {
     fn hart_start(&self, hart_id: usize, start_addr: usize, opaque: usize) -> SbiRet {
         use core::sync::atomic::Ordering::{AcqRel, Acquire};
         use riscv::register::mstatus::{self, MPP};