Create a static WRITER protected by a spinlock

master
Philipp Oppermann 8 years ago
parent f24c7bc322
commit 40aed4fa0f

@ -9,3 +9,4 @@ crate-type = ["staticlib"]
[dependencies] [dependencies]
rlibc = "1.0" rlibc = "1.0"
volatile = "0.1.0" volatile = "0.1.0"
spin = "0.4.5"

@ -1,10 +1,12 @@
#![feature(lang_items)] #![feature(lang_items)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(const_unique_new)]
#![feature(unique)] #![feature(unique)]
#![no_std] #![no_std]
extern crate rlibc; extern crate rlibc;
extern crate volatile; extern crate volatile;
extern crate spin;
mod vga_buffer; mod vga_buffer;
@ -12,7 +14,10 @@ mod vga_buffer;
pub extern fn rust_main() { pub extern fn rust_main() {
// ATTENTION: we have a very small stack and no guard page // ATTENTION: we have a very small stack and no guard page
vga_buffer::print_something(); use core::fmt::Write;
vga_buffer::WRITER.lock().write_str("Hello again");
write!(vga_buffer::WRITER.lock(), ", some numbers: {} {}", 42, 1.337);
loop{} loop{}
} }

@ -1,7 +1,14 @@
use core::fmt; use core::fmt;
use core::ptr::Unique; use core::ptr::Unique;
use spin::Mutex;
use volatile::Volatile; use volatile::Volatile;
pub static WRITER: Mutex<Writer> = Mutex::new(Writer {
column_position: 0,
color_code: ColorCode::new(Color::LightGreen, Color::Black),
buffer: unsafe { Unique::new_unchecked(0xb8000 as *mut _) },
});
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
#[repr(u8)] #[repr(u8)]
@ -116,17 +123,3 @@ impl fmt::Write for Writer {
Ok(()) Ok(())
} }
} }
pub fn print_something() {
use core::fmt::Write;
let mut writer = Writer {
column_position: 0,
color_code: ColorCode::new(Color::LightGreen, Color::Black),
buffer: unsafe { Unique::new(0xb8000 as *mut _) },
};
writeln!(writer, "Hello!");
writeln!(writer, "The numbers are {} and {}", 42, 1.0/3.0);
}

Loading…
Cancel
Save