From 39822cdb0acdd1eec66c2e18e0711fd3cd6f033d Mon Sep 17 00:00:00 2001
From: Aleksa Vučković <aleksav013@gmail.com>
Date: Mon, 25 Oct 2021 22:41:21 +0200
Subject: Adding first 32 IRQs; PIT finally working

---
 src/c/vga.c | 43 ++++++++-----------------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

(limited to 'src/c/vga.c')

diff --git a/src/c/vga.c b/src/c/vga.c
index 07dec60..8c1824b 100644
--- a/src/c/vga.c
+++ b/src/c/vga.c
@@ -1,33 +1,16 @@
 #include"../include/types.h"
 #include"../include/string.h"
 #include"../include/asm.h"
+#include"../include/vga.h"
 
-static const size_t VGA_WIDTH = 80;
-static const size_t VGA_HEIGHT = 25;
-
-
-enum vga_color {
-    VGA_COLOR_BLACK = 0,
-    VGA_COLOR_BLUE = 1,
-    VGA_COLOR_GREEN = 2,
-    VGA_COLOR_CYAN = 3,
-    VGA_COLOR_RED = 4,
-    VGA_COLOR_MAGENTA = 5,
-    VGA_COLOR_BROWN = 6,
-    VGA_COLOR_LIGHT_GREY = 7,
-    VGA_COLOR_DARK_GREY = 8,
-    VGA_COLOR_LIGHT_BLUE = 9,
-    VGA_COLOR_LIGHT_GREEN = 10,
-    VGA_COLOR_LIGHT_CYAN = 11,
-    VGA_COLOR_LIGHT_RED = 12,
-    VGA_COLOR_LIGHT_MAGENTA = 13,
-    VGA_COLOR_LIGHT_BROWN = 14,
-    VGA_COLOR_WHITE = 15,
-};
+size_t terminal_row;
+size_t terminal_column;
+uint8_t terminal_color;
+uint16_t* terminal_buffer;
 
-static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
+void set_color(enum vga_color fg, enum vga_color bg)
 {
-    return fg | bg << 4;
+    terminal_color = fg | bg << 4;
 }
  
 static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
@@ -35,16 +18,11 @@ static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
     return (uint16_t) uc | (uint16_t) color << 8;
 }
  
-size_t terminal_row;
-size_t terminal_column;
-uint8_t terminal_color;
-uint16_t* terminal_buffer;
- 
 void terminal_initialize()
 {
     terminal_row=0;
     terminal_column=0;
-    terminal_color=vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
+    set_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
     terminal_buffer=(uint16_t*) 0xB8000;
     for(size_t y=0;y<VGA_HEIGHT;y++)
     {
@@ -113,11 +91,6 @@ void terminal_writefloat(double num)
     terminal_writestring(str);
 }
 
-void prompt()
-{
-    terminal_writestring("[user@myos] > ");
-}
-
 void clear()
 {
     for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++) terminal_putchar(' ');
-- 
cgit v1.2.3