Changeset 8e7c9fe in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

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 <ipc/irc.h>
-#include <ipc/services.h>
-#include <sysinfo.h>
+#include <irc.h>
 #include <ns.h>
 
@@ -120 +116 @@
         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) {
-                        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;
 }
@@ -355 +330 @@
 
         /* Get the name part of the rest of the line. */
-        strtok(line, ":");
+        str_tok(line, ":", NULL);
         return line;
 }