2 files changed, 101 insertions, 2 deletions

diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 9ab109a..2b55f16 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>
@@ -175,6 +176,7 @@ xhci_init_scratchpads(struct xhci_hc *hc)
     struct xhci_caps *caps = XHCI_CAPS(hc->base);
     uint16_t max_bufs_lo, max_bufs_hi;
     uint16_t max_bufs;
+    uint32_t npages;
     uintptr_t *bufarr, tmp;
 
     max_bufs_lo = XHCI_MAX_SP_LO(caps->hcsparams1);
@@ -188,8 +190,9 @@ xhci_init_scratchpads(struct xhci_hc *hc)
         return 0;
     }
 
-    pr_trace("using %d pages for xHC scratchpads\n");
-    bufarr = dynalloc_memalign(sizeof(uintptr_t)*max_bufs, 0x1000);
+    npages = (sizeof(uint64_t) * max_bufs) / DEFAULT_PAGESIZE;
+    pr_trace("using %d pages for xHC scratchpads\n", npages);
+    bufarr = dynalloc_memalign(npages * DEFAULT_PAGESIZE, 0x1000);
     if (bufarr == NULL) {
         pr_error("failed to allocate scratchpad buffer array\n");
         return -1;
@@ -496,6 +499,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 +541,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..8a2499d 100644
--- a/sys/dev/video/fbdev.c
+++ b/sys/dev/video/fbdev.c
@@ -28,17 +28,65 @@
  */
 
 #include <sys/types.h>
+#include <sys/errno.h>
 #include <sys/limine.h>
+#include <sys/device.h>
+#include <sys/driver.h>
+#include <sys/fbdev.h>
 #include <dev/video/fbdev.h>
+#include <fs/devfs.h>
+#include <fs/ctlfs.h>
+#include <vm/vm.h>
+#include <string.h>
 
 #define FRAMEBUFFER \
         framebuffer_req.response->framebuffers[0]
 
+static struct cdevsw fb_cdevsw;
+static const struct ctlops fb_size_ctl;
 static volatile struct limine_framebuffer_request framebuffer_req = {
     .id = LIMINE_FRAMEBUFFER_REQUEST,
     .revision = 0
 };
 
+static paddr_t
+fbdev_mmap(dev_t dev, size_t size, off_t off, int flags)
+{
+    size_t max_bounds;
+
+    max_bounds = FRAMEBUFFER->pitch * FRAMEBUFFER->height;
+    if ((off + size) > max_bounds) {
+        return 0;
+    }
+
+    return VIRT_TO_PHYS(FRAMEBUFFER->address);
+}
+
+static int
+ctl_attr_read(struct ctlfs_dev *cdp, struct sio_txn *sio)
+{
+    struct fbattr attr;
+    size_t len = sizeof(attr);
+
+    if (sio == NULL) {
+        return -EINVAL;
+    }
+    if (sio->buf == NULL) {
+        return -EINVAL;
+    }
+
+    if (len > sio->len) {
+        len = sio->len;
+    }
+
+    attr.width = FRAMEBUFFER->width;
+    attr.height = FRAMEBUFFER->height;
+    attr.pitch = FRAMEBUFFER->pitch;
+    attr.bpp = FRAMEBUFFER->bpp;
+    memcpy(sio->buf, &attr, len);
+    return len;
+}
+
 struct fbdev
 fbdev_get(void)
 {
@@ -51,3 +99,40 @@ fbdev_get(void)
     ret.bpp = FRAMEBUFFER->bpp;
     return ret;
 }
+
+static int
+fbdev_init(void)
+{
+    struct ctlfs_dev ctl;
+    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);
+
+
+    /* Register control files */
+    ctl.mode = 0444;
+    ctlfs_create_node(devname, &ctl);
+    ctl.devname = devname;
+    ctl.ops = &fb_size_ctl;
+    ctlfs_create_entry("attr", &ctl);
+    return 0;
+}
+
+static struct cdevsw fb_cdevsw = {
+    .read = noread,
+    .write = nowrite,
+    .mmap = fbdev_mmap
+};
+
+static const struct ctlops fb_size_ctl = {
+    .read = ctl_attr_read,
+    .write = NULL,
+};
+
+DRIVER_EXPORT(fbdev_init);