VGA framebuffer & console driver cleanup

- Remove direct malloc from drivers (use only resources)
- Put state in a struct
- Define the number of columns explicitly now

Author: primis

src/arch/x86/hal/console.c

@@ -10,45 +10,24 @@
 #include <sys/resource.h>
 #include <sys/device.h>
 
-// x86 VGA 
+// x86 VGA
 static resource_t vga_resource = {
-  .name = "vga",
-  .flags = RESOURCE_META,
-  .start = 0xA0000,
-  .end   = 0xBFFFF
-};
-
-static resource_t framebuffer = {
-  .name  = "framebuffer",
-  .flags = RESOURCE_MEM
-};
-
-static resource_t attribute_control = {
-  .name  = "attribute_control",
-  .start = 0x3C0,
-  .end   = 0x3C1,
-  .flags = RESOURCE_IO | RESOURCE_IO_INDEXED | RESOURCE_WIDTH_8
-};
-
-static resource_t sequencer = {
-  .name  = "sequencer",
-  .start = 0x3C4,
-  .end   = 0x3C5,
-  .flags = RESOURCE_IO | RESOURCE_IO_INDEXED | RESOURCE_WIDTH_8
+    .name = "vga",
+    .start = 0xA0000,
+    .end   = 0xBFFFF,
+    .flags = RESOURCE_META
 };
 
-static resource_t graphics = {
-  .name  = "graphics",
-  .start = 0x3CE,
-  .end   = 0x3CF,
-  .flags = RESOURCE_IO | RESOURCE_IO_INDEXED | RESOURCE_WIDTH_8
+static resource_t vga_control = {
+    .name  = "control_base",
+    .start = 0x3C0,
+    .end   = 0x3DF,
+    .flags = RESOURCE_IO | RESOURCE_WIDTH_8 | RESOURCE_IO_INDEXED
 };
 
-static resource_t crtc = {
-  .name  = "crtc",
-  .start = 0x3D4,
-  .end   = 0x3D5,
-  .flags = RESOURCE_IO | RESOURCE_IO_INDEXED | RESOURCE_WIDTH_8
+static resource_t vga_framebuffer = {
+    .name  = "framebuffer",
+    .flags = RESOURCE_MEM
 };
 
 static device_t vga_device = {
@@ -58,15 +37,15 @@ static device_t vga_device = {
 
 static device_t vga_console_device = {
     .name = "vga_console",
-    .access = &framebuffer
+    .access = &vga_framebuffer
 };
 
 // x86 COM1
 static resource_t com1 = {
-  .name  = "COM1",
-  .start = 0x3F8,
-  .end   = 0x3FF,
-  .flags = RESOURCE_IO | RESOURCE_WIDTH_8
+    .name  = "COM1",
+    .start = 0x3F8,
+    .end   = 0x3FF,
+    .flags = RESOURCE_IO | RESOURCE_WIDTH_8
 };
 
 static device_t serial_console_device = {
@@ -79,27 +58,25 @@ static int console_init()
     int vgaRet, serialRet;
     // Serial Baudrate
     uint32_t baudrate = 115200;
-    // Bios video mode 3h, 8 tall font, 80 lines of text.
-    uint32_t vga_config[] = {0x3, 8, 80};
+    // Bios video mode 3h, 8 tall font, 50 lines, 80 columns of text.
+    uint32_t vga_config[] = {0x3, 8, 50, 80};
 
     // VGA Console First
     resource_register(&vga_resource, NULL);
-    resource_register(&framebuffer, &vga_resource);
-    resource_register(&attribute_control, &vga_resource);
-    resource_register(&sequencer, &vga_resource);
-    resource_register(&graphics, &vga_resource);
-    resource_register(&crtc, &vga_resource);
+    resource_register(&vga_control, &vga_resource);
+    resource_register(&vga_framebuffer, &vga_resource);
+
     vgaRet  = device_register(&vga_device, base_device(), "display/vga");
     vgaRet |= device_register(&vga_console_device, &vga_device, "console/vga");
     vgaRet |= device_init(&vga_device, &vga_config);
     vgaRet |= device_init(&vga_console_device, &vga_config[2]);
 
     // Serial Console Next
     resource_register(&com1, NULL);
-    serialRet = device_register(&serial_console_device, base_device(), 
+    serialRet = device_register(&serial_console_device, base_device(),
         "console/serial/16550");
     serialRet |= device_init(&serial_console_device, &baudrate);
-    
+
     // If either console succeeds, we succeed
     return (vgaRet && serialRet);
 }

src/core/main.c

@@ -187,9 +187,9 @@ static void log_status(int status, const char *name, const char *text) {
         return; // No logging enabled
     }
     if (status == 0) {
-        printf("[\033[32m OK \033[0m] ");
+        printf("[\033[32m  OK  \033[0m] ");
     } else {
-        printf("[\033[31mFAIL\033[0m] ");
+        printf("[\033[31mFAILED\033[0m] ");
     }
     printf("%s %s\n", text, name);
 #ifdef HOSTED

src/drivers/console/include/vga.h

@@ -19,4 +19,25 @@
 #define VGA_C_LIGHTBROWN     14
 #define VGA_C_WHITE          15
 
+#define DEFAULT_BG_COLOR VGA_C_BLUE
+#define DEFAULT_FG_COLOR VGA_C_LIGHTGRAY
+
+typedef struct {
+    char     escape_buf[4];
+    int      escape_buf_idx;
+    int      escape_nums[4];
+    int      escape_num_idx;
+    uint8_t  cursor_y;
+    uint8_t  cursor_x;
+
+    device_t   *dev;
+    resource_t *framebuffer;
+    uint16_t    max_rows;
+    uint16_t    max_cols;
+    int         bg_color;
+    int         fg_color;
+    int         bold;
+    int         in_escape;
+} vga_console_state_t;
+
 #endif