4 files changed, 66 insertions, 3 deletions
diff --git a/sys/dev/acpi/uacpi.c b/sys/dev/acpi/uacpi.c
index 03d0ecf..612f23b 100644
--- a/sys/dev/acpi/uacpi.c
+++ b/sys/dev/acpi/uacpi.c
@@ -513,9 +513,18 @@ uacpi_u64
 uacpi_kernel_get_nanoseconds_since_boot(void)
 {
     static uacpi_u64 time = 0;
+    static struct timer tmr = {0};
+    tmrr_status_t tmr_error;
+
+    if (time == 0) {
+        tmr_error = req_timer(TIMER_GP, &tmr);
+        if (tmr_error != TMRR_SUCCESS) {
+            time += 1000000;
+            return time;
+        }
+    }
 
-    /* TODO */
-    time += 1000000;
+    time = tmr.get_time_nsec();
     return time;
 }
 
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c
index d07acd7..905149e 100644
--- a/sys/dev/ic/ahci.c
+++ b/sys/dev/ic/ahci.c
@@ -1018,4 +1018,4 @@ static struct bdevsw ahci_bdevsw = {
     .bsize = ahci_dev_bsize
 };
 
-DRIVER_EXPORT(ahci_init);
+DRIVER_DEFER(ahci_init);
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 9ab109a..5276eea 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -37,6 +37,7 @@
 #include <dev/usb/xhciregs.h>
 #include <dev/usb/xhcivar.h>
 #include <dev/pci/pci.h>
+#include <dev/pci/pciregs.h>
 #include <dev/acpi/acpi.h>
 #include <vm/physmem.h>
 #include <vm/dynalloc.h>
@@ -496,6 +497,16 @@ xhci_init_hc(struct xhci_hc *hc)
     return 0;
 }
 
+static void
+xhci_init_pci(void)
+{
+    uint32_t tmp;
+
+    tmp = pci_readl(hci_dev, PCIREG_CMDSTATUS);
+    tmp |= (PCI_BUS_MASTERING | PCI_MEM_SPACE);
+    pci_writel(hci_dev, PCIREG_CMDSTATUS, tmp);
+}
+
 static int
 xhci_init(void)
 {
@@ -528,6 +539,7 @@ xhci_init(void)
         return -ENODEV;
     }
 
+    xhci_init_pci();
     return xhci_init_hc(&xhc);
 }
 
diff --git a/sys/dev/video/fbdev.c b/sys/dev/video/fbdev.c
index f21c769..391400c 100644
--- a/sys/dev/video/fbdev.c
+++ b/sys/dev/video/fbdev.c
@@ -29,16 +29,35 @@
 
 #include <sys/types.h>
 #include <sys/limine.h>
+#include <sys/device.h>
+#include <sys/driver.h>
 #include <dev/video/fbdev.h>
+#include <fs/devfs.h>
+#include <vm/vm.h>
 
 #define FRAMEBUFFER \
         framebuffer_req.response->framebuffers[0]
 
+static struct cdevsw fb_cdevsw;
 static volatile struct limine_framebuffer_request framebuffer_req = {
     .id = LIMINE_FRAMEBUFFER_REQUEST,
     .revision = 0
 };
 
+static paddr_t
+fbdev_mmap(dev_t dev, off_t off, int flags)
+{
+    size_t max_bounds;
+
+    max_bounds = FRAMEBUFFER->pitch * FRAMEBUFFER->height;
+    max_bounds /= 4;
+    if (off > max_bounds) {
+        return 0;
+    }
+
+    return VIRT_TO_PHYS(FRAMEBUFFER->address);
+}
+
 struct fbdev
 fbdev_get(void)
 {
@@ -51,3 +70,26 @@ fbdev_get(void)
     ret.bpp = FRAMEBUFFER->bpp;
     return ret;
 }
+
+static int
+fbdev_init(void)
+{
+    char devname[] = "fb0";
+    devmajor_t major;
+    dev_t dev;
+
+    /* Register the device here */
+    major = dev_alloc_major();
+    dev = dev_alloc(major);
+    dev_register(major, dev, &fb_cdevsw);
+    devfs_create_entry(devname, major, dev, 0444);
+    return 0;
+}
+
+static struct cdevsw fb_cdevsw = {
+    .read = noread,
+    .write = nowrite,
+    .mmap = fbdev_mmap
+};
+
+DRIVER_EXPORT(fbdev_init);