Reformatting of print + added further files

Author: cs-t1

src/exceptions.rs

@@ -8,42 +8,35 @@ use spin::Mutex;
 
 mod vga;
 
-lazy_static! { 
-    pub static ref SCREEN : Mutex<vga::Screen> = Mutex::new(vga::Screen{
-        col_pos : 0,
-        row_pos : 0,
-        color : vga::ColorCode::new(vga::Color::Yellow, vga::Color::Black),
-        buffer : unsafe { &mut *(0xb8000 as *mut vga::BUFFER) },
-    });
-}
-
 /// This function is called on panic.
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
-    writeln!(SCREEN.lock(), "{}", _info).unwrap();
+    println!("{}", _info);
     loop {}
 }
 
 /// This is the starting function. Its name must not be changeed by the compiler, hence the `#![no_mangle]`
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
+    /*
     SCREEN.lock().clear().unwrap();
 
     SCREEN.lock().write_byte(b'H');
     SCREEN.lock().write_string("ello \n");
     SCREEN.lock().write_string("Wörld! \n");
     write!(SCREEN.lock(), "Test : {}", 42).unwrap();
+    */
 
     for i in 0..10 {
-        writeln!(SCREEN.lock(), "{}", i).unwrap();
+        println!("{}", i);
     }
     for i in 0..30 {
-        writeln!(SCREEN.lock(), "{},", i).unwrap();
+        println!("{},", i);
     }
 
     for i in 0..1000000 {
-        write!(SCREEN.lock(), "{}/1000000", i).unwrap();
-        SCREEN.lock().write_byte(b'\r');
+        print!("{}/1000000", i);
+        vga::write_back();
     }
 
     loop{}

src/interrupt.rs

@@ -1,9 +1,42 @@
 use core::fmt;
+use core::fmt::Write;
+use lazy_static::lazy_static;
+use spin::Mutex;
 
 const BUFFER_HEIGHT: usize = 25;
 const BUFFER_WIDTH: usize = 80;
 
 
+lazy_static! { 
+    pub static ref SCREEN : Mutex<Screen> = Mutex::new(Screen{
+        col_pos : 0,
+        row_pos : 0,
+        color : ColorCode::new(Color::LightGreen, Color::Black),
+        buffer : unsafe { &mut *(0xb8000 as *mut BUFFER) },
+    });
+}
+
+#[macro_export]
+macro_rules! println {
+    () => (print!("\n"));
+    ($($arg:tt)*) => (print!("{}\n", format_args!($($arg)*)));
+}
+
+#[macro_export]
+macro_rules! print {
+    ($($arg:tt)*) => ($crate::vga::_print(format_args!($($arg)*)));
+}
+
+pub fn write_back() {
+    SCREEN.lock().write_byte(b'\r');
+}
+
+pub fn _print(args: fmt::Arguments) {
+    SCREEN.lock().write_fmt(args).unwrap();
+}
+
+
+
 /// The 16 colors available in VGA mode
 #[allow(dead_code)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -136,7 +169,7 @@ impl Screen {
         self.write_string(s);
         self.set_color(old_color);
     }
-    fn new(color : ColorCode, buffer : &'static mut BUFFER) -> Self {
+    fn _new(color : ColorCode, buffer : &'static mut BUFFER) -> Self {
         Screen {col_pos : 0, row_pos : 0, color : color, buffer : buffer}
     }
     pub fn set_color(&mut self, color : ColorCode) -> () {
@@ -163,12 +196,4 @@ impl fmt::Write for Screen {
         self.write_string(s);
         Ok(())
     }
-}
-
-pub fn new_screen<'a>() -> Result<Screen, VgaError<'a>> {
-    let res = Screen::new(
-        ColorCode::new(Color::Yellow, Color::Black),
-        unsafe { &mut *(0xb8000 as *mut BUFFER) },
-    );
-    Ok(res)
 }