Create vesa.h

Add header for the base VLB VBE VESA driver

.clang-format

@@ -0,0 +1,24 @@
+BasedOnStyle: Google
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ColumnLimit: 80
+
+DerivePointerAlignment: false
+PointerAlignment: Right
+ReferenceAlignment: Right
+
+AlignConsecutiveMacros: Consecutive
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Std headers
+  - Regex: '<[[:alnum:]_.]+>'
+    Priority: 2
+
+  # Other headers
+  - Regex: '.*'
+    Priority: 1

.clangd

@@ -0,0 +1,6 @@
+CompileFlags:
+  CompilationDatabase: build
+
+Diagnostics:
+  UnusedIncludes: Strict
+  MissingIncludes: Strict

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 8
+tab_width = 8

Makefile

@@ -18,9 +18,9 @@ KERNEL_OBJ += $(patsubst kernel/%.asm, $(BUILD_DIR)/asm_%.o, $(KERNEL_ASM_SRC))
 KLIBC_SRC = $(wildcard klibc/src/*.c)
 KLIBC_OBJ = $(patsubst klibc/src/%.c, $(BUILD_DIR)/klibc/%.o, $(KLIBC_SRC))
 
+.PHONY: all stage1 stage2 kernel compile-commands $(BUILD_DIR)/compile_commands.json run gdb clean clean-cross clean-all
 all: $(DISK_IMG)
 
-.PHONY: stage1 stage2 kernel run gdb clean
 stage1: $(BUILD_DIR)
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/$@.o bootloader/$@.asm
 	$(LD) -Ttext=0x7c00 -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.o
@@ -57,6 +57,10 @@ $(BUILD_DIR):
 	mkdir -p $@
 	mkdir -p $(BUILD_DIR)/klibc
 
+compile-commands: $(BUILD_DIR)/compile_commands.json
+$(BUILD_DIR)/compile_commands.json: $(BUILD_DIR)
+	bear --output $@ -- make -B
+
 run:
 	qemu-system-i386 -s -S $(DISK_IMG)
 

kernel/hid.c

@@ -1,66 +0,0 @@
-#include "hid.h"
-#include "usb.h"
-#include "mouse.h"
-#include "keyboard.h"
-#include "print.h"
-#include <stdint.h>
-#include <stdbool.h>
-
-// Global variables
-static bool hid_initialized = false;
-
-void hid_init(void) {
-    if (hid_initialized) return;
-    hid_initialized = true;
-
-    // Initialize keyboard and mouse HID handling
-    keyboard_init();
-    // Assume USB mouse has been initialized and is connected.
-    usb_hid_init(); // Initializes USB HID for both keyboard and mouse
-}
-
-void hid_process_report(uint8_t* report, uint8_t length) {
-    // Process the HID report based on its type
-    if (length == 8) {  // Assuming a standard 8-byte report for HID keyboard
-        keyboard_hid_report_t* k_report = (keyboard_hid_report_t*) report;
-        hid_process_keyboard_report(k_report);
-    } else if (length == 3) {  // Assuming a standard 3-byte report for HID mouse
-        mouse_hid_report_t* m_report = (mouse_hid_report_t*) report;
-        hid_process_mouse_report(m_report);
-    }
-}
-
-// Handle HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report) {
-    // Iterate over the keycodes and process key presses
-    for (int i = 0; i < 6; i++) {
-        uint8_t keycode = report->keycodes[i];
-        if (keycode != 0) {
-            char key = scancode_map[keycode];
-            if (key) {
-                keyboard_buffer_add(key);
-            }
-        }
-    }
-}
-
-// Handle HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report) {
-    // Process mouse movement and button clicks
-    mouse_data.x += report->x;
-    mouse_data.y += report->y;
-    mouse_data.left_button = (report->buttons & 0x01) != 0;
-    mouse_data.right_button = (report->buttons & 0x02) != 0;
-    
-    // Print mouse movement for debugging
-    print_hex(mouse_data.x, 1, 1);
-    print_hex(mouse_data.y, 1, 1);
-    print_hex(report->buttons, 1, 1);
-}
-
-// Parse the HID descriptor (for parsing USB HID device descriptors)
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length) {
-    // HID descriptors are defined in the USB HID specification, we'll need to parse them here.
-    // For now, just return true assuming we have a valid descriptor.
-    return true;
-}

kernel/hid.h

@@ -1,46 +0,0 @@
-#ifndef HID_H
-#define HID_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-// HID Report types
-#define HID_REPORT_INPUT  0x01
-#define HID_REPORT_OUTPUT 0x02
-#define HID_REPORT_FEATURE 0x03
-
-// HID usage page constants (USB HID)
-#define HID_USAGE_PAGE_GENERIC 0x01
-#define HID_USAGE_KEYBOARD 0x06
-#define HID_USAGE_MOUSE 0x02
-
-// HID keyboard and mouse data
-typedef struct {
-    uint8_t modifier;    // Modifier keys (shift, ctrl, alt, etc.)
-    uint8_t reserved;    // Reserved byte
-    uint8_t keycodes[6]; // Keycodes for keys pressed
-} keyboard_hid_report_t;
-
-typedef struct {
-    uint8_t buttons;     // Mouse buttons (bitwise: 0x01 = left, 0x02 = right, 0x04 = middle)
-    int8_t x;            // X axis movement
-    int8_t y;            // Y axis movement
-    int8_t wheel;        // Mouse wheel
-} mouse_hid_report_t;
-
-// Initialize the HID subsystem
-void hid_init(void);
-
-// Process an incoming HID report
-void hid_process_report(uint8_t* report, uint8_t length);
-
-// Process HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report);
-
-// Process HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report);
-
-// USB HID report descriptor parsing
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length);
-
-#endif // HID_H

kernel/vesa.c

@@ -0,0 +1,98 @@
+#include "vesa.h"
+#include "io.h"
+#include "print.h"
+
+// VESA mode and controller information
+#define VESA_BIOS_INT 0x10
+#define VESA_BIOS_FUNC 0x4F
+
+// Function to call BIOS with specific VESA function
+static bool vesa_bios_call(uint16_t function, uint16_t* eax, uint32_t* ebx, uint32_t* ecx, uint32_t* edx) {
+    // Set up registers for VESA function call
+    __asm__ __volatile__(
+        "movw %1, %%ax\n"           // Move function number into AX
+        "int $0x10\n"                // Call BIOS interrupt 0x10 (VESA)
+        "movw %%ax, %0\n"            // Move return value in AX to the return variable
+        : "=m"(*eax)                 // Output operand (eax)
+        : "m"(function)              // Input operand (function number)
+        : "%eax", "%ebx", "%ecx", "%edx", "memory"
+    );
+    // Check for success (return values vary depending on the function)
+    return *eax == 0x004F;
+}
+
+// Set the VESA video mode
+bool vesa_set_mode(uint16_t mode) {
+    uint16_t eax = VBE_FUNCTION_SET_MODE;
+    uint32_t ebx = mode;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+    
+    if (vesa_bios_call(VBE_FUNCTION_SET_MODE, &eax, &ebx, &ecx, &edx)) {
+        return true;
+    }
+    return false;
+}
+
+// Get the VESA mode information
+bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info) {
+    uint16_t eax = VBE_FUNCTION_GET_MODE_INFO;
+    uint32_t ebx = mode;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+
+    if (vesa_bios_call(VBE_FUNCTION_GET_MODE_INFO, &eax, &ebx, &ecx, &edx)) {
+        // Copy the information into the provided struct
+        uint32_t base = (uint32_t)info;
+        __asm__ __volatile__(
+            "movw %%bx, %%es:%%di\n"
+            : 
+            : "b" (base)
+            : "%es", "%di", "memory"
+        );
+        return true;
+    }
+    return false;
+}
+
+// Get the VESA controller information
+bool vesa_get_controller_info(vbe_controller_info_t* info) {
+    uint16_t eax = VBE_FUNCTION_GET_CONTROLLER_INFO;
+    uint32_t ebx = 0;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+
+    if (vesa_bios_call(VBE_FUNCTION_GET_CONTROLLER_INFO, &eax, &ebx, &ecx, &edx)) {
+        // Copy controller information into the provided struct
+        uint32_t base = (uint32_t)info;
+        __asm__ __volatile__(
+            "movw %%bx, %%es:%%di\n"
+            : 
+            : "b" (base)
+            : "%es", "%di", "memory"
+        );
+        return true;
+    }
+    return false;
+}
+
+// Return pointer to the VESA framebuffer
+void* vesa_get_framebuffer(void) {
+    vbe_mode_info_t mode_info;
+    if (vesa_get_mode_info(0x101, &mode_info)) {
+        return (void*)mode_info.PhysBasePtr;
+    }
+    return NULL;
+}
+
+// Clear the screen with a color
+void vesa_clear_screen(uint32_t color) {
+    uint32_t* framebuffer = (uint32_t*)vesa_get_framebuffer();
+    if (framebuffer) {
+        for (int y = 0; y < 480; y++) { // For 640x480 mode
+            for (int x = 0; x < 640; x++) {
+                framebuffer[y * 640 + x] = color;
+            }
+        }
+    }
+}

kernel/vesa.h

@@ -0,0 +1,67 @@
+#ifndef VESA_H
+#define VESA_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+// VESA BIOS Extension 2.0 Function Calls
+#define VBE_FUNCTION_SET_MODE        0x4F02
+#define VBE_FUNCTION_GET_MODE_INFO   0x4F01
+#define VBE_FUNCTION_GET_CONTROLLER_INFO 0x4F00
+#define VBE_FUNCTION_SET_DISPLAY_START 0x4F05
+
+// VESA Mode Information Structure (VBE 2.0)
+typedef struct {
+    uint16_t ModeAttributes;      // Mode attributes
+    uint8_t WinAAttributes;       // Window A attributes
+    uint8_t WinBAttributes;       // Window B attributes
+    uint16_t WinGranularity;      // Window granularity
+    uint16_t WinSize;             // Window size
+    uint16_t WinASegment;         // Window A segment address
+    uint16_t WinBSegment;         // Window B segment address
+    uint32_t WinFuncPtr;          // Function pointer for window
+    uint16_t BytesPerScanLine;    // Bytes per scanline
+    uint16_t XResolution;         // Horizontal resolution in pixels
+    uint16_t YResolution;         // Vertical resolution in pixels
+    uint8_t XCharSize;            // Character cell width
+    uint8_t YCharSize;            // Character cell height
+    uint8_t NumberOfPlanes;       // Number of memory planes
+    uint8_t BitsPerPixel;         // Bits per pixel
+    uint8_t NumberOfBanks;        // Number of banks
+    uint8_t MemoryModel;          // Memory model type
+    uint8_t BankSize;             // Bank size in kB
+    uint8_t NumberOfImagePages;   // Number of image pages
+    uint8_t Reserved0;            // Reserved
+    uint8_t RedMaskSize;          // Red mask size
+    uint8_t RedFieldPosition;     // Red field position
+    uint8_t GreenMaskSize;        // Green mask size
+    uint8_t GreenFieldPosition;   // Green field position
+    uint8_t BlueMaskSize;         // Blue mask size
+    uint8_t BlueFieldPosition;    // Blue field position
+    uint8_t RsvdMaskSize;         // Reserved mask size
+    uint8_t RsvdFieldPosition;    // Reserved field position
+    uint8_t DirectColorModeInfo;  // Direct color mode info
+    uint32_t PhysBasePtr;         // Physical base address of the linear framebuffer
+    uint32_t OffScreenMemOff;     // Offset to off-screen memory
+    uint16_t OffScreenMemSize;    // Size of off-screen memory
+    uint8_t Reserved1[206];       // Reserved
+} __attribute__((packed)) vbe_mode_info_t;
+
+// VESA Controller Information
+typedef struct {
+    uint8_t VESAVersion[2];       // VESA version
+    uint32_t OEMStringPtr;        // Pointer to OEM string
+    uint8_t Capabilities[4];      // Capabilities of the controller
+    uint32_t VideoModePtr;        // Pointer to supported video modes
+    uint16_t TotalMemory;         // Total video memory (in 64KB)
+    uint8_t Reserved[4];          // Reserved
+} __attribute__((packed)) vbe_controller_info_t;
+
+// Function Prototypes
+bool vesa_set_mode(uint16_t mode);
+bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info);
+bool vesa_get_controller_info(vbe_controller_info_t* info);
+void* vesa_get_framebuffer(void);
+void vesa_clear_screen(uint32_t color);
+
+#endif // VESA_H