Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add boards/ && cargo clippy&fmt

Browse source
This commit is contained in:
Yifan Wu 2022-01-24 15:43:57 -08:00
parent ce80bc2bfd
commit 493fba58fe
6 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
os/Cargo.toml
View file

@ -9,6 +9,7 @@ edition = "2018"
[dependencies] [dependencies]
riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] } riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
lazy_static = { version = "1.4.0", features = ["spin_no_std"] } lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
cfg-if = { version = "1.0.0" }
[features] [features]
board_qemu = [] board_qemu = []

1
os/src/boards/k210.rs Normal file
View file

@ -0,0 +1 @@
pub const CLOCK_FREQ: usize = 403000000 / 62;

1
os/src/boards/qemu.rs Normal file
View file

@ -0,0 +1 @@
pub const CLOCK_FREQ: usize = 12500000;

3
os/src/config.rs
View file

@ -4,8 +4,11 @@ pub const MAX_APP_NUM: usize = 4;
pub const APP_BASE_ADDRESS: usize = 0x80400000; pub const APP_BASE_ADDRESS: usize = 0x80400000;
pub const APP_SIZE_LIMIT: usize = 0x20000; pub const APP_SIZE_LIMIT: usize = 0x20000;
/*
#[cfg(feature = "board_k210")] #[cfg(feature = "board_k210")]
pub const CLOCK_FREQ: usize = 403000000 / 62; pub const CLOCK_FREQ: usize = 403000000 / 62;
#[cfg(feature = "board_qemu")] #[cfg(feature = "board_qemu")]
pub const CLOCK_FREQ: usize = 12500000; pub const CLOCK_FREQ: usize = 12500000;
*/
pub use crate::board::CLOCK_FREQ;

6
os/src/main.rs
View file

@ -4,6 +4,12 @@
use core::arch::global_asm; use core::arch::global_asm;
#[cfg(feature = "board_k210")]
#[path = "boards/k210.rs"]
mod board;
#[cfg(not(any(feature = "board_k210")))]
#[path = "boards/qemu.rs"]
mod board;
#[macro_use] #[macro_use]
mod console; mod console;
mod config; mod config;

7
os/src/task/mod.rs
View file

@ -1,5 +1,6 @@
mod context; mod context;
mod switch; mod switch;
#[allow(clippy::module_inception)]
mod task; mod task;
use crate::config::MAX_APP_NUM; use crate::config::MAX_APP_NUM;
@ -28,9 +29,9 @@ lazy_static! {
task_cx: TaskContext::zero_init(), task_cx: TaskContext::zero_init(),
task_status: TaskStatus::UnInit, task_status: TaskStatus::UnInit,
}; MAX_APP_NUM]; }; MAX_APP_NUM];
for i in 0..num_app { for (i, task) in tasks.iter_mut().enumerate() {
tasks[i].task_cx = TaskContext::goto_restore(init_app_cx(i)); task.task_cx = TaskContext::goto_restore(init_app_cx(i));
tasks[i].task_status = TaskStatus::Ready; task.task_status = TaskStatus::Ready;
} }
TaskManager { TaskManager {
num_app, num_app,