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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/srv/hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (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/bus.h>
+#include <ipc/irc.h>
 #include <ipc/ns.h>
 #include <sysinfo.h>
@@ -86 +85 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -92 +91 @@
         
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
-                case BUS_CLEAR_INTERRUPT:
+                switch (IPC_GET_IMETHOD(call)) {
+                case IRC_ENABLE_INTERRUPT:
+                        /* Noop */
+                        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;
                 }
@@ -134 +137 @@
         
         async_set_client_connection(obio_connection);
-        ipcarg_t phonead;
-        ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);
+        service_register(SERVICE_IRC);
         
         return true;