From 03035c98b4ba3297b837e96080e78e0aac1e86db Mon Sep 17 00:00:00 2001
From: Aleksa Vučković <aleksav013@gmail.com>
Date: Mon, 31 Jan 2022 11:16:38 +0100
Subject: Promene

---
 include/02.vga/vga.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'include/02.vga/vga.c')

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;
 }
-- 
cgit v1.2.3