Changeset 357b5f5 in mainline for uspace/srv/hw/irc/obio/obio.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/srv/hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (3 diffs)

uspace/srv/hw/irc/obio/obio.c

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <ipc/ns.h>
 #include <sysinfo.h>
@@ -92 +92 @@
         
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
-                case BUS_CLEAR_INTERRUPT:
+                switch (IPC_GET_IMETHOD(call)) {
+                case IRC_ENABLE_INTERRUPT:
+                        /* Noop */
+                        ipc_answer_0(callid, EOK);
+                        break;
+                case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         base_virt[OBIO_CIR(inr & INO_MASK)] = 0;
@@ -134 +138 @@
         
         async_set_client_connection(obio_connection);
-        ipcarg_t phonead;
+        sysarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);