From 6e8fd8c61a77e4eb08d859f8e0fc42226cc4c7f3 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 25 Jul 2020 17:41:54 +0200
Subject: Added very basic PSF parser

Version 1 works; Version 2 not so much
---
 src/drivers/vesa.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/vesa.c b/src/drivers/vesa.c
index 54e7e34..6bafd9e 100644
--- a/src/drivers/vesa.c
+++ b/src/drivers/vesa.c
@@ -1,12 +1,8 @@
 #include <def.h>
 #include <vesa.h>
 
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u8 color[3])
+void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3])
 {
-	int vbe_bpl = vbe->bpp >> 3;
-	int vbe_pitch = vbe->pitch;
-	u8 *fb = (u8 *)vbe->framebuffer;
-
 	int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
 	u8 *draw = &fb[pos1];
 	for (int i = 0; i <= y2 - y1; i++) {
@@ -19,7 +15,24 @@ void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u8 color[3])
 	}
 }
 
-void vesa_fill(const u8 color[3])
+void vesa_set_pixel(u16 x, u16 y, const u32 color[3])
+{
+	u8 pos = x * vbe_bpl + y * vbe_pitch;
+	u8 *draw = &fb[pos];
+	draw[pos] = (char)color[2];
+	draw[pos + 1] = (char)color[1];
+	draw[pos + 2] = (char)color[0];
+}
+
+void vesa_fill(const u32 color[3])
 {
 	vesa_draw_rectangle(0, 0, vbe->width - 1, vbe->height - 1, color);
 }
+
+void vesa_init(struct vbe *info)
+{
+	vbe = info;
+	vbe_bpl = vbe->bpp >> 3;
+	vbe_pitch = vbe->pitch;
+	fb = (u8 *)vbe->framebuffer;
+}
-- 
cgit v1.2.3