Skip to content

Commit f15d510

Browse files
committed
build: remove sbi_spec from deps
Signed-off-by: YdrMaster <ydrml@hotmail.com>
1 parent e280c5f commit f15d510

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1515
### Modified
1616

1717
- Use derive macro based RustSBI interface, with separate functions for legacy stdio
18-
- Update sbi-testing to version 0.0.1
18+
- Update rustsbi to version 0.4.0-alpha.1
1919
- Update sbi-spec to version 0.0.7
20+
- Update sbi-rt to version 0.0.3
21+
- Update sbi-testing to version 0.0.1
2022
- Use crate *fast-trap* version 0.0.1 in rustsbi-qemu for trap handling
2123
- Use crate *rcore-console* version 0.0.0 in rustsbi-qemu and test-kernel for `print!` and `println!`
2224
- Use crate *aclint* version 0.0.0 in rustsbi-qemu for aclint structs

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rustsbi-qemu/src/clint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::{
44
ptr::null_mut,
55
sync::atomic::{AtomicPtr, Ordering},
66
};
7-
use rustsbi::{spec::binary::SbiRet, HartMask, Ipi, Timer};
7+
use rustsbi::{HartMask, Ipi, SbiRet, Timer};
88

99
pub(crate) struct Clint;
1010

rustsbi-qemu/src/dbcn.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
use crate::uart16550;
22
use core::ops::Range;
3-
use rustsbi::{
4-
spec::binary::{Physical, SbiRet},
5-
Console,
6-
};
3+
use rustsbi::{Console, Physical, SbiRet};
74
use spin::Once;
85

96
pub(crate) struct DBCN(Range<usize>);

rustsbi-qemu/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ extern "C" fn fast_handler(
213213
mie::write(mie::MSIE | mie::MTIE);
214214
break boot(ctx, supervisor.start_addr, supervisor.opaque);
215215
}
216-
Err(sbi_spec::hsm::HART_STOP) => {
216+
Err(rustsbi::spec::hsm::HART_STOP) => {
217217
mie::write(mie::MSIE);
218218
unsafe { riscv::asm::wfi() };
219219
clint::clear_msip();

rustsbi-qemu/src/qemu_test.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
use rustsbi::{
2-
spec::{
3-
binary::SbiRet,
4-
srst::{
5-
RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
6-
RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
7-
},
2+
spec::srst::{
3+
RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
4+
RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
85
},
9-
Reset,
6+
Reset, SbiRet,
107
};
118
use sifive_test_device::SifiveTestDevice;
129
use spin::Once;

0 commit comments

Comments
 (0)