moved serial

Author: Matthew

.cargo/config.toml

@@ -1,5 +1,5 @@
 [unstable]
-build-std = ["core", "compiler_builtins"]
+build-std = ["core", "compiler_builtins", "alloc"]
 build-std-features = ["compiler-builtins-mem"]
 
 [build]

crates/kopy_keyboard/src/lib.rs

@@ -28,6 +28,7 @@ pub fn handle_key_event(mut port: Port<u8>) {
                         WRITER.lock().delete_last_character();
                     }),
                     '\n' => interrupts::without_interrupts(|| {
+                        ksh::handle_line(WRITER.lock().buffer);
                         ksh::new_line();
                     }),
                     _ => print!("{}", character),

crates/ksh/src/lib.rs

@@ -26,11 +26,10 @@ pub fn new_line() {
     print!("\n$ ");
 }
 
-pub fn handle_line(line: Buffer) {}
-
-pub fn output<T>(text: T)
-where
-    T: core::fmt::Display,
-{
-    print!("{}", text);
+pub fn handle_line(buffer: &Buffer) {
+    // let mut line: String = " ".to_string();
+    // for char in 0..BUFFER_WIDTH {
+    //     let screen_char = buffer.chars[BUFFER_HEIGHT - 1][char].read();
+    //     line.push(char::from(screen_char.ascii_character));
+    // }
 }

src/lib.rs

@@ -10,8 +10,8 @@ use core::panic::PanicInfo;
 
 pub mod gdt;
 pub mod interrupts;
-pub mod serial;
-pub use kopy_core::vga_buffer;
+
+use kopy_core::{serial_print, serial_println};
 
 pub fn init() {
     gdt::init();

src/serial.rs

@@ -5,7 +5,7 @@
 #![reexport_test_harness_main = "test_main"]
 
 use core::panic::PanicInfo;
-use kopy_os::println;
+use kopy_core::println;
 
 #[no_mangle]
 pub extern "C" fn _start() -> ! {

tests/basic_boot.rs

@@ -5,7 +5,8 @@
 #![reexport_test_harness_main = "test_main"]
 
 use core::panic::PanicInfo;
-use kopy_os::{exit_qemu, serial_print, serial_println, QemuExitCode};
+use kopy_core::{serial_print, serial_println};
+use kopy_os::{exit_qemu, QemuExitCode};
 use kopy_os::{Green, Red};
 
 #[no_mangle]

tests/should_panic.rs

@@ -3,8 +3,9 @@
 #![feature(abi_x86_interrupt)]
 
 use core::panic::PanicInfo;
+use kopy_core::{serial_print, serial_println};
 use kopy_os::Green;
-use kopy_os::{exit_qemu, serial_print, serial_println, QemuExitCode};
+use kopy_os::{exit_qemu, QemuExitCode};
 use lazy_static::lazy_static;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
 

tests/stack_overflow.rs

@@ -5,7 +5,7 @@
 #![reexport_test_harness_main = "test_main"]
 
 use core::panic::PanicInfo;
-use kopy_os::println;
+use kopy_core::println;
 
 #[no_mangle]
 pub extern "C" fn _start() -> ! {

tests/test_interrupts.rs

@@ -5,8 +5,8 @@
 #![reexport_test_harness_main = "test_main"]
 
 use core::panic::PanicInfo;
+use kopy_core::println;
 use kopy_core::vga_buffer::{BUFFER_HEIGHT, BUFFER_WIDTH, WRITER};
-use kopy_os::println;
 
 #[no_mangle]
 pub extern "C" fn _start() -> ! {