Changeset 15d0046 in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

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 <ipc/irc.h>
-#include <ns.h>
-#include <ipc/services.h>
-#include <sysinfo.h>
+#include <irc.h>
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
@@ -107 +104 @@
         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) {
-                        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);
+                        int rc = irc_enable_interrupt(
+                            res->resources[i].res.interrupt.irq);
+                        
+                        if (rc != EOK)
                                 return false;
-                        }
                 }
         }
         
-        async_hangup(irc_sess);
         return true;
 }
@@ -284 +260 @@
         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;
+        uint32_t val = 0; // Prevent -Werror=maybe-uninitialized
         
         fibril_mutex_lock(&bus->conf_mutex);