Move PS2 controller driver out of keyboard

Author: scopeInfinity

Makefile

@@ -149,6 +149,7 @@ include $(SRC_KERNEL)/syscall/Makefile.mk
 include $(SRC_DRIVERS)/disk/Makefile.mk
 include $(SRC_DRIVERS)/keyboard/Makefile.mk
 include $(SRC_DRIVERS)/pic/Makefile.mk
+include $(SRC_DRIVERS)/ps2/Makefile.mk
 include $(SRC_DRIVERS)/display/Makefile.mk
 include $(SRC_DRIVERS)/display/vga/Makefile.mk
 

README.md

@@ -31,7 +31,6 @@ fork()          | TicTacToe game
 | ![gif](https://user-images.githubusercontent.com/9819066/132988756-de1b7770-430d-40df-a7c9-593cd752b20a.gif) |
 
 
-
 ### Boot OS
 
 #### How to get boot image?

include/fuzzy/drivers/port.h

@@ -12,6 +12,11 @@
 #define PORT_PIT_DATA2    0x42
 #define PORT_PIT_CMD      0x43
 
+#define PORT_PS2_DATA     0x60
+#define PORT_PS2_CMD      0x64
+#define PORT_PS2_STATUS   0x64
+
+
 static inline void outb(uint16_t port, uint8_t data) {
     __asm__ volatile(
         "outb %0, %1 \n"

include/fuzzy/drivers/ps2/keyboard.h

@@ -0,0 +1,8 @@
+#pragma once
+
+
+void ps2_keyboard_init();
+
+char ps2_keyboard_get_key_pressed_blocking();
+char ps2_keyboard_get_key_pressed_poll();
+int ps2_keyboard_get_kbhit();

include/fuzzy/drivers/ps2/ps2.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stddef.h>
+
+void ps2_init();
+
+uint8_t ps2_read_data();
+void ps2_write_port1(uint8_t byte);
+void ps2_controller_wait_for_empty_input();
+void ps2_controller_wait_for_full_output();
+
+void interrupt_register_0x21_0x2C_irq1_ir12_keyboard_mouse();
+void irq1_handler();
+void irq12_handler();
+

include/fuzzy/kernel/interrupts/interrupts.h

@@ -10,7 +10,9 @@
 #define IDT_IRQ_OFFSET  0x20
 
 // Used by /usr/lib/process.c
-#define IDT_IRQ0_PIC    (IDT_IRQ_OFFSET+0)
+#define IDT_IRQ0_PIC        (IDT_IRQ_OFFSET+0)
+#define IDT_IRQ1_KEYBOARD   (IDT_IRQ_OFFSET+1)
+#define IDT_IRQ12_MOUSE     (IDT_IRQ_OFFSET+12)
 // Used by /usr/lib/sys/syscall.asm
 #define IDT_SYSCALL     0x32
 

src/drivers/keyboard/keyboard.c

@@ -183,128 +183,11 @@ int keyboard_get_kbhit() {
 }
 
 void keyboard_init() {
-    unsigned char original_colors =  get_color_fgbg();
-    sleep_mini(3000000);
-
     unsigned char out;
-    // disable PS/2 first port
-    ps2_controller_send_command(0XAD, 0);
-    // disable PS/2 second port
-    ps2_controller_send_command(0XA7, 0);
-    // flush output buffer
-    wait_for_status_flag(STATUS_OUTPUT_BUFFER, 0);
-
-    out = ps2_controller_send_command(0X20, 1);
-    out = out&(~0b1000011);
-    int dual_ps2_controller = 0;
-    if (out & (0b10000)) {
-        dual_ps2_controller = 1;
-    }
-    print_log("Init: Maybe dual PS2 Controller", dual_ps2_controller);
-    ps2_controller_send_command_with_data(0x60, out, 0);
-
-
-    out = ps2_controller_send_command(0XAA, 1);
-    if (out != 0x55) {
-        PANIC(out, "PS2 controller self test failed.");
-    }
-
-    if(dual_ps2_controller) {
-        ps2_controller_send_command(0XA8, 0);
-        out = ps2_controller_send_command(0X20, 1);
-        if (!(out & (0b10000))) {
-            dual_ps2_controller = 0;
-            print_log("Init: Enabling PS2 port failed, thus disabling dual_ps2_controller");
-        } else {
-            // disabling second port again.
-            ps2_controller_send_command(0xA7, 0);
-        }
-    }
-
-    out = ps2_controller_send_command(0XAB, 1);
-    if (out != 0x00) {
-        PANIC(out, "PS2 first port test failed.");
-    }
-    if(dual_ps2_controller) {
-        out = ps2_controller_send_command(0XA9, 1);
-        if (out != 0x00) {
-            PANIC(out, "PS2 second port test failed.");
-        }
-    }
-
-    print_log("Init: Dual PS2 Controller: %d", dual_ps2_controller);
-
-    // enable first port
-    ps2_controller_send_command(0xAE, 0);
-    if(dual_ps2_controller) {
-        // enable second port
-        ps2_controller_send_command(0xA8, 0);
-    }
-
+    // disable scanning
     out = write_to_ps2_first_port(0xF5, 1);
     if (out != 0xFA) {
-        PANIC(out, "disable scanning failed.");
-    }
-
-    // enable interrupts
-    out = ps2_controller_send_command(0X20, 1);
-    out |= 0b11;
-    ps2_controller_send_command_with_data(0x60, out, 0);
-
-
-    // reset device
-    out = write_to_ps2_first_port(0xFF, 1);
-    if (out != 0xFA) {
-        PANIC(out, "reset ps/2 first failed");
-    }
-    out = read_data_reply();
-    if (out != 0xAA) {
-        PANIC(out, "reset ps/2 first port, keyboard self test failed");
-    }
-
-    if(dual_ps2_controller) {
-        // reset second port
-        out = write_to_ps2_second_port(0xFF, 1);
-        if (out != 0xFA) {
-            PANIC(out, "reset ps/2 second failed");
-        }
-        out = read_data_reply();
-        if (out != 0xAA) {
-            PANIC(out, "reset ps/2 second port, mouse self test failed");
-        }
-    }
-
-    // detect device type
-    out = write_to_ps2_first_port(0xF2, 1);
-    if (out != 0xFA) {
-        PANIC(out, "device identity failed.");
-    }
-    unsigned char dev_d0 = read_data_reply();
-    unsigned char dev_d1 = read_data_reply();
-
-    // Testing for device 0xAB 0x83: MF2 keyboard
-    if(dev_d0 != 0xAB) {
-        PANIC(dev_d0, "testing for device id 0xAB 0x83, found xx 0x83.");
-    }
-    if(dev_d1 != 0x83) {
-        PANIC(dev_d1, "testing for device id 0xAB 0x83, found 0xAB xx.");
-    }
-
-    // Caps
-    write_to_ps2_first_port(0xED, 0);
-    out = write_to_ps2_first_port(7, 1);
-    if (out != 0xFA) {
-        PANIC(out, "caps failed");
-    }
-    // get scan code
-    write_to_ps2_first_port(0xF0, 0);
-    out = write_to_ps2_first_port(0, 1);
-    if (out != 0xFA) {
-        PANIC(out, "failed to get scan code");
-    } else {
-        // Not yet working
-        // out = read_data_reply();
-        // PANIC(out, "got get scan code");
+        PANIC(out, "disable scan failed");
     }
 
     // set scan code
@@ -320,6 +203,5 @@ void keyboard_init() {
         PANIC(out, "scan failed");
     }
     keyboard_scanner_init();
-    set_color_fgbg(original_colors);
     print_log("[keyboard init] done.");
-}
+}

src/drivers/ps2/Makefile.mk

@@ -0,0 +1,12 @@
+$(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(BUILD_USR_INCLUDE_ALL)
+	mkdir -p $(dir $@)
+	$(KERNEL_CC) -c -o $@ \
+		$<
+
+$(SELF_BUILD_DIR)/%_asm.o: $(SELF_SRC_DIR)/%.asm
+	mkdir -p $(dir $@)
+	nasm -o $@ -f elf32 $<
+
+$(SELF_BUILD_DIR)/libps2: $(SELF_BUILD_ALL_C) $(SELF_BUILD_ALL_ASM)
+	ar rc $@ $^
+

src/drivers/ps2/keyboard.c

@@ -0,0 +1,20 @@
+#include <fuzzy/drivers/ps2/ps2.h>
+#include <fuzzy/drivers/ps2/keyboard.h>
+
+#include <drivers/keyboard/keyboard.h>
+
+void ps2_keyboard_init() {
+    keyboard_init();
+}
+
+char ps2_keyboard_get_key_pressed_blocking() {
+    return keyboard_get_key_pressed_blocking();
+}
+
+char ps2_keyboard_get_key_pressed_poll() {
+    return keyboard_get_key_pressed_poll();
+}
+
+int ps2_keyboard_get_kbhit() {
+    return keyboard_get_kbhit();
+}

src/drivers/ps2/ps2.asm

@@ -0,0 +1,14 @@
+[BITS 32]
+
+global irq1_handler_low
+global irq12_handler_low
+
+[SECTION .text]
+
+    irq1_handler_low:
+        ; TODO: send EOI
+        iret
+
+    irq12_handler_low:
+        ; TODO: send EOI
+        iret