console vga stuff

kernel/drivers/console/console.c

@@ -0,0 +1,49 @@
+#include <drivers/console/console.h>
+
+#include <lib/font.h>
+#include <drivers/vga/vga.h>
+
+static psf_font_t* font;
+
+static uint32_t console_row;
+static uint32_t console_col;
+static uint32_t console_text_color;
+static uint32_t console_backgrnd_color;
+
+static void write_vga_char(int row, int col, char c) {
+    uint32_t vga_pitch = vga_get_pitch();
+    uint8_t* glyph = (uint8_t*)font->glyphs + (c * font->hdr->charsz);
+
+    for (uint32_t y = 0; y < font->hdr->charsz; y++) {
+        uint8_t bits = glyph[y];
+        uint32_t* row = (uint32_t*)((uintptr_t)VGA_FRAMEBUFFER + ((console_row + y) * vga_pitch));
+        for (int x = 0; x < 8; x++) {
+            if (bits & (0b10000000 >> x)) {
+                row[console_col + x] = console_text_color;
+            }
+        }
+    }
+}
+
+void set_console_font(const char* path) {
+    font = load_font(path);
+}
+
+void set_console_fg(uint32_t color) {
+    console_text_color = color;
+}
+
+void set_console_bg(uint32_t color) {
+    console_backgrnd_color = color;
+}
+
+void console_init() {
+    console_row = 0;
+    console_col = 0;
+    set_console_fg(0xFFFFFFFF);
+    set_console_bg(0x00000000);
+}
+
+void console_putchar(char c) {
+    
+}

kernel/drivers/console/console.h

@@ -0,0 +1,13 @@
+#ifndef D_CONSOLE_H
+#define D_CONSOLE_H
+
+#include <lib/font.h>
+
+void console_putchar(char c);
+
+void set_console_font(const char* path);
+void set_console_fg(uint32_t color);
+void set_console_bg(uint32_t color);
+void console_init();
+
+#endif

kernel/drivers/serial/serial.c

@@ -0,0 +1,37 @@
+#include <drivers/serial/serial.h>
+#include <common.h>
+
+#define COM1 0x3F8
+
+int is_transmit_empty() {
+    return inb(COM1 + 5) & 0x20;
+}
+
+void write_serial(char a) {
+    while (is_transmit_empty() == 0);
+    outb(COM1, a);
+}
+
+void print_serial(const char* str) {
+    for (int i = 0; str[i] != '\0'; i++) {
+        write_serial(str[i]);
+    }
+}
+
+void print_serial_hex(uint32_t val) {
+    char hex_chars[] = "0123456789ABCDEF";
+    print_serial("0x");
+    for (int i = 28; i >= 0; i -= 4) {
+        write_serial(hex_chars[(val >> i) & 0x0F]);
+    }
+}
+
+void init_serial() {
+  outb(COM1 + 1, 0x00);    // Disable all interrupts
+  outb(COM1 + 3, 0x80);    // Enable DLAB (set baud rate divisor)
+  outb(COM1 + 0, 0x01);    // Set divisor to 1 (lo byte) -> 115200 baud
+  outb(COM1 + 1, 0x00);    //                  (hi byte)
+  outb(COM1 + 3, 0x03);    // 8 bits, no parity, one stop bit
+  outb(COM1 + 2, 0xC7);    // Enable FIFO, clear them, with 14-byte threshold
+  outb(COM1 + 4, 0x0B);    // IRQs enabled, RTS/DSR set
+}

kernel/drivers/serial/serial.h

@@ -0,0 +1,12 @@
+#ifndef D_SERIAL_H
+#define D_SERIAL_H
+
+#include <stdint.h>
+
+void init_serial();
+void print_serial_hex(uint32_t val);
+void print_serial(const char* str);
+void write_serial(char a);
+int is_transmit_empty();
+
+#endif

kernel/drivers/vga/vga.c

@@ -6,6 +6,7 @@
 #include <drivers/vga/vga.h>
 
 #include <common.h>
+#include <memory/mm.h>
 
 static uint32_t framebuffer_address;
 static uint32_t framebuffer_width;
@@ -14,76 +15,51 @@ static uint32_t framebuffer_total_pixels;
 static uint32_t framebuffer_pitch;
 static uint32_t framebuffer_bpp;
 
-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,
-};
-
 void vga_init(
-	uint32_t fb_vaddr,
+	uint32_t fb_paddr,
 	uint32_t fb_width,
 	uint32_t fb_height,
 	uint32_t fb_pitch,
 	uint8_t fb_bpp
 ) {
-	framebuffer_address = fb_vaddr;
+	uint32_t fb_size_bytes = fb_height * fb_pitch;
+	uint32_t num_pages = (fb_size_bytes + 4095) / 4096; 
+	for (uint32_t i = 0; i < num_pages; i++) {
+		uint32_t phys_addr = fb_paddr + (i * 4096);
+		uint32_t virt_addr = VGA_FRAMEBUFFER + (i * 4096);
+		map_page(virt_addr, phys_addr, PAGE_PRESENT | PAGE_WRITABLE);
+	}
+
+	framebuffer_address = VGA_FRAMEBUFFER;
 	framebuffer_width = fb_width;
 	framebuffer_height = fb_height;
 	framebuffer_pitch = fb_pitch;
 	framebuffer_bpp = fb_bpp;
-
 	framebuffer_total_pixels = framebuffer_width * framebuffer_height;
 
-	vga_clear_scrn(0xFFFFFFFF);
+	vga_clear_scrn(0x000000FF);
+}
+
+uint32_t vga_get_pitch() {
+	return framebuffer_pitch;
 }
 
 void vga_clear_scrn(uint32_t color) {
 	if (framebuffer_address == 0) return;
 
-	// Completely ignore the framebuffer address for a split second.
-    // Let's force raw ASCII text into the legacy VGA text console area.
-    uint16_t* text_mode_buffer = (uint16_t*)0xB8000;
-    
-    // Fill the screen with 'A' characters on a red background
-    for (int i = 0; i < 80 * 25; i++) {
-        text_mode_buffer[i] = (0x4F << 8) | 'A'; 
+	for (uint32_t y = 0; y < framebuffer_height; y++) {
+        uint32_t* row = (uint32_t*)((uintptr_t)framebuffer_address + (y * framebuffer_pitch));
+        for (uint32_t x = 0; x < framebuffer_width; x++) {
+            row[x] = color;
+        }
     }
 }
 
-void vga_putchar(char c) {
-	if (c == '\n') {
-		return;
-	}
+void vga_drawchar(char c, int x, int y, psf_font_t* font) {
 
-	if (c == '\t') {
-		for (int i = 0; i < 4; i++) {
-			vga_putchar(' ');
-		}
-		return;
-	}
-}
-
-uint32_t vga_seek(vfs_node_t* node, uint32_t offset, int whence) {
-	return 0;
 }
 
 uint32_t vga_write(vfs_node_t* node, uint32_t offset, uint32_t size, uint8_t* buf) {
-	for (uint32_t i = 0; i < size; i++) {
-		vga_putchar((char)buf[i]);
-	}
+	// probably just memcpy here
 	return size;
 }

kernel/drivers/vga/vga.h

@@ -2,19 +2,42 @@
 #define DVGA_H
 
 #include <vfs.h>
+#include <lib/font.h>
+
+#define VGA_FRAMEBUFFER 0xFF700000
+
+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,
+};
 
 void vga_init(
-	uint32_t fb_vaddr,
+	uint32_t fb_paddr,
 	uint32_t fb_width,
 	uint32_t fb_height,
 	uint32_t fb_pitch,
 	uint8_t fb_bpp
 );
 
+uint32_t vga_get_pitch();
+
 void vga_clear_scrn(uint32_t color);
-void vga_putchar(char c);
+void vga_drawchar(char c, int x, int y, psf_font_t* font);
 
 uint32_t vga_write(vfs_node_t* node, uint32_t offset, uint32_t size, uint8_t* buf);
-uint32_t vga_seek(vfs_node_t* node, uint32_t offset, int whence);
 
 #endif