Changeset 12573db in mainline for uspace/srv/fs/devfs/devfs.c

Timestamp:

2011-01-31T20:32:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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/fs/devfs/devfs.c (modified) (4 diffs)

uspace/srv/fs/devfs/devfs.c

@@ -40 +40 @@
 
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
@@ -62 +62 @@
 {
         if (iid)
-                ipc_answer_0(iid, EOK);
+                async_answer_0(iid, EOK);
         
         while (true) {
@@ -111 +111 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }
@@ -126 +126 @@
         }
         
-        int vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
+        int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
         if (vfs_phone < EOK) {
                 printf(NAME ": Unable to connect to VFS\n");