andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2025-01-18 21:17:14 +04:00
Code Issues Projects Releases Wiki Activity

in gdb mode, OK. For the safety of TIMER_SCRATCH, put clear_bss Fn in rust_start. and explicitly UART.init in rust_main.

Browse Source
This commit is contained in:
Yu Chen 2023-01-03 09:50:56 +08:00
parent a92ded6e1f
commit 7c9a58192a
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/src/drivers/chardev/mod.rs
View File

@ -6,6 +6,7 @@ use lazy_static::*;
pub use ns16550a::NS16550a;
pub trait CharDevice {
fn init(&self);
fn read(&self) -> u8;
fn write(&self, ch: u8);
fn handle_irq(&self);

7
os/src/drivers/chardev/ns16550a.rs
View File

@ -135,7 +135,7 @@ impl<const BASE_ADDR: usize> NS16550a<BASE_ADDR> {
ns16550a: NS16550aRaw::new(BASE_ADDR),
read_buffer: VecDeque::new(),
};
inner.ns16550a.init();
//inner.ns16550a.init();
Self {
inner: unsafe { UPIntrFreeCell::new(inner) },
condvar: Condvar::new(),
@ -144,6 +144,11 @@ impl<const BASE_ADDR: usize> NS16550a<BASE_ADDR> {
}
impl<const BASE_ADDR: usize> CharDevice for NS16550a<BASE_ADDR> {
fn init(&self){
let mut inner = self.inner.exclusive_access();
inner.ns16550a.init();
drop(inner);
}
fn read(&self) -> u8 {
loop {
let mut inner = self.inner.exclusive_access();

17
os/src/main.rs
View File

@ -214,6 +214,7 @@ pub unsafe fn mie_write(x:usize){
}
unsafe fn timer_init() {
clear_bss();
// each CPU has a separate source of timer interrupts
//let id = mhartid::read();
@ -246,19 +247,19 @@ unsafe fn timer_init() {
//mie::set_mtimer();
}
use crate::drivers::chardev::CharDevice;
use crate::drivers::chardev::UART;
#[no_mangle]
pub fn rust_main() -> ! {
clear_bss();
println!("KERN: begin");
//clear_bss();
mm::init();
UART.init();
println!("KERN: begin");
//loop{};
//println!("KERN: init gpu");
//let _gpu = GPU_DEVICE.clone();
// println!("KERN: init keyboard");
println!("KERN: init gpu");
let _gpu = GPU_DEVICE.clone();
println!("KERN: init keyboard");
// let _keyboard = KEYBOARD_DEVICE.clone();
//println!("KERN: init mouse");
//let _mouse = MOUSE_DEVICE.clone();