Skip to content

Commit 86e16dd

Browse files
committed
build: 更新 rustsbi
Signed-off-by: YdrMaster <ydrml@hotmail.com>
1 parent 14ad46f commit 86e16dd

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

Cargo.lock

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rustsbi-qemu/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ readme = "README.md"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
rustsbi = { git = "https://github.com/YdrMaster/rustsbi.git", rev = "0bcbd5b" }
10+
rustsbi = { git = "https://github.com/YdrMaster/rustsbi.git", rev = "2aeecdf" }
1111
riscv = "0.8"
1212
spin = "0.9"
1313
r0 = "1"

rustsbi-qemu/src/clint.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
//! CLINT 却消失不见了。
44
55
use crate::hart_id;
6-
use rustsbi::SbiRet;
7-
use rustsbi::{HartMask, Ipi, Timer};
6+
use rustsbi::{spec::binary::SbiRet, HartMask, Ipi, Timer};
87
use spin::Once;
98

109
pub(crate) struct Clint {

rustsbi-qemu/src/qemu_hsm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::{clint::Clint, entry, hart_id, set_mtvec, Supervisor, NUM_HART_MAX, SUPERVISOR_ENTRY};
44
use core::{mem::MaybeUninit, sync::atomic::AtomicU8};
5-
use rustsbi::{spec::hsm as spec, SbiRet};
5+
use rustsbi::spec::{binary::SbiRet, hsm as spec};
66
use spin::Mutex;
77

88
const STARTED: u8 = spec::HART_STATE_STARTED as _;

rustsbi-qemu/src/qemu_test.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
use qemu_exit::{QEMUExit, RISCV64};
22
use rustsbi::{
3-
spec::srst::{
4-
RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
5-
RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
3+
spec::{
4+
binary::SbiRet,
5+
srst::{
6+
RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
7+
RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
8+
},
69
},
7-
Reset, SbiRet,
10+
Reset,
811
};
912
use spin::Once;
1013

0 commit comments

Comments
 (0)