Changes in uspace/drv/pciintel/pci.c [40a5d40:ad6857c] in mainline

File:

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

uspace/drv/pciintel/pci.c

@@ -59 +59 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <pci_dev_iface.h>
 
 #include "pci.h"
@@ -94 +93 @@
   sysarg_t apic;
   sysarg_t i8259;
-
         int irc_phone = -1;
         int irc_service = 0;
@@ -104 +102 @@
         }
 
-  if (irc_service == 0)
+  if (irc_service) {
+    while (irc_phone < 0)
+      irc_phone = service_connect_blocking(irc_service, 0, 0);
+  } else {
                 return false;
-
-        irc_phone = service_connect_blocking(irc_service, 0, 0);
-        if (irc_phone < 0)
-                return false;
+        }
 
         size_t i;
@@ -115 +113 @@
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;
-                        int rc = async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
-                        if (rc != EOK) {
-                                async_hangup(irc_phone);
-                                return false;
-                        }
+                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, irq);
                 }
         }
@@ -125 +119 @@
         async_hangup(irc_phone);
         return true;
-}
-
-static int pci_config_space_write_32(
-    ddf_fun_t *fun, uint32_t address, uint32_t data)
-{
-        if (address > 252)
-                return EINVAL;
-        pci_conf_write_32(PCI_FUN(fun), address, data);
-        return EOK;
-}
-
-static int pci_config_space_write_16(
-    ddf_fun_t *fun, uint32_t address, uint16_t data)
-{
-        if (address > 254)
-                return EINVAL;
-        pci_conf_write_16(PCI_FUN(fun), address, data);
-        return EOK;
-}
-
-static int pci_config_space_write_8(
-    ddf_fun_t *fun, uint32_t address, uint8_t data)
-{
-        if (address > 255)
-                return EINVAL;
-        pci_conf_write_8(PCI_FUN(fun), address, data);
-        return EOK;
-}
-
-static int pci_config_space_read_32(
-    ddf_fun_t *fun, uint32_t address, uint32_t *data)
-{
-        if (address > 252)
-                return EINVAL;
-        *data = pci_conf_read_32(PCI_FUN(fun), address);
-        return EOK;
-}
-
-static int pci_config_space_read_16(
-    ddf_fun_t *fun, uint32_t address, uint16_t *data)
-{
-        if (address > 254)
-                return EINVAL;
-        *data = pci_conf_read_16(PCI_FUN(fun), address);
-        return EOK;
-}
-
-static int pci_config_space_read_8(
-    ddf_fun_t *fun, uint32_t address, uint8_t *data)
-{
-        if (address > 255)
-                return EINVAL;
-        *data = pci_conf_read_8(PCI_FUN(fun), address);
-        return EOK;
 }
 
@@ -186 +126 @@
 };
 
-static pci_dev_iface_t pci_dev_ops = {
-        .config_space_read_8 = &pci_config_space_read_8,
-        .config_space_read_16 = &pci_config_space_read_16,
-        .config_space_read_32 = &pci_config_space_read_32,
-        .config_space_write_8 = &pci_config_space_write_8,
-        .config_space_write_16 = &pci_config_space_write_16,
-        .config_space_write_32 = &pci_config_space_write_32
-};
-
-static ddf_dev_ops_t pci_fun_ops = {
-        .interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops,
-        .interfaces[PCI_DEV_IFACE] = &pci_dev_ops
-};
+static ddf_dev_ops_t pci_fun_ops;
 
 static int pci_add_device(ddf_dev_t *);
@@ -665 +593 @@
 {
         pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
-        pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;
 }