xobs/xous-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vexriscv: use upstream package

Browse Source 
Use this package rather than the local xous-riscv package.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross
2020-01-09 10:45:22 +08:00
parent 3a6c4f9a1c
commit fd7bbc463d
8 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xous-kernel-riscv-rt/Cargo.toml
View File

@ -10,9 +10,9 @@ license = "ISC"
[dependencies]
r0 = "0.2.2"
xous-riscv = { path = "../xous-riscv" }
vexriscv = "0.0.2"
xous-kernel-riscv-rt-macros = { path = "macros" }
[dev-dependencies]
xous-riscv = { path = "../xous-riscv" }
vexriscv = "0.0.2"
panic-halt = "0.2.0"

8
xous-kernel-riscv-rt/src/lib.rs
View File

@ -253,13 +253,13 @@
#![deny(missing_docs)]
#![deny(warnings)]
extern crate xous_riscv;
extern crate vexriscv;
extern crate xous_kernel_riscv_rt_macros as macros;
extern crate r0;
pub use macros::{xous_kernel_entry, pre_init};
use xous_riscv::register::mstatus;
use vexriscv::register::mstatus;
#[export_name = "error: riscv-rt appears more than once in the dependency graph"]
#[doc(hidden)]
@ -341,11 +341,11 @@ pub unsafe extern "Rust" fn default_pre_init() {}
#[doc(hidden)]
#[no_mangle]
pub extern "Rust" fn default_mp_hook() -> bool {
use xous_riscv::register::mhartid;
use vexriscv::register::mhartid;
match mhartid::read() {
0 => true,
_ => loop {
unsafe { xous_riscv::asm::wfi() }
unsafe { vexriscv::asm::wfi() }
},
}
}