Merge pull request rustsbi#56 from YdrMaster/main

Update project dependencies

Author: luojia65

CHANGELOG.md

@@ -15,15 +15,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Modified
 
 - Use derive macro based RustSBI interface, with separate functions for legacy stdio
+- Update rustsbi to version 0.4.0-alpha.1
+- Update sbi-spec to version 0.0.7
+- Update sbi-rt to version 0.0.3
 - Update sbi-testing to version 0.0.1
-- Update sbi-spec to version 0.0.6
 - Use crate *fast-trap* version 0.0.1 in rustsbi-qemu for trap handling
 - Use crate *rcore-console* version 0.0.0 in rustsbi-qemu and test-kernel for `print!` and `println!`
 - Use crate *aclint* version 0.0.0 in rustsbi-qemu for aclint structs
 - Use crate *os-xtask-utils* version 0.0.0 in xtask builder
 - Use crate *sifive-test-device* version 0.0.0 instead of qemu-exit
 - Use crate *uart16550* version 0.0.1 for 16550 definition
 - Use `wfi` for suspend and stop without enable mie
+- Remove crate *once_cell* from dependencies
 
 ### Fixed
 

Cargo.lock

@@ -8,7 +8,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sbi-rt = "0.0.3-rc.5"
+sbi-rt = "0.0.3"
 riscv = "0.10.1"
 uart16550 = "0.0.1"
 rcore-console = "0.0.0"

bench-kernel/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sbi-spec = "0.0.7-alpha.3"
+sbi-spec = "0.0.7"
 
 [lib]
 name = "hsm_cell"

hsm-cell/Cargo.toml

@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
 channel = "nightly"
-components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]
+components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
 targets = ["riscv64imac-unknown-none-elf"]

rust-toolchain.toml

@@ -17,10 +17,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = { git = "https://github.com/rustsbi/rustsbi", rev = "4c40cd", features = [
-    "machine",
-] }
-sbi-spec = { version = "0.0.7-alpha.3", features = ["legacy"] }
+rustsbi = { version = "0.4.0-alpha.1", features = ["machine"] }
+sbi-spec = { version = "0.0.7", features = ["legacy"] }
 riscv = "0.10.1"
 spin = "0.9"
 rcore-console = "0.0.0"

rustsbi-qemu/Cargo.toml

@@ -4,7 +4,7 @@ use core::{
     ptr::null_mut,
     sync::atomic::{AtomicPtr, Ordering},
 };
-use rustsbi::{spec::binary::SbiRet, HartMask, Ipi, Timer};
+use rustsbi::{HartMask, Ipi, SbiRet, Timer};
 
 pub(crate) struct Clint;
 

rustsbi-qemu/src/clint.rs

@@ -1,9 +1,6 @@
 use crate::uart16550;
 use core::ops::Range;
-use rustsbi::{
-    spec::binary::{Physical, SbiRet},
-    Console,
-};
+use rustsbi::{Console, Physical, SbiRet};
 use spin::Once;
 
 pub(crate) struct DBCN(Range<usize>);

rustsbi-qemu/src/dbcn.rs

@@ -213,7 +213,7 @@ extern "C" fn fast_handler(
                 mie::write(mie::MSIE | mie::MTIE);
                 break boot(ctx, supervisor.start_addr, supervisor.opaque);
             }
-            Err(sbi_spec::hsm::HART_STOP) => {
+            Err(rustsbi::spec::hsm::HART_STOP) => {
                 mie::write(mie::MSIE);
                 unsafe { riscv::asm::wfi() };
                 clint::clear_msip();

rustsbi-qemu/src/main.rs

@@ -1,12 +1,9 @@
 use rustsbi::{
-    spec::{
-        binary::SbiRet,
-        srst::{
-            RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
-            RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
-        },
+    spec::srst::{
+        RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
+        RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
     },
-    Reset,
+    Reset, SbiRet,
 };
 use sifive_test_device::SifiveTestDevice;
 use spin::Once;