5 files changed, 50 insertions, 3 deletions
diff --git a/src/interrupts/idt.c b/src/interrupts/idt.c
index 641de3a..c75d378 100644
--- a/src/interrupts/idt.c
+++ b/src/interrupts/idt.c
@@ -17,7 +17,7 @@ struct idt_ptr {
 struct idt_entry idt[256];
 struct idt_ptr idtp;
 
-// Defined in boot.asm
+// Defined in idt.asm
 extern void idt_load();
 
 void idt_set_gate(unsigned char num, unsigned long base, unsigned short sel, unsigned char flags) {
diff --git a/src/interrupts/irq.c b/src/interrupts/irq.c
index 686d543..9b8d89f 100644
--- a/src/interrupts/irq.c
+++ b/src/interrupts/irq.c
@@ -1,5 +1,6 @@
 #include "../io/io.h"
 #include "interrupts.h"
+#include "../graphics/vga.h"
 
 extern void irq0();
 
diff --git a/src/kernel.c b/src/kernel.c
index 4f1281a..73bed6f 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -1,12 +1,18 @@
 #include "graphics/vga.h"
 #include "gdt/gdt.h"
 #include "interrupts/interrupts.h"
+#include "input/input.h"
+#include "timer/timer.h"
 
 void kernel_main(void) {
+    terminal_initialize();
     gdt_install();
     idt_install();
     isrs_install();
-    terminal_initialize();
-    terminal_write_string("Melvix loaded successfully!\nTest");
+    irq_install();
+    timer_install();
+    mouse_install();
+
+    terminal_write_string("Melvix loaded successfully!\n");
     // __asm__  ("div %0" :: "r"(0)); Exception testing x/0
 }
 \ No newline at end of file
diff --git a/src/timer/timer.c b/src/timer/timer.c
new file mode 100644
index 0000000..38f5be6
--- /dev/null
+++ b/src/timer/timer.c
@@ -0,0 +1,32 @@
+#include "../interrupts/interrupts.h"
+#include "../io/io.h"
+
+volatile unsigned int timer_ticks = 0;
+
+void timer_phase(int hz) {
+    int divisor = 1193180 / hz;
+    send(0x43, 0x36); // 01 10 11 0b // CTR, RW, MODE, BCD
+    send(0x40, divisor & 0xFF);
+    send(0x40, divisor >> 8);
+}
+
+// Executed 100 times per second
+void timer_handler(struct regs *r) {
+    timer_ticks++;
+}
+
+// "Delay" function with CPU sleep
+void timer_wait(int ticks) {
+    unsigned int eticks;
+
+    eticks = timer_ticks + ticks;
+    while (timer_ticks < eticks) {
+        __asm__ __volatile__ ("sti//hlt//cli");
+    }
+}
+
+// Install timer handler into IRQ0
+void timer_install() {
+    timer_phase(100);
+    irq_install_handler(0, timer_handler);
+}
+\ No newline at end of file
diff --git a/src/timer/timer.h b/src/timer/timer.h
new file mode 100644
index 0000000..66b3c95
--- /dev/null
+++ b/src/timer/timer.h
@@ -0,0 +1,8 @@
+#ifndef MELVIX_TIMER_H
+#define MELVIX_TIMER_H
+
+void timer_install();
+
+void timer_wait(int ticks);
+
+#endif