23 files changed, 15 insertions, 47 deletions
diff --git a/include/06.keyboard/deo1 b/include/06.keyboard/deo1
deleted file mode 100644
index 13fd550..0000000
--- a/include/06.keyboard/deo1
+++ /dev/null
@@ -1,3 +0,0 @@
-#include<types.h>
-#include<asm.h>
-#include<stdio.h>
diff --git a/include/06.keyboard/deo3 b/include/06.keyboard/deo3
deleted file mode 100644
index 239c874..0000000
--- a/include/06.keyboard/deo3
+++ /dev/null
@@ -1,7 +0,0 @@
-#define PIC1_COMMAND_PORT 0x20
-#define PIC1_DATA_PORT 0x21
-#define PIC2_COMMAND_PORT 0xA0
-#define PIC2_DATA_PORT 0xA1
-// IO Ports for Keyboard
-#define KEYBOARD_DATA_PORT 0x60
-#define KEYBOARD_STATUS_PORT 0x64
diff --git a/include/06.keyboard/deo4 b/include/06.keyboard/deo4
deleted file mode 100644
index 3322fd7..0000000
--- a/include/06.keyboard/deo4
+++ /dev/null
@@ -1,6 +0,0 @@
-void previous_field(void);
-void tty(char *buffer);
-void prompt(void);
-void clear();
-void us_en(char keymap[]);
-void us_en_shift(char keymap[]);
diff --git a/include/06.keyboard/deo5 b/include/06.keyboard/deo5
deleted file mode 100644
index 57028c5..0000000
--- a/include/06.keyboard/deo5
+++ /dev/null
@@ -1,7 +0,0 @@
-char charcode[256];
-char shift_charcode[256];
-bool ispressed[128];
-#define lshift 0x2A
-#define rshift 0x36
-#define lctrl 0x1D
-#define rctrl 0x1D
diff --git a/include/06.keyboard/keyboard.c b/include/06.keyboard/keyboard.c
index 2218f09..a95d399 100644
--- a/include/06.keyboard/keyboard.c
+++ b/include/06.keyboard/keyboard.c
@@ -1,37 +1,20 @@
+#include<source/keyboard.h>
 #include<types.h>
 #include<asm.h>
-#include<stdio.h>
+#include<source/stdio.h>
+#include<source/keymap.h>
+#include<source/vga.h>
+#include<source/tty.h>
 
-#define BUFFER_SIZE 200
-#define BUFFER_LOG 200
 char buffer[BUFFER_LOG][BUFFER_SIZE];
 size_t buffer_size[BUFFER_LOG];
 size_t buffer_current=0;
 size_t buffer_all=0;
 size_t buffer_index=0;
 
-#define PIC1_COMMAND_PORT 0x20
-#define PIC1_DATA_PORT 0x21
-#define PIC2_COMMAND_PORT 0xA0
-#define PIC2_DATA_PORT 0xA1
-// IO Ports for Keyboard
-#define KEYBOARD_DATA_PORT 0x60
-#define KEYBOARD_STATUS_PORT 0x64
-
-void previous_field(void);
-void tty(char *buffer);
-void prompt(void);
-void clear();
-void us_en(char keymap[]);
-void us_en_shift(char keymap[]);
-
 char charcode[256];
 char shift_charcode[256];
 bool ispressed[128];
-#define lshift 0x2A
-#define rshift 0x36
-#define lctrl 0x1D
-#define rctrl 0x1D
 
 void init_keyboard()
 {
diff --git a/include/06.keyboard/keyboard1.c b/include/06.keyboard/keyboard1.c
new file mode 100644
index 0000000..7576f1e
--- /dev/null
+++ b/include/06.keyboard/keyboard1.c
@@ -0,0 +1,7 @@
+#include<source/keyboard.h>
+#include<types.h>
+#include<asm.h>
+#include<source/stdio.h>
+#include<source/keymap.h>
+#include<source/vga.h>
+#include<source/tty.h>
diff --git a/include/06.keyboard/deo12 b/include/06.keyboard/keyboard10.c
index b40c42b..b40c42b 100644
--- a/include/06.keyboard/deo12
+++ b/include/06.keyboard/keyboard10.c
diff --git a/include/06.keyboard/deo13 b/include/06.keyboard/keyboard11.c
index 87b6e42..87b6e42 100644
--- a/include/06.keyboard/deo13
+++ b/include/06.keyboard/keyboard11.c
diff --git a/include/06.keyboard/deo14 b/include/06.keyboard/keyboard12.c
index 15df074..15df074 100644
--- a/include/06.keyboard/deo14
+++ b/include/06.keyboard/keyboard12.c
diff --git a/include/06.keyboard/deo15 b/include/06.keyboard/keyboard13.c
index c7fca4c..c7fca4c 100644
--- a/include/06.keyboard/deo15
+++ b/include/06.keyboard/keyboard13.c
diff --git a/include/06.keyboard/deo16 b/include/06.keyboard/keyboard14.c
index a55e9c2..a55e9c2 100644
--- a/include/06.keyboard/deo16
+++ b/include/06.keyboard/keyboard14.c
diff --git a/include/06.keyboard/deo17 b/include/06.keyboard/keyboard15.c
index ded0af2..ded0af2 100644
--- a/include/06.keyboard/deo17
+++ b/include/06.keyboard/keyboard15.c
diff --git a/include/06.keyboard/deo18 b/include/06.keyboard/keyboard16.c
index 04688a9..04688a9 100644
--- a/include/06.keyboard/deo18
+++ b/include/06.keyboard/keyboard16.c
diff --git a/include/06.keyboard/deo19 b/include/06.keyboard/keyboard17.c
index 359ba30..359ba30 100644
--- a/include/06.keyboard/deo19
+++ b/include/06.keyboard/keyboard17.c
diff --git a/include/06.keyboard/deo20 b/include/06.keyboard/keyboard18.c
index d594130..d594130 100644
--- a/include/06.keyboard/deo20
+++ b/include/06.keyboard/keyboard18.c
diff --git a/include/06.keyboard/deo2 b/include/06.keyboard/keyboard2.c
index 50d7c07..6361589 100644
--- a/include/06.keyboard/deo2
+++ b/include/06.keyboard/keyboard2.c
@@ -1,5 +1,3 @@
-#define BUFFER_SIZE 200
-#define BUFFER_LOG 200
 char buffer[BUFFER_LOG][BUFFER_SIZE];
 size_t buffer_size[BUFFER_LOG];
 size_t buffer_current=0;
diff --git a/include/06.keyboard/keyboard3.c b/include/06.keyboard/keyboard3.c
new file mode 100644
index 0000000..f42433e
--- /dev/null
+++ b/include/06.keyboard/keyboard3.c
@@ -0,0 +1,3 @@
+char charcode[256];
+char shift_charcode[256];
+bool ispressed[128];
diff --git a/include/06.keyboard/deo6 b/include/06.keyboard/keyboard4.c
index 5c089ce..5c089ce 100644
--- a/include/06.keyboard/deo6
+++ b/include/06.keyboard/keyboard4.c
diff --git a/include/06.keyboard/deo7 b/include/06.keyboard/keyboard5.c
index 55e04b8..55e04b8 100644
--- a/include/06.keyboard/deo7
+++ b/include/06.keyboard/keyboard5.c
diff --git a/include/06.keyboard/deo8 b/include/06.keyboard/keyboard6.c
index 95a5ac5..95a5ac5 100644
--- a/include/06.keyboard/deo8
+++ b/include/06.keyboard/keyboard6.c
diff --git a/include/06.keyboard/deo9 b/include/06.keyboard/keyboard7.c
index bc07378..bc07378 100644
--- a/include/06.keyboard/deo9
+++ b/include/06.keyboard/keyboard7.c
diff --git a/include/06.keyboard/deo10 b/include/06.keyboard/keyboard8.c
index e5d558c..e5d558c 100644
--- a/include/06.keyboard/deo10
+++ b/include/06.keyboard/keyboard8.c
diff --git a/include/06.keyboard/deo11 b/include/06.keyboard/keyboard9.c
index 33bc64b..33bc64b 100644
--- a/include/06.keyboard/deo11
+++ b/include/06.keyboard/keyboard9.c