7 files changed, 33 insertions, 54 deletions
diff --git a/src/utils/8042.c b/src/utils/8042.c
index d8a5ba0..1d22152 100644
--- a/src/utils/8042.c
+++ b/src/utils/8042.c
@@ -1,5 +1,5 @@
 #include "8042.h"
-#include "print.h"
+#include "framebuffer.h"
 #include "asm.h"
 
 DEFINE_AZERTY;
diff --git a/src/utils/8042.h b/src/utils/8042.h
index 068a0ef..8efa8ce 100644
--- a/src/utils/8042.h
+++ b/src/utils/8042.h
@@ -6,22 +6,22 @@
 void _8042_keypress();
 
 #define DEFINE_AZERTY char AZERTY[]={\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',/* 10 */\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
+    '&',\
+    '\0',\
+    '"',\
+    '\'',\
+    '(',\
+    '-',\
+    '\0',\
+    '_',/* 10 */\
+    '\0',\
+    '\0',\
+    ')',\
+    '=',\
+    '\0',\
+    '\t',\
     'a',\
     'z',\
     'e',\
@@ -34,8 +34,8 @@ void _8042_keypress();
     'p',\
     '^',\
     '$',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
     'q',/* 0x1E (30) */\
     's',\
     'd',\
@@ -46,9 +46,9 @@ void _8042_keypress();
     'k',\
     'l',\
     'm',\
-    '?',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
+    '\0',\
     '*',\
     'w',\
     'x',\
diff --git a/src/utils/print.c b/src/utils/framebuffer.c
index c2cdaf1..110dc73 100644
--- a/src/utils/print.c
+++ b/src/utils/framebuffer.c
@@ -1,16 +1,8 @@
-#include "print.h"
+#include "framebuffer.h"
 
 #define MAX_COL 80
 #define MAX_LINE 25
 
-struct VIDEO_STATE {
-  u8 *mem;
-  u8 col;
-  u8 line;
-  u8 bg;
-  u8 fg;
-};
-
 VIDEO_STATE VS={
   (u8 *)0xB8000,
   0,
@@ -47,21 +39,6 @@ void putchar(char c){
   }
 }
 
-void print(char *str){
-  int i=0;
-  while(str[i]!='\0'){
-    putchar(str[i]);
-    i++;
-  }
-}
-
-void printc(char* str,VIDEO_COLORS c){
-  VIDEO_COLORS backup=VS.fg;
-  VS.fg=c;
-  print(str);
-  VS.fg=backup;
-}
-
 void clear(){
   for(char i=0;i<MAX_LINE;i++){
     scrollup();
diff --git a/src/utils/print.h b/src/utils/framebuffer.h
index 163f4ec..f4e52a0 100644
--- a/src/utils/print.h
+++ b/src/utils/framebuffer.h
@@ -1,5 +1,5 @@
-#ifndef PRINT_H
-#define PRINT_H
+#ifndef FRAMEBUFFER_H
+#define FRAMEBUFFER_H
 
 #include "types.h"
 
@@ -9,14 +9,18 @@ typedef enum VIDEO_COLORS {
   
 } VIDEO_COLORS;
 
-typedef struct VIDEO_STATE VIDEO_STATE;
+typedef struct VIDEO_STATE {
+  u8 *mem;
+  u8 col;
+  u8 line;
+  u8 bg;
+  u8 fg;
+} VIDEO_STATE;
 
 /**
  * Print char
  */
 void putchar(char);
-void print(char*);
-void printc(char*,VIDEO_COLORS c);
 void scrollup();
 void clear();
 
diff --git a/src/utils/gdt.c b/src/utils/gdt.c
index 85c4a09..e82ebe4 100644
--- a/src/utils/gdt.c
+++ b/src/utils/gdt.c
@@ -1,5 +1,4 @@
 #include "gdt.h"
-#include "print.h"
 #include "mem.h"
 
 struct GDT_REGISTER GDTR = { 0, 0 };
diff --git a/src/utils/mem.h b/src/utils/mem.h
index b09c3f0..f051219 100644
--- a/src/utils/mem.h
+++ b/src/utils/mem.h
@@ -3,7 +3,6 @@
 
 #include "types.h"
 
-
 void memcpy(void *src, void *dst, int size);
 
 #endif
diff --git a/src/utils/pic.c b/src/utils/pic.c
index 4806cb9..dcbd983 100644
--- a/src/utils/pic.c
+++ b/src/utils/pic.c
@@ -56,7 +56,7 @@ void pic_enable_interrupt(){
     outbj(0xA1,0x01); // Default operating mode
 
     // OCW: Masking
-    outbj(0x21,0);
+    outbj(0x21,0b11111100);
 
 
     asm("lidtl (IDTR)");