15 files changed, 125 insertions, 8 deletions
diff --git a/include/02.vga/vga00.c b/include/02.vga/deo1
index dfee578..dfee578 100644
--- a/include/02.vga/vga00.c
+++ b/include/02.vga/deo1
diff --git a/include/02.vga/vga09.c b/include/02.vga/deo10
index 71e5b7d..9511b21 100644
--- a/include/02.vga/vga09.c
+++ b/include/02.vga/deo10
@@ -3,8 +3,8 @@ void terminal_putchar(char c)
     if(c=='\n') terminal_column=0,terminal_row++;
     else
     {
-	terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
-	next_field();
+        terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
+        next_field();
     }
     if (terminal_row==VGA_HEIGHT) movescreen();
 }
diff --git a/include/02.vga/vga10.c b/include/02.vga/deo11
index 8a757f4..8a757f4 100644
--- a/include/02.vga/vga10.c
+++ b/include/02.vga/deo11
diff --git a/include/02.vga/deo12 b/include/02.vga/deo12
new file mode 100644
index 0000000..be40f5a
--- /dev/null
+++ b/include/02.vga/deo12
@@ -0,0 +1,8 @@
+void terminal_writeint(uint32_t num)
+{
+    char string[100];
+    for(int i=0;i<100;i++) string[i]='\0';
+    char *str=string;
+    itos(num,str);
+    terminal_writestring(str);
+}
diff --git a/include/02.vga/deo13 b/include/02.vga/deo13
new file mode 100644
index 0000000..dfa3994
--- /dev/null
+++ b/include/02.vga/deo13
@@ -0,0 +1,8 @@
+void terminal_writefloat(double num)
+{
+    char string[100];
+    for(int i=0;i<100;i++) string[i]='\0';
+    char *str=string;
+    ftos(num,str);
+    terminal_writestring(str);
+}
diff --git a/include/02.vga/vga11.c b/include/02.vga/deo14
index efe6d3a..efe6d3a 100644
--- a/include/02.vga/vga11.c
+++ b/include/02.vga/deo14
diff --git a/include/02.vga/vga01.c b/include/02.vga/deo2
index be0ba00..be0ba00 100644
--- a/include/02.vga/vga01.c
+++ b/include/02.vga/deo2
diff --git a/include/02.vga/vga02.c b/include/02.vga/deo3
index 5a12424..5a12424 100644
--- a/include/02.vga/vga02.c
+++ b/include/02.vga/deo3
diff --git a/include/02.vga/vga03.c b/include/02.vga/deo4
index 173e598..173e598 100644
--- a/include/02.vga/vga03.c
+++ b/include/02.vga/deo4
diff --git a/include/02.vga/vga04.c b/include/02.vga/deo5
index 50a7d65..f4875e6 100644
--- a/include/02.vga/vga04.c
+++ b/include/02.vga/deo5
@@ -6,10 +6,10 @@ void terminal_initialize()
     terminal_buffer=(uint16_t*) 0xB8000;
     for(size_t y=0;y<VGA_HEIGHT;y++)
     {
-	for(size_t x=0;x<VGA_WIDTH;x++)
-	{
-	    const size_t index=y*VGA_WIDTH+x;
-	    terminal_buffer[index]=vga_entry(' ', terminal_color);
-	}
+        for(size_t x=0;x<VGA_WIDTH;x++)
+        {
+            const size_t index=y*VGA_WIDTH+x;
+            terminal_buffer[index]=vga_entry(' ', terminal_color);
+        }
     }
 }
diff --git a/include/02.vga/vga05.c b/include/02.vga/deo6
index 7079bf9..7079bf9 100644
--- a/include/02.vga/vga05.c
+++ b/include/02.vga/deo6
diff --git a/include/02.vga/vga06.c b/include/02.vga/deo7
index f00a403..2fbf259 100644
--- a/include/02.vga/vga06.c
+++ b/include/02.vga/deo7
@@ -1,5 +1,6 @@
 void movescreen()
 {
     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];
+    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];
 }
diff --git a/include/02.vga/vga07.c b/include/02.vga/deo8
index cfb7051..cfb7051 100644
--- a/include/02.vga/vga07.c
+++ b/include/02.vga/deo8
diff --git a/include/02.vga/vga08.c b/include/02.vga/deo9
index 6e1236d..6e1236d 100644
--- a/include/02.vga/vga08.c
+++ b/include/02.vga/deo9
diff --git a/include/02.vga/vga.c b/include/02.vga/vga.c
new file mode 100644
index 0000000..67c8b02
--- /dev/null
+++ b/include/02.vga/vga.c
@@ -0,0 +1,100 @@
+#include<types.h>
+#include<string.h>
+#include<asm.h>
+#include<vga.h>
+
+size_t terminal_row;
+size_t terminal_column;
+uint8_t terminal_color;
+uint16_t* terminal_buffer;
+
+void set_color(enum vga_color fg, enum vga_color bg)
+{
+    terminal_color = fg | bg << 4;
+}
+
+static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
+{
+    return (uint16_t) uc | (uint16_t) color << 8;
+}
+
+void terminal_initialize()
+{
+    terminal_row=0;
+    terminal_column=0;
+    set_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
+    terminal_buffer=(uint16_t*) 0xB8000;
+    for(size_t y=0;y<VGA_HEIGHT;y++)
+    {
+        for(size_t x=0;x<VGA_WIDTH;x++)
+        {
+            const size_t index=y*VGA_WIDTH+x;
+            terminal_buffer[index]=vga_entry(' ', terminal_color);
+        }
+    }
+}
+
+void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
+{
+    const size_t index=y*VGA_WIDTH+x;
+    terminal_buffer[index]=vga_entry(c, color);
+}
+
+void movescreen()
+{
+    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()
+{
+    if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
+}
+
+void previous_field()
+{
+    if(terminal_column) terminal_column--;
+    else terminal_row--,terminal_column=VGA_WIDTH-1;
+}
+
+void terminal_putchar(char c)
+{
+    if(c=='\n') terminal_column=0,terminal_row++;
+    else
+    {
+        terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
+        next_field();
+    }
+    if (terminal_row==VGA_HEIGHT) movescreen();
+}
+
+void terminal_writestring(char* data)
+{
+    for(int i=0;data[i]!='\0';i++) terminal_putchar(data[i]);
+}
+
+void terminal_writeint(uint32_t num)
+{
+    char string[100];
+    for(int i=0;i<100;i++) string[i]='\0';
+    char *str=string;
+    itos(num,str);
+    terminal_writestring(str);
+}
+
+void terminal_writefloat(double num)
+{
+    char string[100];
+    for(int i=0;i<100;i++) string[i]='\0';
+    char *str=string;
+    ftos(num,str);
+    terminal_writestring(str);
+}
+
+void clear()
+{
+    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;
+}