update kbd

Author: Rafisto

README.md

@@ -1,8 +1,17 @@
 Table of Contents
 
-- [VGA Rainbow](#vgarainbow) - Display *Hello World!* in all colors provided by VGA text mode.
+- [Keyboard on Interrupts](#keyboard-on-interrupts) - Keyboard controller on x86 with GDT, IDT and IRQ.
+- [VGA Rainbow](#vga-rainbow) - Display *Hello World!* in all colors provided by VGA text mode.
 
 
+## Keyboard on Interrupts
+
+KBD is a continuation of my bare-metal journey. Thanks to this [stackoverflow answer](https://stackoverflow.com/a/37635449) I was able to successfully recreate a keyboard controller on interrupts.
+
+![Keyboard on Interrupts](./pub/kbd.gif)
+
+Most of the program is done in [boot.asm](./kbd/boot.asm), where I initialize GDT, and in [idt.h](./kbd/idt/idt.h), where I use the interrupt controller. A little dependency injection was made in the `console.c`, as the `console_input()` is actually passed as a function to be called after a key is pressed.
+
 ## VGA Rainbow
 
 VGA Rainbow is a small bare-metal program created to display *Hello World!* in all colors provided by [VGA text mode](https://en.wikipedia.org/wiki/VGA_text_mode).

kbd/.gitignore

@@ -0,0 +1,2 @@
+_build
+serial.log

kbd/Makefile

@@ -3,24 +3,25 @@ LD = ld
 CFLAGS = -ffreestanding -nostdlib -nodefaultlibs -no-pie -fno-pic -static -fno-stack-protector -O2 -m32 -Iinclude
 LDFLAGS = -m elf_i386
 
-kernel := build/kernel.bin
-iso := build/hello.iso
+kernel := _build/kernel.bin
+iso := _build/hello.iso
 
 linker_script := linker.ld
 grub_cfg := grub.cfg
-assembly_source_files := multiboot_header.asm boot.asm idt.asm
-assembly_object_files := $(patsubst %.asm, build/%.o, $(assembly_source_files))
-c_source_files := $(wildcard *.c)
-c_object_files := $(patsubst %.c, build/%.o, $(c_source_files))
+assembly_source_files := multiboot_header.asm boot.asm $(wildcard asm/*.asm)
+assembly_object_files := $(patsubst %.asm, _build/%.o, $(assembly_source_files))
+c_source_dirs := $(shell find . -type d)
+c_source_files := $(foreach dir, $(c_source_dirs), $(wildcard $(dir)/*.c))
+c_object_files := $(patsubst %.c, _build/%.o, $(c_source_files))
 
 .PHONY: all clean iso kernel qemu qemu-gdb
 
 all: $(kernel)
 
 clean:
-	- @rm -fr build
+	- @rm -fr _build
 	- @rm -f serial.log *.o
-	- @rm -fr build/isofiles
+	- @rm -fr _build/isofiles
 
 qemu: $(iso)
 	qemu-system-x86_64 -cdrom $(iso) -vga std -s -serial file:serial.log
@@ -32,21 +33,21 @@ iso: $(iso)
 	@echo "Done"
 
 $(iso): $(kernel) $(grub_cfg)
-	mkdir -p build/isofiles/boot/grub
-	cp $(kernel) build/isofiles/boot/kernel.bin
-	cp $(grub_cfg) build/isofiles/boot/grub
-	grub-mkrescue -o $(iso) build/isofiles #2> /dev/null
+	mkdir -p _build/isofiles/boot/grub
+	cp $(kernel) _build/isofiles/boot/kernel.bin
+	cp $(grub_cfg) _build/isofiles/boot/grub
+	grub-mkrescue -o $(iso) _build/isofiles #2> /dev/null
 
 $(kernel): $(c_object_files) $(assembly_object_files) $(linker_script)
 	echo $(c_object_files)
 	ld $(LDFLAGS) -T $(linker_script) -o $(kernel) $(assembly_object_files) $(c_object_files)
 
 
-build/%.o: %.c
+_build/%.o: %.c
 	@mkdir -p $(shell dirname $@)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # compile assembly files
-build/%.o: %.asm
+_build/%.o: %.asm
 	@mkdir -p $(shell dirname $@)
 	nasm -felf32 $< -o $@

kbd/asm/asm.h

@@ -0,0 +1,9 @@
+#ifndef BASE_ASM_H
+#define BASE_ASM_H
+
+// idt.asm
+extern void keyboard_handler_interrupt(void);
+extern unsigned char read_port(int port);
+extern void write_port(int port, unsigned char val);
+
+#endif // BASE_ASM_H

kbd/idt.asm renamed to kbd/asm/idt.asm

@@ -1,32 +1,29 @@
-section .text
-
 extern keyboard_handler
-global read_port
-global write_port
+
 global load_idt
-global keyboard_handler_int
 
-keyboard_handler_int:
-    pushad
-    cld
-    call keyboard_handler
-    popad
-    iretd
+global keyboard_handler_interrupt
+global read_port
+global write_port
 
 load_idt:
     mov edx, [esp + 4]
     lidt [edx]
     sti
     ret
 
-; arg: int, port number.
+keyboard_handler_interrupt:
+    pushad
+    cld
+    call keyboard_handler
+    popad
+    iretd
+
 read_port:
     mov edx, [esp + 4]
     in al, dx
     ret
 
-; arg: int, (dx)port number
-;      int, (al)value to write
 write_port:
     mov   edx, [esp + 4]
     mov   al, [esp + 4 + 4]