Changes in uspace/drv/bus/pci/pciintel/pci.c [ebc9c2c:99e8fb7b] in mainline

File:

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

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

@@ -51 +51 @@
 #include <ddf/log.h>
 #include <ipc/dev_iface.h>
-#include <irc.h>
+#include <ipc/irc.h>
+#include <ns.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
@@ -104 +107 @@
         pci_fun_t *dev_data = pci_fun(fnode);
         
+        sysarg_t apic;
+        sysarg_t i8259;
+        
+        async_sess_t *irc_sess = NULL;
+        
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
+                irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                    SERVICE_IRC, 0, 0);
+        }
+        
+        if (!irc_sess)
+                return false;
+        
         size_t i = 0;
         hw_resource_list_t *res = &dev_data->hw_resources;
         for (; i < res->count; i++) {
                 if (res->resources[i].type == INTERRUPT) {
-                        int rc = irc_enable_interrupt(
-                            res->resources[i].res.interrupt.irq);
-                        
-                        if (rc != EOK)
+                        const int irq = res->resources[i].res.interrupt.irq;
+                        
+                        async_exch_t *exch = async_exchange_begin(irc_sess);
+                        const int rc =
+                            async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
+                        async_exchange_end(exch);
+                        
+                        if (rc != EOK) {
+                                async_hangup(irc_sess);
                                 return false;
+                        }
                 }
         }
         
+        async_hangup(irc_sess);
         return true;
 }
@@ -260 +284 @@
         const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
         pci_bus_t *bus = pci_bus_from_fun(fun);
-        uint32_t val = 0; // Prevent -Werror=maybe-uninitialized
+        uint32_t val;
         
         fibril_mutex_lock(&bus->conf_mutex);