andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 16:16:16 +04:00
Code Issues Projects Releases Wiki Activity

Update simple_uart

Browse Source
This commit is contained in:
Yuhao Zhou 2019-04-29 11:55:58 +08:00
parent ff0fa24897
commit cbad1f2ceb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/src/drivers/serial/simple_uart.rs
View File

@ -2,6 +2,7 @@
use crate::util::{read, write};
use core::fmt::{Arguments, Result, Write};
use spin::Mutex;
#[derive(Debug, Clone, Copy)]
pub struct SerialPort {
@ -15,6 +16,10 @@ const UART_STATUS_CTS: u8 = 0x1; // clear to send signal
const UART_STATUS_DR: u8 = 0x2; // data ready signal
impl SerialPort {
fn new() -> SerialPort {
SerialPort { base: 0 }
}
pub fn init(&mut self, base: usize) {
self.base = base;
}
@ -49,12 +54,6 @@ impl SerialPort {
pub fn putfmt(&mut self, fmt: Arguments) {
self.write_fmt(fmt).unwrap();
}
pub fn lock(&self) -> SerialPort {
self.clone()
}
pub fn force_unlock(&self) {}
}
impl Write for SerialPort {
@ -72,7 +71,10 @@ impl Write for SerialPort {
}
}
pub static SERIAL_PORT: SerialPort = SerialPort { base: 0 };
// pub static SERIAL_PORT: SerialPort = SerialPort { base: 0xa3000000 };
lazy_static! {
pub static ref SERIAL_PORT: Mutex<SerialPort> = Mutex::new(SerialPort::new());
}
pub fn init(base: usize) {
SERIAL_PORT.lock().init(base);