Refactor editor

src/sys/console.rs

@@ -32,73 +32,6 @@ pub fn has_cursor() -> bool {
     cfg!(feature = "video")
 }
 
-pub fn clear_row_after(x: usize) {
-    if cfg!(feature = "video") {
-        sys::vga::clear_row_after(x);
-    } else {
-        sys::serial::print_fmt(format_args!("\r")); // Move cursor to begining of line
-        sys::serial::print_fmt(format_args!("\x1b[{}C", x)); // Move cursor forward to position
-        sys::serial::print_fmt(format_args!("\x1b[K")); // Clear line after position
-    }
-}
-
-pub fn clear_row() {
-    clear_row_after(0);
-}
-
-pub fn clear_screen() {
-    if cfg!(feature = "video") {
-        sys::vga::clear_screen();
-    } else {
-        sys::serial::print_fmt(format_args!("\x1b[2J"));
-    }
-}
-
-pub fn cursor_position() -> (usize, usize) {
-    if cfg!(feature = "video") {
-        sys::vga::cursor_position()
-    } else {
-        sys::serial::print_fmt(format_args!("\x1b[6n")); // Ask cursor position
-        get_char(); // ESC
-        get_char(); // [
-        let mut x = String::new();
-        let mut y = String::new();
-        loop {
-            let c = get_char();
-            if c == ';' {
-                break;
-            } else {
-                y.push(c);
-            }
-        }
-        loop {
-            let c = get_char();
-            if c == 'R' {
-                break;
-            } else {
-                x.push(c);
-            }
-        }
-        (x.parse().unwrap_or(1), y.parse().unwrap_or(1))
-    }
-}
-
-pub fn set_cursor_position(x: usize, y: usize) {
-    if cfg!(feature = "video") {
-        sys::vga::set_cursor_position(x, y);
-    } else {
-        sys::serial::print_fmt(format_args!("\x1b[{};{}H", y + 1, x + 1));
-    }
-}
-
-pub fn set_writer_position(x: usize, y: usize) {
-    if cfg!(feature = "video") {
-        sys::vga::set_writer_position(x, y);
-    } else {
-        sys::serial::print_fmt(format_args!("\x1b[{};{}H", y + 1, x + 1));
-    }
-}
-
 pub fn disable_echo() {
     let mut echo = ECHO.lock();
     *echo = false;

src/sys/serial.rs

@@ -4,6 +4,7 @@ use core::fmt::Write;
 use lazy_static::lazy_static;
 use spin::Mutex;
 use uart_16550::SerialPort;
+use x86_64::instructions::interrupts;
 
 lazy_static! {
     pub static ref SERIAL: Mutex<Serial> = Mutex::new(Serial::new(0x3F8));
@@ -36,7 +37,9 @@ impl fmt::Write for Serial {
 
 #[doc(hidden)]
 pub fn print_fmt(args: fmt::Arguments) {
-    SERIAL.lock().write_fmt(args).expect("Could not print to serial");
+    interrupts::without_interrupts(|| {
+        SERIAL.lock().write_fmt(args).expect("Could not print to serial");
+    })
 }
 
 pub fn init() {