diff --git a/os/Cargo.toml b/os/Cargo.toml index 59c50196..f5870417 100644 --- a/os/Cargo.toml +++ b/os/Cargo.toml @@ -20,6 +20,6 @@ virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers" } # easy-fs = { path = "../easy-fs" } #log = "0.4" spin = "0.7.0" -# [features] -# board_qemu = [] -# board_k210 = [] \ No newline at end of file +[features] +board_qemu = [] +board_k210 = [] \ No newline at end of file diff --git a/os/src/board/mod.rs b/os/src/board/mod.rs index 9b2c3201..cefc4b87 100644 --- a/os/src/board/mod.rs +++ b/os/src/board/mod.rs @@ -1,3 +1,6 @@ +mod qemu; +pub use qemu::*; + pub const CLOCK_FREQ: usize = 12500000; pub const MMIO: &[(usize, usize)] = &[ diff --git a/os/src/board/qemu.rs b/os/src/board/qemu.rs index e3cda983..441c7d57 100644 --- a/os/src/board/qemu.rs +++ b/os/src/board/qemu.rs @@ -19,6 +19,7 @@ use crate::drivers::plic::{IntrTargetPriority, PLIC}; pub fn device_init() { use riscv::register::sie; + kprintln!("[KERN] board::qemu::device_init() begin"); let mut plic = unsafe { PLIC::new(VIRT_PLIC) }; let hart_id: usize = 0; diff --git a/os/src/main.rs b/os/src/main.rs index e0c60441..f86c74fd 100644 --- a/os/src/main.rs +++ b/os/src/main.rs @@ -12,8 +12,8 @@ extern crate bitflags; // #[path = "boards/k210.rs"] // mod board; // #[cfg(not(any(feature = "board_k210")))] -// #[path = "boards/qemu.rs"] - +// #[path = "board/qemu.rs"] +// mod board::qemu; #[macro_use] mod console;