crate: update to rustsbi 0.3.0-rc.1

Author: luojia65

Cargo.lock

@@ -17,7 +17,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = { version = "0.3.0-alpha.4", features = ["legacy"] }
+rustsbi = { version = "0.3.0-rc.1", features = ["legacy"] }
 riscv = "0.9.0"
 spin = "0.9"
 r0 = "1"

rustsbi-qemu/Cargo.toml

@@ -5,14 +5,14 @@ pub(crate) struct Clint;
 
 impl Ipi for Clint {
     #[inline]
-    fn send_ipi_many(&self, hart_mask: HartMask) -> SbiRet {
+    fn send_ipi(&self, hart_mask: HartMask) -> SbiRet {
         let hsm = crate::HSM.wait();
         for i in 0..crate::NUM_HART_MAX {
             if hart_mask.has_bit(i) && hsm.is_ipi_allowed(i) {
                 msip::send(i);
             }
         }
-        SbiRet::ok(0)
+        SbiRet::success(0)
     }
 }
 

rustsbi-qemu/src/clint.rs

@@ -136,7 +136,7 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) -> Operation {
 [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

@@ -222,15 +222,15 @@ impl rustsbi::Hsm for QemuHsm {
         // this does not block the current function
         // The following process is going to be handled in software interrupt handler,
         // and the function returns immediately as starting a hart is defined as an asynchronous procedure.
-        SbiRet::ok(0)
+        SbiRet::success(0)
     }
 
     fn hart_stop(&self) -> SbiRet {
         use core::sync::atomic::Ordering::{AcqRel, Acquire};
         match self.state[hart_id()].compare_exchange(STARTED, STOP_PENDING, AcqRel, Acquire) {
             Ok(_) => {
                 *self.supervisor[hart_id()].lock() = None;
-                SbiRet::ok(0)
+                SbiRet::success(0)
             }
             Err(_) => SbiRet::failed(),
         }
@@ -240,7 +240,7 @@ impl rustsbi::Hsm for QemuHsm {
         use core::sync::atomic::Ordering::Acquire;
         self.state.get(hart_id).map_or(
             SbiRet::invalid_param(), // not in `state` map structure, the given hart id is invalid
-            |s| SbiRet::ok(s.load(Acquire) as _),
+            |s| SbiRet::success(s.load(Acquire) as _),
         )
     }
 
@@ -250,14 +250,14 @@ impl rustsbi::Hsm for QemuHsm {
             Ok(_) => match suspend_type {
                 spec::HART_SUSPEND_TYPE_RETENTIVE => {
                     self.retentive_suspend();
-                    SbiRet::ok(0)
+                    SbiRet::success(0)
                 }
                 spec::HART_SUSPEND_TYPE_NON_RETENTIVE => {
                     *self.supervisor[hart_id()].lock() = Some(Supervisor {
                         start_addr: resume_addr,
                         opaque,
                     });
-                    SbiRet::ok(0)
+                    SbiRet::success(0)
                 }
                 _ => SbiRet::not_supported(),
             },

rustsbi-qemu/src/qemu_hsm.rs

@@ -31,7 +31,7 @@ impl Reset for QemuTest {
                 RESET_REASON_SYSTEM_FAILURE => self.0.exit_failure(),
                 value => self.0.exit(value),
             },
-            RESET_TYPE_COLD_REBOOT | RESET_TYPE_WARM_REBOOT => SbiRet::ok(0),
+            RESET_TYPE_COLD_REBOOT | RESET_TYPE_WARM_REBOOT => SbiRet::success(0),
             _ => SbiRet::invalid_param(),
         }
     }