From c2df8effbeab32f95efc0a66d089439841e83d27 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Fri, 9 Feb 2018 17:36:36 +0100
Subject: [PATCH] it compiles

---
 kernel-rs/Makefile        |  2 +-
 kernel-rs/src/cpuio.rs    | 39 +++++++++++++++++++++++++++++++++++++++
 kernel-rs/src/keyboard.rs |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 kernel-rs/src/cpuio.rs
 create mode 100644 kernel-rs/src/keyboard.rs

diff --git a/kernel-rs/Makefile b/kernel-rs/Makefile
index 1f901701..ff3a4de6 100644
--- a/kernel-rs/Makefile
+++ b/kernel-rs/Makefile
@@ -54,7 +54,7 @@ $(iso): $(kernel) $(grub.cfg) Makefile
 
 run: $(iso) Makefile
 	@tmux info >&- || { echo -e "\033[38;5;16m ~~ NOT IN A VALID TMUX SESSION ~~\033[0m" ; exit 1; }
-	tmux new-window 'tmux split-window -h "$(MONITOR)"; tmux split-window -fv "$(GDB)"; tmux select-pane -t 1; tmux resize-pane -x 80 -y 25; $(KERNEL_RUN)'
+	@tmux new-window 'tmux split-window -h "$(MONITOR)"; tmux split-window -fv "$(GDB)"; tmux select-pane -t 1; tmux resize-pane -x 80 -y 25; $(KERNEL_RUN)'
 	@# @$(QEMU) -curses -cdrom $(iso)
 
 clean:
diff --git a/kernel-rs/src/cpuio.rs b/kernel-rs/src/cpuio.rs
new file mode 100644
index 00000000..cec23ce5
--- /dev/null
+++ b/kernel-rs/src/cpuio.rs
@@ -0,0 +1,39 @@
+//! Rust wrappers around the x86-family I/O instructions.
+
+/// Read a `u8`-sized value from `port`.
+pub unsafe fn inb(port: u16) -> u8 {
+    // The registers for the `in` and `out` instructions are always the
+    // same: `a` for value, and `d` for the port address.
+    let result: u8;
+    asm!("inb %dx, %al" : "={al}"(result) : "{dx}"(port) :: "volatile");
+    result
+}
+
+/// Write a `u8`-sized `value` to `port`.
+pub unsafe fn outb(value: u8, port: u16) {
+    asm!("outb %al, %dx" :: "{dx}"(port), "{al}"(value) :: "volatile");
+}
+
+/// Read a `u16`-sized value from `port`.
+pub unsafe fn inw(port: u16) -> u16 {
+    let result: u16;
+    asm!("inw %dx, %ax" : "={ax}"(result) : "{dx}"(port) :: "volatile");
+    result
+}
+
+/// Write a `u8`-sized `value` to `port`.
+pub unsafe fn outw(value: u16, port: u16) {
+    asm!("outw %ax, %dx" :: "{dx}"(port), "{ax}"(value) :: "volatile");
+}
+
+/// Read a `u32`-sized value from `port`.
+pub unsafe fn inl(port: u16) -> u32 {
+    let result: u32;
+    asm!("inl %dx, %eax" : "={eax}"(result) : "{dx}"(port) :: "volatile");
+    result
+}
+
+/// Write a `u32`-sized `value` to `port`.
+pub unsafe fn outl(value: u32, port: u16) {
+    asm!("outl %eax, %dx" :: "{dx}"(port), "{eax}"(value) :: "volatile");
+}
diff --git a/kernel-rs/src/keyboard.rs b/kernel-rs/src/keyboard.rs
new file mode 100644
index 00000000..daf172f5
--- /dev/null
+++ b/kernel-rs/src/keyboard.rs
@@ -0,0 +1 @@
+pub static KEY_CODE_TO_ASCII: [u8; 59] = *b"??1234567890-=??qwertyuiop[]\n?asdfghjkl;'`?\\zxcvbnm,./?*? ?";