Changeset cf2af94 in mainline for uspace/srv/fs/ext2/ext2.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/fs/ext2/ext2.c (modified) (5 diffs)

uspace/srv/fs/ext2/ext2.c

@@ -38 +38 @@
 
 #include "ext2.h"
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
@@ -82 +82 @@
                  * created by IPC_M_CONNECT_TO_ME.
                  */
-                ipc_answer_0(iid, EOK);
+                async_answer_0(iid, EOK);
         }
         
@@ -91 +91 @@
         
                 callid = async_get_call(&call);
-                switch  (IPC_GET_METHOD(call)) {
+                switch  (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return;
@@ -134 +134 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }
@@ -147 +147 @@
         printf(NAME ": HelenOS EXT2 file system server\n");
 
-        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
+        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
         if (vfs_phone < EOK) {
                 printf(NAME ": failed to connect to VFS\n");