From 457a2117706cdaee34f894e67c89da7bf29f6143 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Mon, 12 Apr 2021 10:28:04 +0200
Subject: Refactoring

---
 src/Makefile              |  4 +--
 src/bringelle.c           |  1 -
 src/core/framebuffer.c    | 58 --------------------------------------
 src/core/framebuffer.h    | 35 -----------------------
 src/core/gdt.h            |  3 ++
 src/core/idt.c            | 39 +++++++++++++++++++++++++
 src/core/idt.h            | 32 +++++++++++++++++++++
 src/core/int.S            | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 src/drivers/8042.c        | 16 +++++++++++
 src/drivers/8042.h        | 64 +++++++++++++++++++++++++++++++++++++++++
 src/drivers/framebuffer.c | 58 ++++++++++++++++++++++++++++++++++++++
 src/drivers/framebuffer.h | 35 +++++++++++++++++++++++
 src/drivers/pic.c         | 28 ++++++++++++++++++
 src/drivers/pic.h         |  9 ++++++
 src/int/8042.c            | 16 -----------
 src/int/8042.h            | 64 -----------------------------------------
 src/int/idt.c             | 39 -------------------------
 src/int/idt.h             | 32 ---------------------
 src/int/int.S             | 72 -----------------------------------------------
 src/int/pic.c             | 28 ------------------
 src/int/pic.h             |  9 ------
 src/libc/stdio.h          |  2 +-
 22 files changed, 359 insertions(+), 357 deletions(-)
 delete mode 100644 src/core/framebuffer.c
 delete mode 100644 src/core/framebuffer.h
 create mode 100644 src/core/idt.c
 create mode 100644 src/core/idt.h
 create mode 100644 src/core/int.S
 create mode 100644 src/drivers/8042.c
 create mode 100644 src/drivers/8042.h
 create mode 100644 src/drivers/framebuffer.c
 create mode 100644 src/drivers/framebuffer.h
 create mode 100644 src/drivers/pic.c
 create mode 100644 src/drivers/pic.h
 delete mode 100644 src/int/8042.c
 delete mode 100644 src/int/8042.h
 delete mode 100644 src/int/idt.c
 delete mode 100644 src/int/idt.h
 delete mode 100644 src/int/int.S
 delete mode 100644 src/int/pic.c
 delete mode 100644 src/int/pic.h

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 3643f77..85cae29 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,12 +8,12 @@ LD_SCRIPT := linker.ld
 BOOT_OBJ := $(addsuffix .o,$(basename $(shell find ./boot -name "*.[c|S]" ! -name "boot.S")))
 CORE_OBJ := $(addsuffix .o,$(basename $(shell find ./core -name "*.[c|S]")))
 LIBC_OBJ := $(addsuffix .o,$(basename $(shell find ./libc -name "*.[c|S]")))
-INT_OBJ := $(addsuffix .o,$(basename $(shell find ./int -name "*.[c|S]")))
+DRIVERS_OBJ := $(addsuffix .o,$(basename $(shell find ./drivers -name "*.[c|S]")))
 
 
 all: $(EXEC)
 
-$(EXEC): boot/boot.o $(BOOT_OBJ) $(CORE_OBJ) $(LIBC_OBJ) $(INT_OBJ) bringelle.o
+$(EXEC): boot/boot.o $(BOOT_OBJ) $(CORE_OBJ) $(LIBC_OBJ) $(DRIVERS_OBJ) bringelle.o
 	ld -n -T $(LD_SCRIPT) -nostdlib -o bringelle $^ 
 
 %.o: %.S
diff --git a/src/bringelle.c b/src/bringelle.c
index 49670e8..b0ddec6 100644
--- a/src/bringelle.c
+++ b/src/bringelle.c
@@ -1,5 +1,4 @@
 #include "libc/stdio.h"
-#include "int/pic.h"
 #include "boot/multiboot.h"
 #include "core/mem.h"
 #include "core/gdt.h"
diff --git a/src/core/framebuffer.c b/src/core/framebuffer.c
deleted file mode 100644
index 110dc73..0000000
--- a/src/core/framebuffer.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "framebuffer.h"
-
-#define MAX_COL 80
-#define MAX_LINE 25
-
-VIDEO_STATE VS={
-  (u8 *)0xB8000,
-  0,
-  0,
-  BLACK,
-  GRAY,
-};
-
-void putchar(char c){
-  // Handle newline here
-  if(c=='\n'){
-    VS.col=0;
-    VS.line+=1;
-    if(VS.line>=MAX_LINE){
-      VS.line=MAX_LINE-1;
-      scrollup();
-    }
-    return;
-  }
-  
-  // Print char
-  VS.mem[VS.col*2+MAX_COL*VS.line*2]=c;
-  VS.mem[VS.col*2+MAX_COL*VS.line*2+1]=VS.fg|VS.bg<<4;
-  
-  // Refresh location
-  VS.col+=1;
-  if(VS.col>= MAX_COL){
-    VS.col=0;
-    VS.line+=1;
-    if(VS.line>=MAX_LINE){
-      VS.line=MAX_LINE-1;
-      scrollup();
-    }
-  }
-}
-
-void clear(){
-  for(char i=0;i<MAX_LINE;i++){
-    scrollup();
-  }
-}
-
-void scrollup(){
-  // Move VS.line up
-  for(char i=1;i<=MAX_LINE;i++){
-    for(char j=0;j<=MAX_COL;j++)
-      VS.mem[j*2+MAX_COL*(i-1)*2]=VS.mem[j*2+MAX_COL*i*2];
-  }
-  // Clear last VS.line
-  for(char i=0;i<=MAX_COL;i++){
-    VS.mem[i*2+MAX_COL*(MAX_LINE-1)*2]='\0';
-  }
-}
diff --git a/src/core/framebuffer.h b/src/core/framebuffer.h
deleted file mode 100644
index 3d862d6..0000000
--- a/src/core/framebuffer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef FRAMEBUFFER_H
-#define FRAMEBUFFER_H
-
-#include "types.h"
-
-typedef enum VIDEO_COLORS {
-  BLACK=0, BLUE=1, GREEN=2,CYAN=3, RED=4,PURPLE=5,BROWN=6,GRAY=7,
-  DARK_GRAY=8,LIGHT_BLUE=9,LIGHT_GREEN=10,LIGHT_CYAN=11,LIGHT_RED=12,LIGHT_PURPLE=13,YELLOW=14,WHITE=15
-  
-} VIDEO_COLORS;
-
-typedef struct VIDEO_STATE {
-  u8 *mem;
-  u8 col;
-  u8 line;
-  u8 bg;
-  u8 fg;
-} VIDEO_STATE;
-
-/**
- * Print char
- */
-void putchar(char);
-
-/**
- * Scroll the framebuffer from one line
- */
-void scrollup();
-
-/**
- * Clear all char from the framebuffer
- */
-void clear();
-
-#endif
diff --git a/src/core/gdt.h b/src/core/gdt.h
index f010891..246ddbe 100644
--- a/src/core/gdt.h
+++ b/src/core/gdt.h
@@ -72,6 +72,9 @@ void gdt_memcpy();
  */
 void gdt_write_entry(GDT_ENTRY entry, u32 id);
 
+/**
+  * Extract the base from the user data segment 
+  */ 
 int gdt_user_ds_base();
 
 #endif
diff --git a/src/core/idt.c b/src/core/idt.c
new file mode 100644
index 0000000..4e08d62
--- /dev/null
+++ b/src/core/idt.c
@@ -0,0 +1,39 @@
+#include "idt.h"
+
+struct IDT_REGISTER IDTR={
+    8*IDT_MAX_ENTRY,
+    0x0
+};
+
+// Interrupt functions (cf int.S)
+extern u32
+INT_DEFAULT,
+INT_PAGE_FAULT,
+INT_CLOCK,
+INT_KEYPRESS,
+INT_SYSCALL;
+
+
+void idt_init(){
+    // Map first default 32 entries 
+    for(int i=0;i<IDT_MAX_ENTRY;i++){
+        idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_DEFAULT,IDT_INT_GATE},i);
+        if(i==14)
+            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_PAGE_FAULT,IDT_INT_GATE},i);
+        if(i==32)
+            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_CLOCK,IDT_INT_GATE},i);
+        if(i==33)
+            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_KEYPRESS,IDT_INT_GATE},i);
+        if(i==48)
+            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_SYSCALL,IDT_TRAP_GATE},i);
+    }
+    // Load IDT
+    asm("lidtl (IDTR)");
+}
+
+void idt_write_entry(IDT_ENTRY entry, int id){
+    int descriptor[2];
+    descriptor[0]=entry.offset & 0xFFFF | entry.segment << 16;
+    descriptor[1]=entry.type & 0xFFFF | entry.offset & 0xFFFF0000;
+    memcpy((void*)descriptor, (void *)(IDTR.base+(id*8)),8);
+}
\ No newline at end of file
diff --git a/src/core/idt.h b/src/core/idt.h
new file mode 100644
index 0000000..17c5cfa
--- /dev/null
+++ b/src/core/idt.h
@@ -0,0 +1,32 @@
+#ifndef IDT_H
+#define IDT_H
+
+#include "core/types.h"
+#include "core/mem.h"
+
+#define IDT_MAX_ENTRY 200
+#define IDT_INT_GATE 0x8E00
+#define IDT_TRAP_GATE 0xEF00
+
+typedef struct IDT_ENTRY {
+    u16 segment;
+    u32 offset;
+    u16 type;
+} IDT_ENTRY;
+
+struct IDT_REGISTER {
+    u16 limit;
+    u32 base;
+} __attribute__((packed));
+
+/**
+ * Copy IDT into memory and load it
+ */
+void idt_init();
+
+/**
+ * Write an IDT entry into memory
+ */
+void idt_write_entry(IDT_ENTRY entry,int id);
+
+#endif
\ No newline at end of file
diff --git a/src/core/int.S b/src/core/int.S
new file mode 100644
index 0000000..8ca8b7a
--- /dev/null
+++ b/src/core/int.S
@@ -0,0 +1,72 @@
+.macro  SAVE_REGS
+pushal             
+push %ds
+push %es
+push %fs
+push %gs
+push %ebx
+mov $0x10,%bx
+mov %bx,%ds
+pop %ebx
+.endm
+
+.macro RESTORE_REGS
+    pop %gs
+    pop %fs
+    pop %es
+    pop %ds
+    popal
+.endm
+
+.globl interrupt_enable
+interrupt_enable:
+    call idt_init
+    call pic_init
+    sti
+    ret
+
+.globl INT_DEFAULT
+INT_DEFAULT:
+    SAVE_REGS
+    movb $0x20, %al
+    outb %al, $0x20
+    RESTORE_REGS
+    iret
+
+.globl INT_KEYPRESS
+INT_KEYPRESS:
+    SAVE_REGS
+    call _8042_keypress
+    movb $0x20, %al
+    outb %al, $0x20
+    RESTORE_REGS
+    iret
+
+.globl INT_CLOCK
+INT_CLOCK:
+    SAVE_REGS
+    call clock
+    movb $0x20, %al
+    outb %al, $0x20
+    RESTORE_REGS
+    iret
+
+.globl INT_SYSCALL
+INT_SYSCALL:
+    SAVE_REGS
+    call syscall
+    movb $0x20, %al
+    outb %al, $0x20
+    RESTORE_REGS
+    iret
+
+.globl INT_PAGE_FAULT
+INT_PAGE_FAULT:
+    SAVE_REGS
+    call page_fault
+    hlt
+    movb $0x20, %al
+    outb %al, $0x20
+    RESTORE_REGS
+    iret
+
diff --git a/src/drivers/8042.c b/src/drivers/8042.c
new file mode 100644
index 0000000..c6d3f22
--- /dev/null
+++ b/src/drivers/8042.c
@@ -0,0 +1,16 @@
+#include "8042.h"
+#include "drivers/framebuffer.h"
+#include "core/asm.h"
+
+DEFINE_AZERTY;
+
+void _8042_keypress(){
+    u8 data;
+    do {
+        inb(0x64,data);
+    }
+    while((data&0x01) == 0);
+    inb(0x60,data);
+    if(data<0x80)
+        putchar(AZERTY[data]);
+}
diff --git a/src/drivers/8042.h b/src/drivers/8042.h
new file mode 100644
index 0000000..5e61ffd
--- /dev/null
+++ b/src/drivers/8042.h
@@ -0,0 +1,64 @@
+#ifndef _8042_H
+#define _8042_H
+
+#include "core/types.h"
+
+void _8042_keypress();
+
+#define DEFINE_AZERTY char AZERTY[]={\
+    '\0',\
+    '\0',\
+    '&',\
+    '\0',\
+    '"',\
+    '\'',\
+    '(',\
+    '-',\
+    '\0',\
+    '_',/* 10 */\
+    '\0',\
+    '\0',\
+    ')',\
+    '=',\
+    '\0',\
+    '\t',\
+    'a',\
+    'z',\
+    'e',\
+    'r',\
+    't',\
+    'y',\
+    'u',\
+    'i',\
+    'o',\
+    'p',\
+    '^',\
+    '$',\
+    '\0',\
+    '\0',\
+    'q',/* 0x1E (30) */\
+    's',\
+    'd',\
+    'f',\
+    'g',\
+    'h',\
+    'j',\
+    'k',\
+    'l',\
+    'm',\
+    '\0',\
+    '\0',\
+    '\0',\
+    '*',\
+    'w',\
+    'x',\
+    'c',\
+    'v',\
+    'b',/* 0x30 (48) */\
+    'n',\
+    ',',\
+    ';',\
+    ':',\
+}
+
+#endif
\ No newline at end of file
diff --git a/src/drivers/framebuffer.c b/src/drivers/framebuffer.c
new file mode 100644
index 0000000..110dc73
--- /dev/null
+++ b/src/drivers/framebuffer.c
@@ -0,0 +1,58 @@
+#include "framebuffer.h"
+
+#define MAX_COL 80
+#define MAX_LINE 25
+
+VIDEO_STATE VS={
+  (u8 *)0xB8000,
+  0,
+  0,
+  BLACK,
+  GRAY,
+};
+
+void putchar(char c){
+  // Handle newline here
+  if(c=='\n'){
+    VS.col=0;
+    VS.line+=1;
+    if(VS.line>=MAX_LINE){
+      VS.line=MAX_LINE-1;
+      scrollup();
+    }
+    return;
+  }
+  
+  // Print char
+  VS.mem[VS.col*2+MAX_COL*VS.line*2]=c;
+  VS.mem[VS.col*2+MAX_COL*VS.line*2+1]=VS.fg|VS.bg<<4;
+  
+  // Refresh location
+  VS.col+=1;
+  if(VS.col>= MAX_COL){
+    VS.col=0;
+    VS.line+=1;
+    if(VS.line>=MAX_LINE){
+      VS.line=MAX_LINE-1;
+      scrollup();
+    }
+  }
+}
+
+void clear(){
+  for(char i=0;i<MAX_LINE;i++){
+    scrollup();
+  }
+}
+
+void scrollup(){
+  // Move VS.line up
+  for(char i=1;i<=MAX_LINE;i++){
+    for(char j=0;j<=MAX_COL;j++)
+      VS.mem[j*2+MAX_COL*(i-1)*2]=VS.mem[j*2+MAX_COL*i*2];
+  }
+  // Clear last VS.line
+  for(char i=0;i<=MAX_COL;i++){
+    VS.mem[i*2+MAX_COL*(MAX_LINE-1)*2]='\0';
+  }
+}
diff --git a/src/drivers/framebuffer.h b/src/drivers/framebuffer.h
new file mode 100644
index 0000000..d265015
--- /dev/null
+++ b/src/drivers/framebuffer.h
@@ -0,0 +1,35 @@
+#ifndef FRAMEBUFFER_H
+#define FRAMEBUFFER_H
+
+#include "core/types.h"
+
+typedef enum VIDEO_COLORS {
+  BLACK=0, BLUE=1, GREEN=2,CYAN=3, RED=4,PURPLE=5,BROWN=6,GRAY=7,
+  DARK_GRAY=8,LIGHT_BLUE=9,LIGHT_GREEN=10,LIGHT_CYAN=11,LIGHT_RED=12,LIGHT_PURPLE=13,YELLOW=14,WHITE=15
+  
+} VIDEO_COLORS;
+
+typedef struct VIDEO_STATE {
+  u8 *mem;
+  u8 col;
+  u8 line;
+  u8 bg;
+  u8 fg;
+} VIDEO_STATE;
+
+/**
+ * Print char
+ */
+void putchar(char);
+
+/**
+ * Scroll the framebuffer from one line
+ */
+void scrollup();
+
+/**
+ * Clear all char from the framebuffer
+ */
+void clear();
+
+#endif
diff --git a/src/drivers/pic.c b/src/drivers/pic.c
new file mode 100644
index 0000000..d509e1d
--- /dev/null
+++ b/src/drivers/pic.c
@@ -0,0 +1,28 @@
+#include "pic.h"
+#include "core/asm.h"
+#include "core/mem.h"
+#include "core/syscall.h"
+
+void pic_init(){
+    
+    // ICW1: Initialisation
+    outbj(0x20,0x11); // Master
+    outbj(0xA0,0x11); // Slave
+
+    // ICW2: Map IRQ index to entry into the IDT
+    outbj(0x21,0x20); // Start interrupt at offset 0x20 in IDT (index 32)
+    outbj(0xA1,0x70); // Start interrupt at offset 0x50 in IDT (index 80)
+
+    // ICW3: Indicate the connection between master and slave
+    outbj(0x21,0x02); // Slave connected to pin 2
+    outbj(0xA1,0x01); // Indicate pin id to the slave (2-1)
+
+    // ICW4: Operating mode
+    outbj(0x21,0x01); // Default operating mode
+    outbj(0xA1,0x01); // Default operating mode
+
+    // OCW: Masking
+    outbj(0x21,0b11111100);
+}
+
+
diff --git a/src/drivers/pic.h b/src/drivers/pic.h
new file mode 100644
index 0000000..19e0f5c
--- /dev/null
+++ b/src/drivers/pic.h
@@ -0,0 +1,9 @@
+#ifndef PIC_H
+#define PIC_H
+
+/**
+ * Configure 
+ */
+void pic_init();
+
+#endif
\ No newline at end of file
diff --git a/src/int/8042.c b/src/int/8042.c
deleted file mode 100644
index 5446f11..0000000
--- a/src/int/8042.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "8042.h"
-#include "core/framebuffer.h"
-#include "core/asm.h"
-
-DEFINE_AZERTY;
-
-void _8042_keypress(){
-    u8 data;
-    do {
-        inb(0x64,data);
-    }
-    while((data&0x01) == 0);
-    inb(0x60,data);
-    if(data<0x80)
-        putchar(AZERTY[data]);
-}
diff --git a/src/int/8042.h b/src/int/8042.h
deleted file mode 100644
index 5e61ffd..0000000
--- a/src/int/8042.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _8042_H
-#define _8042_H
-
-#include "core/types.h"
-
-void _8042_keypress();
-
-#define DEFINE_AZERTY char AZERTY[]={\
-    '\0',\
-    '\0',\
-    '&',\
-    '\0',\
-    '"',\
-    '\'',\
-    '(',\
-    '-',\
-    '\0',\
-    '_',/* 10 */\
-    '\0',\
-    '\0',\
-    ')',\
-    '=',\
-    '\0',\
-    '\t',\
-    'a',\
-    'z',\
-    'e',\
-    'r',\
-    't',\
-    'y',\
-    'u',\
-    'i',\
-    'o',\
-    'p',\
-    '^',\
-    '$',\
-    '\0',\
-    '\0',\
-    'q',/* 0x1E (30) */\
-    's',\
-    'd',\
-    'f',\
-    'g',\
-    'h',\
-    'j',\
-    'k',\
-    'l',\
-    'm',\
-    '\0',\
-    '\0',\
-    '\0',\
-    '*',\
-    'w',\
-    'x',\
-    'c',\
-    'v',\
-    'b',/* 0x30 (48) */\
-    'n',\
-    ',',\
-    ';',\
-    ':',\
-}
-
-#endif
\ No newline at end of file
diff --git a/src/int/idt.c b/src/int/idt.c
deleted file mode 100644
index e3e71e8..0000000
--- a/src/int/idt.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "idt.h"
-
-struct IDT_REGISTER IDTR={
-    8*IDT_MAX_ENTRY,
-    0x0
-};
-
-// Interrupt functions (cf int.S)
-extern u32
-INT_DEFAULT,
-INT_PAGE_FAULT,
-INT_CLOCK,
-INT_KEYPRESS,
-INT_SYSCALL;
-
-
-void idt_init(){
-        // Map first default 32 entries 
-    for(int i=0;i<IDT_MAX_ENTRY;i++){
-        idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_DEFAULT,IDT_INT_GATE},i);
-        if(i==14)
-            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_PAGE_FAULT,IDT_INT_GATE},i);
-        if(i==32)
-            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_CLOCK,IDT_INT_GATE},i);
-        if(i==33)
-            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_KEYPRESS,IDT_INT_GATE},i);
-        if(i==48)
-            idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_SYSCALL,IDT_TRAP_GATE},i);
-    }
-    
-    asm("lidtl (IDTR)");
-}
-
-void idt_write_entry(IDT_ENTRY entry, int id){
-    int descriptor[2];
-    descriptor[0]=entry.offset & 0xFFFF | entry.segment << 16;
-    descriptor[1]=entry.type & 0xFFFF | entry.offset & 0xFFFF0000;
-    memcpy((void*)descriptor, (void *)(IDTR.base+(id*8)),8);
-}
\ No newline at end of file
diff --git a/src/int/idt.h b/src/int/idt.h
deleted file mode 100644
index 17c5cfa..0000000
--- a/src/int/idt.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef IDT_H
-#define IDT_H
-
-#include "core/types.h"
-#include "core/mem.h"
-
-#define IDT_MAX_ENTRY 200
-#define IDT_INT_GATE 0x8E00
-#define IDT_TRAP_GATE 0xEF00
-
-typedef struct IDT_ENTRY {
-    u16 segment;
-    u32 offset;
-    u16 type;
-} IDT_ENTRY;
-
-struct IDT_REGISTER {
-    u16 limit;
-    u32 base;
-} __attribute__((packed));
-
-/**
- * Copy IDT into memory and load it
- */
-void idt_init();
-
-/**
- * Write an IDT entry into memory
- */
-void idt_write_entry(IDT_ENTRY entry,int id);
-
-#endif
\ No newline at end of file
diff --git a/src/int/int.S b/src/int/int.S
deleted file mode 100644
index 8ca8b7a..0000000
--- a/src/int/int.S
+++ /dev/null
@@ -1,72 +0,0 @@
-.macro  SAVE_REGS
-pushal             
-push %ds
-push %es
-push %fs
-push %gs
-push %ebx
-mov $0x10,%bx
-mov %bx,%ds
-pop %ebx
-.endm
-
-.macro RESTORE_REGS
-    pop %gs
-    pop %fs
-    pop %es
-    pop %ds
-    popal
-.endm
-
-.globl interrupt_enable
-interrupt_enable:
-    call idt_init
-    call pic_init
-    sti
-    ret
-
-.globl INT_DEFAULT
-INT_DEFAULT:
-    SAVE_REGS
-    movb $0x20, %al
-    outb %al, $0x20
-    RESTORE_REGS
-    iret
-
-.globl INT_KEYPRESS
-INT_KEYPRESS:
-    SAVE_REGS
-    call _8042_keypress
-    movb $0x20, %al
-    outb %al, $0x20
-    RESTORE_REGS
-    iret
-
-.globl INT_CLOCK
-INT_CLOCK:
-    SAVE_REGS
-    call clock
-    movb $0x20, %al
-    outb %al, $0x20
-    RESTORE_REGS
-    iret
-
-.globl INT_SYSCALL
-INT_SYSCALL:
-    SAVE_REGS
-    call syscall
-    movb $0x20, %al
-    outb %al, $0x20
-    RESTORE_REGS
-    iret
-
-.globl INT_PAGE_FAULT
-INT_PAGE_FAULT:
-    SAVE_REGS
-    call page_fault
-    hlt
-    movb $0x20, %al
-    outb %al, $0x20
-    RESTORE_REGS
-    iret
-
diff --git a/src/int/pic.c b/src/int/pic.c
deleted file mode 100644
index d509e1d..0000000
--- a/src/int/pic.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "pic.h"
-#include "core/asm.h"
-#include "core/mem.h"
-#include "core/syscall.h"
-
-void pic_init(){
-    
-    // ICW1: Initialisation
-    outbj(0x20,0x11); // Master
-    outbj(0xA0,0x11); // Slave
-
-    // ICW2: Map IRQ index to entry into the IDT
-    outbj(0x21,0x20); // Start interrupt at offset 0x20 in IDT (index 32)
-    outbj(0xA1,0x70); // Start interrupt at offset 0x50 in IDT (index 80)
-
-    // ICW3: Indicate the connection between master and slave
-    outbj(0x21,0x02); // Slave connected to pin 2
-    outbj(0xA1,0x01); // Indicate pin id to the slave (2-1)
-
-    // ICW4: Operating mode
-    outbj(0x21,0x01); // Default operating mode
-    outbj(0xA1,0x01); // Default operating mode
-
-    // OCW: Masking
-    outbj(0x21,0b11111100);
-}
-
-
diff --git a/src/int/pic.h b/src/int/pic.h
deleted file mode 100644
index 19e0f5c..0000000
--- a/src/int/pic.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PIC_H
-#define PIC_H
-
-/**
- * Configure 
- */
-void pic_init();
-
-#endif
\ No newline at end of file
diff --git a/src/libc/stdio.h b/src/libc/stdio.h
index 5805f5a..e2a35ad 100644
--- a/src/libc/stdio.h
+++ b/src/libc/stdio.h
@@ -1,7 +1,7 @@
 #ifndef STDIO_H
 #define STDIO_H
 
-#include "core/framebuffer.h"
+#include "drivers/framebuffer.h"
 
 void print(char*);
 void printc(char*,VIDEO_COLORS c);
-- 
cgit v1.2.3