build: update deps

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

Cargo.lock

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sbi-spec = "0.0.4"
+sbi-spec = "0.0.5"

hsm-cell/Cargo.toml

@@ -17,7 +17,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = { version = "0.3.2-rc.2", features = ["sbi_2_0"] }
+rustsbi = { git = "https://github.com/rustsbi/rustsbi", rev = "91cfa36", features = [
+    "machine",
+] }
 sbi-spec = { version = "0.0.5", features = ["legacy"] }
 riscv = "0.10.1"
 spin = "0.9"

rustsbi-qemu/Cargo.toml

@@ -1,4 +1,6 @@
-use crate::UART;
+#![allow(unused)]
+
+use crate::UART;
 use core::ops::Range;
 use rustsbi::{spec::binary::SbiRet, Console, Physical};
 use spin::Once;

rustsbi-qemu/src/dbcn.rs

@@ -120,7 +120,7 @@ extern "C" fn rust_main(hartid: usize, opaque: usize) {
                     .with_timer(&clint::Clint)
                     .with_hsm(Hsm)
                     .with_reset(qemu_test::get())
-                    .with_console(dbcn::get())
+                    // .with_console(dbcn::get())
                     .build(),
             );
         }
@@ -343,7 +343,8 @@ type FixedRustSBI<'a> = RustSBI<
     Hsm,
     &'a qemu_test::QemuTest,
     Infallible,
-    &'a dbcn::DBCN,
+    Infallible,
+    // &'a dbcn::DBCN,
 >;
 
 struct Hsm;

rustsbi-qemu/src/main.rs

@@ -8,7 +8,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sbi-testing = { git = "https://github.com/rustsbi/sbi-testing", rev = "7a5e920", features = [
+sbi-testing = { git = "https://github.com/rustsbi/sbi-testing", rev = "02aef6d", features = [
     "log",
 ] }
 log = "0.4.17"

test-kernel/Cargo.toml

@@ -70,14 +70,17 @@ extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
 | dtb physical address  | {dtb_pa:#20x} |
 ------------------------------------------------"
     );
-    sbi_testing::Testing {
+    let testing = sbi_testing::Testing {
         hartid,
         hart_mask: (1 << smp) - 1,
         hart_mask_base: 0,
         delay: frequency,
+    };
+    if testing.test() {
+        sbi::system_reset(sbi::Shutdown, sbi::NoReason);
+    } else {
+        sbi::system_reset(sbi::Shutdown, sbi::SystemFailure);
     }
-    .test();
-    sbi::system_reset(sbi::Shutdown, sbi::NoReason);
     unreachable!()
 }