summaryrefslogtreecommitdiff
path: root/src/vga
diff options
context:
space:
mode:
Diffstat (limited to 'src/vga')
-rw-r--r--src/vga/buffer.rs38
1 files changed, 3 insertions, 35 deletions
diff --git a/src/vga/buffer.rs b/src/vga/buffer.rs
index 1ae4ff8..2512123 100644
--- a/src/vga/buffer.rs
+++ b/src/vga/buffer.rs
@@ -86,36 +86,6 @@ impl VgaWriter {
}
}
-impl NullLock<VgaWriter> {
- #[allow(dead_code)]
- pub fn write_byte(&self, byte: u8) {
- self.lock(|writer| {
- writer.write_byte(byte);
- });
- }
-
- #[allow(dead_code)]
- fn new_line(&self) {
- self.lock(|writer| {
- writer.new_line();
- });
- }
-
- #[allow(dead_code)]
- fn clear_row(&self, row: usize) {
- self.lock(|writer| {
- writer.clear_row(row);
- });
- }
-
- #[allow(dead_code)]
- pub fn write_string(&self, s: &str) {
- self.lock(|writer| {
- writer.write_string(s);
- });
- }
-}
-
impl fmt::Write for VgaWriter {
fn write_str(&mut self, s: &str) -> fmt::Result {
self.write_string(s);
@@ -123,11 +93,9 @@ impl fmt::Write for VgaWriter {
}
}
-impl NullLock<VgaWriter> {
- pub fn init(&self) {
- self.lock(|writer| {
- writer.buffer = Some(unsafe { &mut *(0xb8000 as *mut Buffer) });
- })
+impl crate::sync::interface::Initializable for VgaWriter {
+ fn init(&mut self) {
+ self.buffer = Some(unsafe { &mut *(0xb8000 as *mut Buffer) });
}
}