michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 06:47:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-06-new' into post-07-new-rebased

Browse Source
This commit is contained in:
Philipp Oppermann
2019-04-26 15:24:28 +02:00
parent db0489403a 70d981e179
commit ad6cb02d5c
18 changed files with 289 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/serial.rs
View File

@@ -4,7 +4,7 @@ use uart_16550::SerialPort;
lazy_static! {
pub static ref SERIAL1: Mutex<SerialPort> = {
let mut serial_port = SerialPort::new(0x3F8);
let mut serial_port = unsafe { SerialPort::new(0x3F8) };
serial_port.init();
Mutex::new(serial_port)
};
@@ -36,5 +36,6 @@ macro_rules! serial_print {
macro_rules! serial_println {
() => ($crate::serial_print!("\n"));
($fmt:expr) => ($crate::serial_print!(concat!($fmt, "\n")));
($fmt:expr, $($arg:tt)*) => ($crate::serial_print!(concat!($fmt, "\n"), $($arg)*));
($fmt:expr, $($arg:tt)*) => ($crate::serial_print!(
concat!($fmt, "\n"), $($arg)*));
}