From 8d1879fe97ffabcdb90d476503f1189ef7934267 Mon Sep 17 00:00:00 2001
From: shockrahwow <alejandros714@protonmail.com>
Date: Mon, 25 Feb 2019 15:36:31 -0800
Subject: [PATCH] - Retesting framebuffer drivers - clear_fb() fully working -
 trying to add positional buffer writes for fancy output - POSITION macro only
 seems to work for (0,0) coords for now haven't tested other edge cases yet

---
 framebuffer.c | 25 +++++++++++++++++--------
 framebuffer.h |  9 ++++++---
 loader.asm    |  5 ++---
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/framebuffer.c b/framebuffer.c
index 8bca41e..8e2c2b7 100644
--- a/framebuffer.c
+++ b/framebuffer.c
@@ -9,27 +9,36 @@
 
 static char* Frame_Buffer = (char*)FRAME_BUFFER_ADDR;
 static char* Frame_Buffer_End = (char*)(FRAME_BUFFER_ADDR + AREA);
+
 // Writes character to a given cell in the framebuffer
     // @cell parameter is the logical (linear)index into the buffer
 	// _not_ the actual offset from the buffer addr
 	// also proper location is caller's responsibility
-void writech_fb(unsigned cell, char c, char fg, char bg) {
+void write_cell_fb(unsigned cell, char c, char fg, char bg) {
     Frame_Buffer[cell] = c;
     Frame_Buffer[cell+1] = (fg & 0x0f << 4) | (bg & 0x0f);
 }
 
 /* this probably doesn't belong here */
-void print_fb(char* str) {
-	for(unsigned i =0;i<strlen(str);i++) {
-		writech_fb(FRAME_CELL(i), str[i], Green, White);
+void print_fb(char* str, unsigned row, unsigned col)  {
+	// now we can write things to our buffer
+	for(unsigned i =POSITION(row,col);i<strlen(str);i++) {
+		write_cell_fb(FRAME_CELL(i), str[i], Green, White);
 	}
 }
 
-/* moving the cursor to our given position */
-void cursor_adjust() {
-	// TODO: c ipmle
+void clear_fb() {
+	char* cell;
+	unsigned idx = Frame_Buffer_End - Frame_Buffer;
+	
+	for(cell=Frame_Buffer;cell != Frame_Buffer_End; cell+=2) {
+		idx = Frame_Buffer_End - cell;
+		write_cell_fb(idx, ' ', 0x00, 0x00);
+	}
 }
 /* generic test func for this module */
 void test_fb() {
-	print_fb("adsf");
+	clear_fb();
+	//print_fb("Helo from the frame buffer", 0, 0);
+	print_fb("adsf", 2, 2);
 }
diff --git a/framebuffer.h b/framebuffer.h
index ba53914..c026aa0 100644
--- a/framebuffer.h
+++ b/framebuffer.h
@@ -1,8 +1,9 @@
 #include "stl/string.h"
+
 #define COLUMNS 80
 #define ROWS 25
 #define AREA ( COLUMNS * ROWS )
-
+#define POSITION(ROW, COL) ( (ROW * COLUMNS) + COL )
 
 // address of our frame buffer
 #define FRAME_BUFFER_ADDR 0x000B8000
@@ -28,9 +29,11 @@
 #define LightBrown 0x0e
 #define White 0x0f
 
-void writech_fb(unsigned cell, char c , char fg, char bg);
+void write_cell_fb(unsigned cell, char c , char fg, char bg);
 
-void print_fb(char* str);
+void print_fb(char* str, unsigned row, unsigned col);
+
+void clear_fb();
 
 /* Testing function because yote squad in here yeye */
 void test_fb();
diff --git a/loader.asm b/loader.asm
index 9ad642c..c5c537d 100644
--- a/loader.asm
+++ b/loader.asm
@@ -9,10 +9,9 @@ CHECKSUM 		equ -MAGIC_NUMBER
 
 ; size in bytes of stack 
 KERNEL_STACK_SIZE	equ 4096
-
+extern test_fb
 
 ; external labels(cdecl) calling convention
-extern test
 
 section .text
 ; align all instructions to 4 byte boundary by the x86 instruction set law
@@ -23,7 +22,7 @@ align 4
 	dd CHECKSUM
 
 loader:
-	call test
+	call test_fb
 
 .loop:
 	jmp .loop