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

Timestamp:

2011-02-04T21:00:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

474afc9, 960ff451

Parents:

400575c5 (diff), 17aca1c (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 (modified) (5 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup obio 
+/** @addtogroup obio
  * @{
- */ 
+ */
 
 /**
- * @file        obio.c
- * @brief       OBIO driver.
+ * @file obio.c
+ * @brief OBIO driver.
  *
  * OBIO is a short for on-board I/O. On UltraSPARC IIi and systems with U2P,
@@ -42 +42 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -86 +85 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -95 +94 @@
                 case IRC_ENABLE_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         base_virt[OBIO_CIR(inr & INO_MASK)] = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }
@@ -138 +137 @@
         
         async_set_client_connection(obio_connection);
-        ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, NULL, NULL);
+        service_register(SERVICE_OBIO);
         
         return true;