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

explicitly UART.init() in rust_main

Browse source
This commit is contained in:
Yu Chen 2023-01-03 09:32:36 +08:00
parent 01856f5243
commit 6d1960ecd9
3 changed files with 11 additions and 1 deletions
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 use ns16550a::NS16550a;
pub trait CharDevice { pub trait CharDevice {
fn init(&self);
fn read(&self) -> u8; fn read(&self) -> u8;
fn write(&self, ch: u8); fn write(&self, ch: u8);
fn handle_irq(&self); fn handle_irq(&self);

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

3
os/src/main.rs
View file

@ -28,6 +28,8 @@ mod task;
mod timer; mod timer;
mod trap; mod trap;
use crate::drivers::chardev::CharDevice;
use crate::drivers::chardev::UART;
//use syscall::create_desktop; //for test //use syscall::create_desktop; //for test
core::arch::global_asm!(include_str!("entry.asm")); core::arch::global_asm!(include_str!("entry.asm"));
@ -55,6 +57,7 @@ lazy_static! {
pub fn rust_main() -> ! { pub fn rust_main() -> ! {
clear_bss(); clear_bss();
mm::init(); mm::init();
UART.init();
println!("KERN: init gpu"); println!("KERN: init gpu");
let _gpu = GPU_DEVICE.clone(); let _gpu = GPU_DEVICE.clone();
println!("KERN: init keyboard"); println!("KERN: init keyboard");