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

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/srv/hw/irc/fhc/fhc.c (modified) (5 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/irc.h>
@@ -76 +75 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -85 +84 @@
                 case IRC_ENABLE_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 case IRC_CLEAR_INTERRUPT:
@@ -92 +91 @@
                         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;
                 }
@@ -137 +136 @@
         
         async_set_client_connection(fhc_connection);
-        ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, NULL, NULL);
+        service_register(SERVICE_FHC);
         
         return true;