Added variable arguments + drivers keyboard layout[not functional]

Author: scopeInfinity

Makefile

@@ -1,5 +1,6 @@
 BL_SRC_DIR = src/bootloader
 KERNEL_SRC_DIR = src/kernel
+KERNEL_DRIVERS_SRC_DIR = src/kernel/drivers
 SYSCALLS_SRC_DIR = src/lib/syscalls
 LIB_SRC_DIR = src/lib
 UTIL_SRC_DIR = src/lib/util
@@ -28,6 +29,7 @@ app_dashboard = $(BUILD_DIR)/dashboard
 
 # Parameters
 BT_STAGE2_SECTOR_COUNT = 19 # In Hex
+SOURCE_SNAPSHOT="\"$$(git rev-parse --short HEAD)$$(git diff --quiet || echo '_unstaged')\""
 
 # General Assumptions
 ## Integer is 4 bytes
@@ -85,10 +87,10 @@ $(kernel_core): $(kernel_core_asm_o) $(kernel_core_c_o)
 	truncate --size=%512 $@
 
 $(kernel_core_asm_o): $(KERNEL_SRC_DIR)/core.asm
-	nasm -o $@ -f elf32 -i $(KERNEL_SRC_DIR)/ -i$(SYSCALLS_SRC_DIR)/ $<
+	nasm -o $@ -f elf32 -i $(KERNEL_SRC_DIR)/ -i $(KERNEL_DRIVERS_SRC_DIR)/ -i$(SYSCALLS_SRC_DIR)/ $<
 
 $(kernel_core_c_o): $(KERNEL_SRC_DIR)/core.c
-	gcc -m16 -fno-pie -c -Isrc -o $@ $<
+	gcc -m16 -fno-pie -c -D__SOURCE_SNAPSHOT__=$(SOURCE_SNAPSHOT) -Isrc -o $@ $<
 
 $(app_entry_o): $(LIB_SRC_DIR)/app/entry.asm $(BL_SRC_DIR)/constants.asm $(BL_SRC_DIR)/io.asm $(SYSCALLS_SRC_DIR)/io_interface_bios.asm $(SYSCALLS_SRC_DIR)/time_syscall.asm
 	nasm -o $@ -f elf32 -i $(BL_SRC_DIR)/ -i$(SYSCALLS_SRC_DIR)/ $<

src/kernel/core.asm

@@ -1,11 +1,26 @@
 %include "io_interface_protected.asm"
+%include "keyboard.asm"
 
 [BITS 16]
 
 extern entry_core
+global __low_panic_halt
+global __low_va_args
 
 [SECTION .text]
         jmp entry_core
 
         PLUGIN_SYSCALLS_IO_PROTECTED
+        PLUGIN_KERNEL_DRIVERS_KEYBOARD
 
+    __low_panic_halt:
+        HLT
+        JMP __low_panic_halt
+
+    __low_va_args:
+
+        mov esi, [esp + 0x4]     ; (index)
+        shl esi, 2
+        add esi, 4
+        mov eax, [ebp + esi]
+        ret

src/kernel/core.c

@@ -1,3 +1,5 @@
+#include <kernel/essentials.c>
+#include <kernel/drivers/keyboard.c>
 #include <lib/syscalls/io.h>
 #include <lib/syscalls/io_interface_protected.c>
 
@@ -27,6 +29,7 @@ void entry_core() {
 
     move_xy(3,3);
     print_line(welcome_message);
+    keyboard_init();
     exec(0,0);
     while(1);
 }

src/kernel/drivers/keyboard.asm

@@ -0,0 +1,31 @@
+%macro  PLUGIN_KERNEL_DRIVERS_KEYBOARD 0
+
+global port_write
+global port_read
+
+[SECTION .text]
+    port_write:
+        push ebp
+        mov ebp, esp
+        
+        mov al,  [ebp + 0xc]   ; value
+        mov dx,  [ebp + 0x8]   ; port
+        out dx, al
+
+        mov esp, ebp
+        pop ebp
+        ret
+
+    port_read:
+        push ebp
+        mov ebp, esp
+        
+        mov dx,  [ebp + 0x8]   ; port
+        in al, dx
+        and eax, 0xFF
+
+        mov esp, ebp
+        pop ebp
+        ret
+
+%endmacro

src/kernel/drivers/keyboard.c

@@ -0,0 +1,48 @@
+#ifndef __KERNEL_DRIVERS_KEYBOARD
+#define __KERNEL_DRIVERS_KEYBOARD
+
+#include <kernel/essentials.c>
+
+#define DRIVERS_KEYBOARD_PORT_DATA      0x60
+#define DRIVERS_KEYBOARD_PORT_STATUS    0x64
+#define DRIVERS_KEYBOARD_PORT_COMMAND   0x64
+
+// Using USB Legacy Support
+extern void port_write(unsigned short port, unsigned char value);
+extern unsigned char port_read(unsigned short port);
+
+void keyboard_init() {
+    kernel_status("Loading Keyboard Drivers...", 0);
+    unsigned char out;
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0xAD);
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0xA7);
+    while(1) {
+        // clear the buffer
+        out = port_read(DRIVERS_KEYBOARD_PORT_STATUS);
+        if(!(out&1)) break;
+    }
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0x20);
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0x60);
+    out = port_read(DRIVERS_KEYBOARD_PORT_STATUS);
+    int second_port_exists = 0;
+    if(out&(0b10000)) {
+        second_port_exists = 1;
+        kernel_status("Loading Keyboard Drivers: Second Port Exists", 0);
+    }
+    // clear 0, 1 and 6.
+    // test bit 5
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0xAA);
+    out = port_read(DRIVERS_KEYBOARD_PORT_STATUS);
+    if (out != 0x55) {
+        PANIC(out, "PS2 self test failed.");
+    }
+    // enable PS2 first port.
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0xAE);
+    port_write(DRIVERS_KEYBOARD_PORT_COMMAND, 0xFF);
+    out = port_read(DRIVERS_KEYBOARD_PORT_STATUS);
+    if (out != 0xFA) {
+        PANIC(out, "PS2 reset failed.");
+    }
+}
+
+#endif

src/kernel/essentials.c

@@ -0,0 +1,49 @@
+#ifndef __KERNEL_ESSENTIALS
+#define __KERNEL_ESSENTIALS
+
+#include <lib/syscalls/io.h>
+
+// __low_panic_halt defined in core.asm.
+extern void __low_panic_halt();
+
+#define PANIC(err, message) panic((err), (message), __FILE__, __LINE__, __SOURCE_SNAPSHOT__)
+
+void panic(int err, const char *message, const char *src_file,
+    unsigned int line_number, const char *src_snapshot) {
+    set_color_bg(C_WHITE);
+    set_color_fg(C_RED);
+    move_xy(0,0);
+    print_line(src_file);
+    print_char(':');
+    print_int(line_number);
+    print_char(',');
+    print_line(src_snapshot);
+    move_xy(0,1);
+    print_line("Panic");
+    if (err>0) {
+        print_char('[');
+        print_int(err);
+        print_char(']');
+    }
+    print_line(": ");
+    print_line(message);
+    __low_panic_halt();
+}
+
+extern unsigned int __low_va_args(unsigned int index);
+#define va_args(type, index) ((type)(__low_va_args((index))))
+
+void kernel_status(const char *message, int status) {
+    set_color_bg(C_WHITE);
+    set_color_fg(C_BLACK);
+    move_xy(0, WINDOW_HEIGHT-1);
+    print_line(message);
+    print_int(status);
+    int left = WINDOW_WIDTH - get_cursor_x();
+    while(left>0) {
+        print_char(' ');
+        left--;
+    }
+}
+
+#endif

src/lib/syscalls/io.h

@@ -66,22 +66,27 @@ void print_char(char c) {
 char digit_to_hex[] = "0123456789ABCDEF";
 
 void print_hex_nibble(unsigned char x) {
-    print_char(digit_to_hex[x]);
+    if(x<10) {
+        print_char((char)(x+'0'));
+    } else {
+        print_char((char)(x+('A'-10)));
+    }
 }
 
 void print_hex_byte(unsigned char x) {
-    print_hex_nibble(x>>4);
+    print_hex_nibble((x>>4)&0xF);
     print_hex_nibble(x&0xF);
 }
 
-void print_line(char *str) {
+
+void print_line(const char *str) {
     while((*str)!='\0') {
         print_char(*str);
         str++;
     }
 }
 
-void print_memory_hex(unsigned char *str,unsigned short count) {
+void print_memory_hex(const char *str,unsigned short count) {
     while(count) {
         print_hex_byte(*str);
         str++;

src/lib/syscalls/io_interface.h

@@ -4,6 +4,14 @@
 unsigned char IO_CURRENT_X = 0;
 unsigned char IO_CURRENT_Y = 0;
 
+unsigned char get_cursor_x() {
+    return IO_CURRENT_X;
+}
+
+unsigned char get_cursor_y() {
+    return IO_CURRENT_Y;
+}
+
 void io_move_fix_location();
 
 void io_low_scroll_screen(unsigned char count, unsigned char color,