17 files changed, 32 insertions, 28 deletions
diff --git a/include/02.vga/deo1 b/include/02.vga/deo1
deleted file mode 100644
index dfee578..0000000
--- a/include/02.vga/deo1
+++ /dev/null
@@ -1,4 +0,0 @@
-#include<types.h>
-#include<string.h>
-#include<asm.h>
-#include<vga.h>
diff --git a/include/02.vga/deo4 b/include/02.vga/deo4
deleted file mode 100644
index 173e598..0000000
--- a/include/02.vga/deo4
+++ /dev/null
@@ -1,4 +0,0 @@
-static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
-{
-    return (uint16_t) uc | (uint16_t) color << 8;
-}
diff --git a/include/02.vga/vga.c b/include/02.vga/vga.c
index 67c8b02..ac1e409 100644
--- a/include/02.vga/vga.c
+++ b/include/02.vga/vga.c
@@ -1,7 +1,7 @@
+#include<source/vga.h>
 #include<types.h>
-#include<string.h>
+#include<source/string.h>
 #include<asm.h>
-#include<vga.h>
 
 size_t terminal_row;
 size_t terminal_column;
@@ -10,15 +10,16 @@ uint16_t* terminal_buffer;
 
 void set_color(enum vga_color fg, enum vga_color bg)
 {
-    terminal_color = fg | bg << 4;
+    terminal_color = (uint8_t)(fg|bg<<4);
 }
 
-static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
+static inline uint16_t vga_entry(char uc, uint8_t color);
+static inline uint16_t vga_entry(char uc, uint8_t color)
 {
-    return (uint16_t) uc | (uint16_t) color << 8;
+    return (uint16_t)(uc|color<<8);
 }
 
-void terminal_initialize()
+void terminal_initialize(void)
 {
     terminal_row=0;
     terminal_column=0;
@@ -40,19 +41,19 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
     terminal_buffer[index]=vga_entry(c, color);
 }
 
-void movescreen()
+void movescreen(void)
 {
     terminal_row--;
     for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++)
         terminal_buffer[i*VGA_WIDTH+j]=terminal_buffer[(i+1)*VGA_WIDTH+j];
 }
 
-void next_field()
+void next_field(void)
 {
     if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
 }
 
-void previous_field()
+void previous_field(void)
 {
     if(terminal_column) terminal_column--;
     else terminal_row--,terminal_column=VGA_WIDTH-1;
@@ -69,7 +70,7 @@ void terminal_putchar(char c)
     if (terminal_row==VGA_HEIGHT) movescreen();
 }
 
-void terminal_writestring(char* data)
+void terminal_writestring(const char* data)
 {
     for(int i=0;data[i]!='\0';i++) terminal_putchar(data[i]);
 }
@@ -92,9 +93,10 @@ void terminal_writefloat(double num)
     terminal_writestring(str);
 }
 
-void clear()
+void clear(void)
 {
-    for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++) terminal_putchar(' ');
+    for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++)
+        terminal_putchar(' ');
     terminal_column=0;
     terminal_row=0;
 }
diff --git a/include/02.vga/vga1.c b/include/02.vga/vga1.c
new file mode 100644
index 0000000..2b2cbe1
--- /dev/null
+++ b/include/02.vga/vga1.c
@@ -0,0 +1,4 @@
+#include<source/vga.h>
+#include<types.h>
+#include<source/string.h>
+#include<asm.h>
diff --git a/include/02.vga/deo10 b/include/02.vga/vga10.c
index 9511b21..9511b21 100644
--- a/include/02.vga/deo10
+++ b/include/02.vga/vga10.c
diff --git a/include/02.vga/deo11 b/include/02.vga/vga11.c
index 8a757f4..d2a78f5 100644
--- a/include/02.vga/deo11
+++ b/include/02.vga/vga11.c
@@ -1,4 +1,4 @@
-void terminal_writestring(char* data)
+void terminal_writestring(const char* data)
 {
     for(int i=0;data[i]!='\0';i++) terminal_putchar(data[i]);
 }
diff --git a/include/02.vga/deo12 b/include/02.vga/vga12.c
index be40f5a..be40f5a 100644
--- a/include/02.vga/deo12
+++ b/include/02.vga/vga12.c
diff --git a/include/02.vga/deo13 b/include/02.vga/vga13.c
index dfa3994..dfa3994 100644
--- a/include/02.vga/deo13
+++ b/include/02.vga/vga13.c
diff --git a/include/02.vga/deo14 b/include/02.vga/vga14.c
index efe6d3a..5ad2ed9 100644
--- a/include/02.vga/deo14
+++ b/include/02.vga/vga14.c
@@ -1,6 +1,7 @@
-void clear()
+void clear(void)
 {
-    for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++) terminal_putchar(' ');
+    for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++)
+        terminal_putchar(' ');
     terminal_column=0;
     terminal_row=0;
 }
diff --git a/include/02.vga/deo2 b/include/02.vga/vga2.c
index be0ba00..be0ba00 100644
--- a/include/02.vga/deo2
+++ b/include/02.vga/vga2.c
diff --git a/include/02.vga/deo3 b/include/02.vga/vga3.c
index 5a12424..f956514 100644
--- a/include/02.vga/deo3
+++ b/include/02.vga/vga3.c
@@ -1,4 +1,4 @@
 void set_color(enum vga_color fg, enum vga_color bg)
 {
-    terminal_color = fg | bg << 4;
+    terminal_color = (uint8_t)(fg|bg<<4);
 }
diff --git a/include/02.vga/vga4.c b/include/02.vga/vga4.c
new file mode 100644
index 0000000..0c3dd87
--- /dev/null
+++ b/include/02.vga/vga4.c
@@ -0,0 +1,5 @@
+static inline uint16_t vga_entry(char uc, uint8_t color);
+static inline uint16_t vga_entry(char uc, uint8_t color)
+{
+    return (uint16_t)(uc|color<<8);
+}
diff --git a/include/02.vga/deo5 b/include/02.vga/vga5.c
index f4875e6..79c5657 100644
--- a/include/02.vga/deo5
+++ b/include/02.vga/vga5.c
@@ -1,4 +1,4 @@
-void terminal_initialize()
+void terminal_initialize(void)
 {
     terminal_row=0;
     terminal_column=0;
diff --git a/include/02.vga/deo6 b/include/02.vga/vga6.c
index 7079bf9..7079bf9 100644
--- a/include/02.vga/deo6
+++ b/include/02.vga/vga6.c
diff --git a/include/02.vga/deo7 b/include/02.vga/vga7.c
index 2fbf259..dfa48c4 100644
--- a/include/02.vga/deo7
+++ b/include/02.vga/vga7.c
@@ -1,4 +1,4 @@
-void movescreen()
+void movescreen(void)
 {
     terminal_row--;
     for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++)
diff --git a/include/02.vga/deo8 b/include/02.vga/vga8.c
index cfb7051..19ec6da 100644
--- a/include/02.vga/deo8
+++ b/include/02.vga/vga8.c
@@ -1,4 +1,4 @@
-void next_field()
+void next_field(void)
 {
     if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
 }
diff --git a/include/02.vga/deo9 b/include/02.vga/vga9.c
index 6e1236d..217deff 100644
--- a/include/02.vga/deo9
+++ b/include/02.vga/vga9.c
@@ -1,4 +1,4 @@
-void previous_field()
+void previous_field(void)
 {
     if(terminal_column) terminal_column--;
     else terminal_row--,terminal_column=VGA_WIDTH-1;