From 2625fd044547c7e8b8de287963ba9422aff1f051 Mon Sep 17 00:00:00 2001
From: Tianhao Wang <shrik3@riseup.net>
Date: Sat, 11 Mar 2023 00:39:38 +0100
Subject: fix linking

---
 src/lib.rs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 767e547..c10460c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,23 +1,18 @@
 #![no_std]
 #![no_main]
 mod arch;
-// use core::panic::PanicInfo;
+mod machine;
+use core::panic::PanicInfo;
+use machine::cgascr::CGAScreen;
 
-static HELLO: &[u8] = b"Hello World!";
-
-// #[panic_handler]
-// fn panic(_info: &PanicInfo) -> ! {
-//
-//     loop {}
-// }
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    loop {}
+}
 
 #[no_mangle]
 pub extern "C" fn _entry() -> ! {
-    let vga_buffer = 0xb8000 as *mut u8;
-
-    unsafe {
-        *vga_buffer.offset(10 as isize * 2) = 'X' as u8;
-        *vga_buffer.offset(10 as isize * 2 + 1) = 0xb;
-    }
+    let scr = CGAScreen::new(80,25);
+    scr.test();
     loop {}
 }
-- 
cgit v1.2.3-70-g09d2