Changeset 8b655705 in mainline for uspace/srv/hw/irc/apic/apic.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/apic/apic.c (modified) (4 diffs)

uspace/srv/hw/irc/apic/apic.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -75 +74 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -82 +81 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
-                        ipc_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
+                        async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }
@@ -108 +107 @@
         
         async_set_client_connection(apic_connection);
-        sysarg_t phonead;
-        ipc_connect_to_me(PHONE_NS, SERVICE_APIC, 0, 0, &phonead);
+        service_register(SERVICE_IRC);
         
         return true;