added echo command, and framework for commands

Author: Matthew

Cargo.lock

@@ -14,6 +14,7 @@ volatile = "0.2.6"
 spin = "0.7.0"
 x86_64 = "0.12.2"
 uart_16550 = "0.2.10"
+linked_list_allocator = "0.8.6"
 ksh = { path = "./crates/ksh"}
 kopy_keyboard = { path = "./crates/kopy_keyboard"}
 kopy_core = { path = "./crates/kopy_core" }

Cargo.toml

@@ -10,6 +10,6 @@ extern "C" {
 }
 
 pub fn add() -> u64 {
-    let sum = unsafe { _my_adder(5, 10) };
+    let sum = unsafe { _my_adder(12, 23) };
     sum
 }

crates/kopy_asm/src/lib.rs

@@ -1,5 +1,9 @@
+extern crate alloc;
+
+use alloc::string::{String, ToString};
 use core::fmt;
 use core::fmt::Write;
+use core::ops::Add;
 use lazy_static::lazy_static;
 use spin::Mutex;
 use volatile::Volatile;
@@ -118,6 +122,15 @@ impl Writer {
         }
     }
 
+    pub fn read_line(&mut self) -> String {
+        let mut line: String = " ".to_string();
+        for char in 0..BUFFER_WIDTH {
+            let screen_char = self.buffer.chars[BUFFER_HEIGHT - 1][char].read();
+            line.push(char::from(screen_char.ascii_character));
+        }
+        line.trim().to_string()
+    }
+
     pub fn delete_last_character(&mut self) {
         let blank = ScreenChar {
             ascii_character: b' ',
@@ -152,6 +165,12 @@ macro_rules! println {
     ($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
 }
 
+#[macro_export]
+macro_rules! eprintln {
+    () => ($crate::print!("ERROR: \n"));
+    ($($arg:tt)*) => ($crate::print!("ERROR: {}\n", format_args!($($arg)*)));
+}
+
 #[doc(hidden)]
 pub fn _print(args: fmt::Arguments) {
     interrupts::without_interrupts(|| {

crates/kopy_core/src/vga_buffer.rs

@@ -8,4 +8,5 @@ edition = "2018"
 
 [dependencies]
 spin = "0.7.0"
-lazy_static = "1.4.0"
+lazy_static = "1.4.0"
+kopy_core = { path = "./../kopy_core" }

crates/kopy_events/Cargo.lock

@@ -1,9 +1,12 @@
 use crate::Notifier;
+use kopy_core::vga_buffer::Buffer;
 use lazy_static::lazy_static;
 use spin::Mutex;
 
 lazy_static! {
     pub static ref KEYBOARD_NOTIFIER: Mutex<Notifier<KeyboardEvent>> = Mutex::new(Notifier::new());
 }
 
-pub struct KeyboardEvent {}
+pub struct KeyboardEvent {
+    pub key: char,
+}

crates/kopy_events/Cargo.toml

@@ -3,6 +3,8 @@
 
 pub mod events;
 
+extern crate alloc;
+
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use lazy_static::lazy_static;
@@ -31,8 +33,4 @@ impl<E> Notifier<E> {
             callback(&event);
         }
     }
-
-    pub fn dispatch(&self, event: E) {
-        self.notify(E)
-    }
 }

crates/kopy_events/src/events/keyboard.rs

@@ -11,5 +11,6 @@ pc-keyboard = "0.5.0"
 spin = "0.7.0"
 x86_64 = "0.12.2"
 kopy_core = {path = "./../kopy_core"}
+kopy_events = { path = "./../kopy_events" }
 ksh = {path = "./../ksh"}
 lazy_static = "1.4.0"

crates/kopy_events/src/lib.rs

@@ -1,6 +1,7 @@
 #![no_std]
 
 use kopy_core::{print, vga_buffer::WRITER};
+use kopy_events::events::keyboard::{KeyboardEvent, KEYBOARD_NOTIFIER};
 use lazy_static::lazy_static;
 use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
 use spin::Mutex;
@@ -24,11 +25,18 @@ pub fn handle_key_event(mut port: Port<u8>) {
                     '\u{8}' => interrupts::without_interrupts(|| {
                         WRITER.lock().delete_last_character();
                     }),
-                    '\n' => interrupts::without_interrupts(|| {
-                        ksh::handle_line(WRITER.lock().buffer);
-                        ksh::new_line();
-                    }),
-                    _ => print!("{}", character),
+                    // '\n' => interrupts::without_interrupts(|| {
+                    //     KEYBOARD_NOTIFIER.lock().notify(KeyboardEvent {
+                    //         ksh::handle_line(WRITER.lock().buffer);
+                    //         ksh::new_line();})
+                    // }),
+                    _ => {
+                        interrupts::without_interrupts(|| {
+                            KEYBOARD_NOTIFIER
+                                .lock()
+                                .notify(KeyboardEvent { key: character })
+                        });
+                    }
                 },
                 DecodedKey::RawKey(key) => match key {
                     _ => print!("{:?}", key),

crates/kopy_keyboard/Cargo.lock

@@ -8,4 +8,7 @@ edition = "2018"
 
 [dependencies]
 kopy_core = { path = "./../kopy_core" }
-kopy_asm = { path = "./../kopy_asm" }
+kopy_asm = { path = "./../kopy_asm" }
+kopy_events = { path = "./../kopy_events" }
+x86_64 = "0.12.2"
+lazy_static = "1.4.0"