From 0bff8199e4a800d5ea1bd422dcf06643d6daf008 Mon Sep 17 00:00:00 2001
From: Aleksa Vučković <aleksav013@gmail.com>
Date: Mon, 10 Jan 2022 22:15:15 +0100
Subject: include/setup.sh

---
 include/02.vga/deo1    |   4 ++
 include/02.vga/deo10   |  10 +++++
 include/02.vga/deo11   |   4 ++
 include/02.vga/deo12   |   8 ++++
 include/02.vga/deo13   |   8 ++++
 include/02.vga/deo14   |   6 +++
 include/02.vga/deo2    |   4 ++
 include/02.vga/deo3    |   4 ++
 include/02.vga/deo4    |   4 ++
 include/02.vga/deo5    |  15 ++++++++
 include/02.vga/deo6    |   5 +++
 include/02.vga/deo7    |   6 +++
 include/02.vga/deo8    |   4 ++
 include/02.vga/deo9    |   5 +++
 include/02.vga/vga.c   | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/02.vga/vga00.c |   4 --
 include/02.vga/vga01.c |   4 --
 include/02.vga/vga02.c |   4 --
 include/02.vga/vga03.c |   4 --
 include/02.vga/vga04.c |  15 --------
 include/02.vga/vga05.c |   5 ---
 include/02.vga/vga06.c |   5 ---
 include/02.vga/vga07.c |   4 --
 include/02.vga/vga08.c |   5 ---
 include/02.vga/vga09.c |  10 -----
 include/02.vga/vga10.c |   4 --
 include/02.vga/vga11.c |   6 ---
 27 files changed, 187 insertions(+), 70 deletions(-)
 create mode 100644 include/02.vga/deo1
 create mode 100644 include/02.vga/deo10
 create mode 100644 include/02.vga/deo11
 create mode 100644 include/02.vga/deo12
 create mode 100644 include/02.vga/deo13
 create mode 100644 include/02.vga/deo14
 create mode 100644 include/02.vga/deo2
 create mode 100644 include/02.vga/deo3
 create mode 100644 include/02.vga/deo4
 create mode 100644 include/02.vga/deo5
 create mode 100644 include/02.vga/deo6
 create mode 100644 include/02.vga/deo7
 create mode 100644 include/02.vga/deo8
 create mode 100644 include/02.vga/deo9
 create mode 100644 include/02.vga/vga.c
 delete mode 100644 include/02.vga/vga00.c
 delete mode 100644 include/02.vga/vga01.c
 delete mode 100644 include/02.vga/vga02.c
 delete mode 100644 include/02.vga/vga03.c
 delete mode 100644 include/02.vga/vga04.c
 delete mode 100644 include/02.vga/vga05.c
 delete mode 100644 include/02.vga/vga06.c
 delete mode 100644 include/02.vga/vga07.c
 delete mode 100644 include/02.vga/vga08.c
 delete mode 100644 include/02.vga/vga09.c
 delete mode 100644 include/02.vga/vga10.c
 delete mode 100644 include/02.vga/vga11.c

(limited to 'include/02.vga')

diff --git a/include/02.vga/deo1 b/include/02.vga/deo1
new file mode 100644
index 0000000..dfee578
--- /dev/null
+++ b/include/02.vga/deo1
@@ -0,0 +1,4 @@
+#include<types.h>
+#include<string.h>
+#include<asm.h>
+#include<vga.h>
diff --git a/include/02.vga/deo10 b/include/02.vga/deo10
new file mode 100644
index 0000000..9511b21
--- /dev/null
+++ b/include/02.vga/deo10
@@ -0,0 +1,10 @@
+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();
+}
diff --git a/include/02.vga/deo11 b/include/02.vga/deo11
new file mode 100644
index 0000000..8a757f4
--- /dev/null
+++ b/include/02.vga/deo11
@@ -0,0 +1,4 @@
+void terminal_writestring(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/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/deo14 b/include/02.vga/deo14
new file mode 100644
index 0000000..efe6d3a
--- /dev/null
+++ b/include/02.vga/deo14
@@ -0,0 +1,6 @@
+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;
+}
diff --git a/include/02.vga/deo2 b/include/02.vga/deo2
new file mode 100644
index 0000000..be0ba00
--- /dev/null
+++ b/include/02.vga/deo2
@@ -0,0 +1,4 @@
+size_t terminal_row;
+size_t terminal_column;
+uint8_t terminal_color;
+uint16_t* terminal_buffer;
diff --git a/include/02.vga/deo3 b/include/02.vga/deo3
new file mode 100644
index 0000000..5a12424
--- /dev/null
+++ b/include/02.vga/deo3
@@ -0,0 +1,4 @@
+void set_color(enum vga_color fg, enum vga_color bg)
+{
+    terminal_color = fg | bg << 4;
+}
diff --git a/include/02.vga/deo4 b/include/02.vga/deo4
new file mode 100644
index 0000000..173e598
--- /dev/null
+++ b/include/02.vga/deo4
@@ -0,0 +1,4 @@
+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/deo5 b/include/02.vga/deo5
new file mode 100644
index 0000000..f4875e6
--- /dev/null
+++ b/include/02.vga/deo5
@@ -0,0 +1,15 @@
+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);
+        }
+    }
+}
diff --git a/include/02.vga/deo6 b/include/02.vga/deo6
new file mode 100644
index 0000000..7079bf9
--- /dev/null
+++ b/include/02.vga/deo6
@@ -0,0 +1,5 @@
+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);
+}
diff --git a/include/02.vga/deo7 b/include/02.vga/deo7
new file mode 100644
index 0000000..2fbf259
--- /dev/null
+++ b/include/02.vga/deo7
@@ -0,0 +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];
+}
diff --git a/include/02.vga/deo8 b/include/02.vga/deo8
new file mode 100644
index 0000000..cfb7051
--- /dev/null
+++ b/include/02.vga/deo8
@@ -0,0 +1,4 @@
+void next_field()
+{
+    if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
+}
diff --git a/include/02.vga/deo9 b/include/02.vga/deo9
new file mode 100644
index 0000000..6e1236d
--- /dev/null
+++ b/include/02.vga/deo9
@@ -0,0 +1,5 @@
+void previous_field()
+{
+    if(terminal_column) terminal_column--;
+    else terminal_row--,terminal_column=VGA_WIDTH-1;
+}
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;
+}
diff --git a/include/02.vga/vga00.c b/include/02.vga/vga00.c
deleted file mode 100644
index dfee578..0000000
--- a/include/02.vga/vga00.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include<types.h>
-#include<string.h>
-#include<asm.h>
-#include<vga.h>
diff --git a/include/02.vga/vga01.c b/include/02.vga/vga01.c
deleted file mode 100644
index be0ba00..0000000
--- a/include/02.vga/vga01.c
+++ /dev/null
@@ -1,4 +0,0 @@
-size_t terminal_row;
-size_t terminal_column;
-uint8_t terminal_color;
-uint16_t* terminal_buffer;
diff --git a/include/02.vga/vga02.c b/include/02.vga/vga02.c
deleted file mode 100644
index 5a12424..0000000
--- a/include/02.vga/vga02.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void set_color(enum vga_color fg, enum vga_color bg)
-{
-    terminal_color = fg | bg << 4;
-}
diff --git a/include/02.vga/vga03.c b/include/02.vga/vga03.c
deleted file mode 100644
index 173e598..0000000
--- a/include/02.vga/vga03.c
+++ /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/vga04.c b/include/02.vga/vga04.c
deleted file mode 100644
index 50a7d65..0000000
--- a/include/02.vga/vga04.c
+++ /dev/null
@@ -1,15 +0,0 @@
-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);
-	}
-    }
-}
diff --git a/include/02.vga/vga05.c b/include/02.vga/vga05.c
deleted file mode 100644
index 7079bf9..0000000
--- a/include/02.vga/vga05.c
+++ /dev/null
@@ -1,5 +0,0 @@
-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);
-}
diff --git a/include/02.vga/vga06.c b/include/02.vga/vga06.c
deleted file mode 100644
index f00a403..0000000
--- a/include/02.vga/vga06.c
+++ /dev/null
@@ -1,5 +0,0 @@
-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];
-}
diff --git a/include/02.vga/vga07.c b/include/02.vga/vga07.c
deleted file mode 100644
index cfb7051..0000000
--- a/include/02.vga/vga07.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void next_field()
-{
-    if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
-}
diff --git a/include/02.vga/vga08.c b/include/02.vga/vga08.c
deleted file mode 100644
index 6e1236d..0000000
--- a/include/02.vga/vga08.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void previous_field()
-{
-    if(terminal_column) terminal_column--;
-    else terminal_row--,terminal_column=VGA_WIDTH-1;
-}
diff --git a/include/02.vga/vga09.c b/include/02.vga/vga09.c
deleted file mode 100644
index 71e5b7d..0000000
--- a/include/02.vga/vga09.c
+++ /dev/null
@@ -1,10 +0,0 @@
-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();
-}
diff --git a/include/02.vga/vga10.c b/include/02.vga/vga10.c
deleted file mode 100644
index 8a757f4..0000000
--- a/include/02.vga/vga10.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void terminal_writestring(char* data)
-{
-    for(int i=0;data[i]!='\0';i++) terminal_putchar(data[i]);
-}
diff --git a/include/02.vga/vga11.c b/include/02.vga/vga11.c
deleted file mode 100644
index efe6d3a..0000000
--- a/include/02.vga/vga11.c
+++ /dev/null
@@ -1,6 +0,0 @@
-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;
-}
-- 
cgit v1.2.3