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

Make print_error safe by using the global writer

Browse Source 
This is now possible since we fixed the deadlock problem.
This commit is contained in:
Philipp Oppermann
2016-10-26 09:07:55 +02:00
parent d96df500a7
commit 212dcfa592
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vga_buffer.rs
View File

@@ -43,16 +43,15 @@ pub fn clear_screen() {
}
}
pub unsafe fn print_error(fmt: fmt::Arguments) {
pub fn print_error(fmt: fmt::Arguments) {
use core::fmt::Write;
use core::mem;
let mut writer = Writer {
column_position: 0,
color_code: ColorCode::new(Color::Red, Color::Black),
buffer: Unique::new(0xb8000 as *mut _),
};
writer.new_line();
writer.write_fmt(fmt);
let mut writer = WRITER.lock();
let red = ColorCode::new(Color::Red, Color::Black);
let default_color = mem::replace(&mut writer.color_code, red);
writer.write_fmt(fmt).unwrap();
writer.color_code = default_color;
}
#[allow(dead_code)]