Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / hal / gfxa / vga / vga_pci.c

diff --git a/lunaix-os/hal/gfxa/vga/vga_pci.c b/lunaix-os/hal/gfxa/vga/vga_pci.c
index 09476db5efd958f5ad57ef7b13e4286dbb5fe7a1..af4f228d6472fd1b3dbf8e28943dcb54de1c83ff 100644 (file)
--- a/lunaix-os/hal/gfxa/vga/vga_pci.c
+++ b/lunaix-os/hal/gfxa/vga/vga_pci.c
@@ -6,7 +6,6 @@
 
 #include <hal/gfxm.h>
 #include <hal/pci.h>
 
 #include <hal/gfxm.h>
 #include <hal/pci.h>

-#include <sys/pci_hba.h>

 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 


@@ -59,25 +58,29 @@ static u32_t palette[] = {
 #define VGA_REG_OFF 0x0400
 
 static int
 #define VGA_REG_OFF 0x0400
 
 static int

-vga_pci_bind(struct device_def* devdef, struct device* pcidev_base)
+vga_pci_bind(struct device_def* devdef, morph_t* obj)

 {
 {

-    struct pci_device* pcidev = PCI_DEVICE(pcidev_base);
+    struct pci_probe* probe;

 
 

-    struct pci_base_addr* fb = &pcidev->bar[0];
-    struct pci_base_addr* mmio = &pcidev->bar[2];
+    struct pci_base_addr* fb;
+    struct pci_base_addr* mmio;
+
+    probe = changeling_reveal(obj, pci_probe_morpher);
+    fb    = &probe->bar[0];
+    mmio  = &probe->bar[2];

 
     if (PCI_BAR_ADDR_IO(mmio->type)) {
         return EINVAL;
     }
 
 
     if (PCI_BAR_ADDR_IO(mmio->type)) {
         return EINVAL;
     }
 

-    pci_reg_t cmd = pci_read_cspace(pcidev->cspace_base, PCI_REG_STATUS_CMD);
+    pci_reg_t cmd = pci_read_cspace(probe->cspace_base, PCI_REG_STATUS_CMD);

 
     cmd |= (PCI_RCMD_MM_ACCESS | PCI_RCMD_DISABLE_INTR | PCI_RCMD_BUS_MASTER);
 
 
     cmd |= (PCI_RCMD_MM_ACCESS | PCI_RCMD_DISABLE_INTR | PCI_RCMD_BUS_MASTER);
 

-    pci_write_cspace(pcidev->cspace_base, PCI_REG_STATUS_CMD, cmd);
+    pci_write_cspace(probe->cspace_base, PCI_REG_STATUS_CMD, cmd);

 
 

-    ptr_t fb_mapped = (ptr_t)ioremap(fb->start, FB256K);
-    ptr_t mmio_mapped = (ptr_t)ioremap(mmio->start, mmio->size);
+    ptr_t fb_mapped = ioremap(fb->start, FB256K);
+    ptr_t mmio_mapped = ioremap(mmio->start, mmio->size);

 
     struct vga* vga_state =
       vga_new_state(mmio_mapped + VGA_REG_OFF, fb_mapped, FB256K);
 
     struct vga* vga_state =
       vga_new_state(mmio_mapped + VGA_REG_OFF, fb_mapped, FB256K);


@@ -97,21 +100,27 @@ vga_pci_bind(struct device_def* devdef, struct device* pcidev_base)
     return 0;
 }
 
     return 0;
 }
 

+
+static bool
+vga_pci_compat(struct pci_probe* probe)
+{
+#define VGA_PCI_CLASS 0x30000
+    return pci_device_class(probe) == VGA_PCI_CLASS;
+}
+

 static int
 static int

-vga_pci_init(struct device_def* def)
+vga_pci_register(struct device_def* def)

 {
 {

-    return pci_bind_definition_all(pcidev_def(def));
+    return !pci_register_driver(def, vga_pci_compat);

 }
 
 }
 

-#define VGA_PCI_CLASS 0x30000
+static struct device_def vga_pci_devdef = {
+    def_device_class(GENERIC, DISP, VGA),
+    def_device_name("Generic VGA"),
+    
+    def_on_register(vga_pci_register),
+    def_on_create(vga_pci_bind),

 
 

-static struct pci_device_def vga_pci_devdef = {
-    .dev_class = VGA_PCI_CLASS,
-    .dev_ident = PCI_DEVIDENT(0x1234, 0x1111),
-    .ident_mask = PCI_MATCH_EXACT,
-    .devdef = { .class = DEVCLASS(DEVIF_PCI, DEVFN_DISP, DEV_VGA),
-                .name = "Generic VGA",
-                .init = vga_pci_init,
-                .bind = vga_pci_bind }
+    def_non_trivial

 };
 };

-EXPORT_PCI_DEVICE(vga_pci, &vga_pci_devdef, load_onboot);
\ No newline at end of file
+EXPORT_DEVICE(vga_pci, &vga_pci_devdef, load_onboot);
\ No newline at end of file