Changeset cf2af94 in mainline for uspace/srv/hw/irc/fhc/fhc.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/hw/irc/fhc/fhc.c (moved) (moved from uspace/srv/hw/cir/fhc/fhc.c ) (4 diffs)

uspace/srv/hw/irc/fhc/fhc.c

@@ -29 +29 @@
 /** @addtogroup fhc
  * @{
- */ 
+ */
 
 /**
- * @file        fhc.c
- * @brief       FHC bus controller driver.
+ * @file fhc.c
+ * @brief FHC bus controller driver.
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <ipc/ns.h>
 #include <sysinfo.h>
@@ -76 +75 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -82 +81 @@
         
                 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);
                         switch (inr) {
                         case FHC_UART_INR:
                                 fhc_uart_virt[FHC_UART_ICLR] = 0;
-                                ipc_answer_0(callid, EOK);
+                                async_answer_0(callid, EOK);
                                 break;
                         default:
-                                ipc_answer_0(callid, ENOTSUP);
+                                async_answer_0(callid, ENOTSUP);
                                 break;
                         }
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }
@@ -133 +136 @@
         
         async_set_client_connection(fhc_connection);
-        ipcarg_t phonead;
-        ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, &phonead);
+        service_register(SERVICE_FHC);
         
         return true;