Changes in uspace/drv/bus/isa/isa.c [ebc9c2c:9e470c0] in mainline

File:

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

uspace/drv/bus/isa/isa.c

@@ -54 +54 @@
 #include <ipc/irc.h>
 #include <ipc/services.h>
+#include <sysinfo.h>
+#include <ns.h>
 #include <sys/stat.h>
-#include <irc.h>
+#include <ipc/irc.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
 #include <ns.h>
 
@@ -116 +120 @@
         assert(fun);
 
+        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;
+
         const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
         for (size_t i = 0; 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;
 }
@@ -330 +355 @@
 
         /* Get the name part of the rest of the line. */
-        str_tok(line, ":", NULL);
+        strtok(line, ":");
         return line;
 }