Changes in uspace/drv/bus/pci/pciintel/pci.c [6dbc500:e8d6ce2] in mainline

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (9 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -57 +57 @@
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
-#include <ops/pio_window.h>
-#include <device/pio_window.h>
 #include <ddi.h>
 #include <pci_dev_iface.h>
@@ -143 +141 @@
 }
 
-static pio_window_t *pciintel_get_pio_window(ddf_fun_t *fnode)
-{
-        pci_fun_t *fun = pci_fun(fnode);
-        
-        if (fun == NULL)
-                return NULL;
-        return &fun->pio_window;
-}
-
-
 static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address,
     uint32_t data)
@@ -210 +198 @@
         .get_resource_list = &pciintel_get_resources,
         .enable_interrupt = &pciintel_enable_interrupt,
-};
-
-static pio_window_ops_t pciintel_pio_window_ops = {
-        .get_pio_window = &pciintel_get_pio_window
 };
 
@@ -227 +211 @@
 static ddf_dev_ops_t pci_fun_ops = {
         .interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops,
-        .interfaces[PIO_WINDOW_DEV_IFACE] = &pciintel_pio_window_ops,
         .interfaces[PCI_DEV_IFACE] = &pci_dev_ops
 };
@@ -569 +552 @@
 {
         uint8_t irq = pci_conf_read_8(fun, PCI_BRIDGE_INT_LINE);
-        uint8_t pin = pci_conf_read_8(fun, PCI_BRIDGE_INT_PIN);
-
-        if (pin != 0 && irq != 0xff)
+        if (irq != 0xff)
                 pci_add_interrupt(fun, irq);
 }
@@ -634 +615 @@
                         pci_read_bars(fun);
                         pci_read_interrupt(fun);
-
-                        /* Propagate the PIO window to the function. */
-                        fun->pio_window = bus->pio_win;
                         
                         ddf_fun_set_ops(fun->fnode, &pci_fun_ops);
@@ -667 +645 @@
 static int pci_dev_add(ddf_dev_t *dnode)
 {
-        hw_resource_list_t hw_resources;
         pci_bus_t *bus = NULL;
         ddf_fun_t *ctl = NULL;
@@ -693 +670 @@
                 goto fail;
         }
-
-        rc = pio_window_get(sess, &bus->pio_win);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "pci_dev_add failed to get PIO window "
-                    "for the device.");
-                goto fail;
-        }
+        
+        hw_resource_list_t hw_resources;
         
         rc = hw_res_get_resource_list(sess, &hw_resources);
@@ -789 +761 @@
 {
         ddf_log_init(NAME);
+        pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
+        pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;
 }