From 570b566310ffcff3c24983cffc4e13f25a0fdcff Mon Sep 17 00:00:00 2001 From: Able Date: Tue, 17 Sep 2024 10:02:43 -0500 Subject: [PATCH] svga device struct updated to mostly reflect real device --- sysdata/programs/svga_driver/src/device.hb | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/sysdata/programs/svga_driver/src/device.hb b/sysdata/programs/svga_driver/src/device.hb index dd697e9..11e3bb8 100644 --- a/sysdata/programs/svga_driver/src/device.hb +++ b/sysdata/programs/svga_driver/src/device.hb @@ -1,6 +1,29 @@ pci := @use("../../../libraries/pci/src/lib.hb"); .{PCIAddress} := pci +FIFO := struct { + reserved_size: u32, + using_bounce_buffer: u8, + bounce_buffer: [u8; 1024 * 1024], + next_fence: u32, +} +new_fifo := fn(): FIFO { + bounce_buffer := @as([u8; 1024 * 1024], idk) + return FIFO.(0, 0, bounce_buffer, 0) +} + +IRQ := struct { + pending: u32, + switchContext: u32, + //IntrContext oldContext; + //IntrContext newContext; + count: u32, +} + +new_irq := fn(): IRQ { + return IRQ.(0, 0, 0) +} + SVGADevice := struct { pciAddr: PCIAddress, ioBase: u32, @@ -15,27 +38,13 @@ SVGADevice := struct { height: int, bpp: int, pitch: int, + fifo: FIFO, + irq: IRQ, } svga_device := fn(): SVGADevice { pci_addr := PCIAddress.(0, 0, 0) - - return SVGADevice.(pci_addr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -} - -/* - struct { - uint32 reservedSize; - Bool usingBounceBuffer; - uint8 bounceBuffer[1024 * 1024]; - uint32 nextFence; - } fifo; - - volatile struct { - uint32 pending; - uint32 switchContext; - IntrContext oldContext; - IntrContext newContext; - uint32 count; - } irq; -*/ \ No newline at end of file + fifo := new_fifo() + irq := new_irq() + return SVGADevice.(pci_addr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, fifo, irq) +} \ No newline at end of file