Changeset 04803bf in mainline for uspace/srv/fs/devfs/devfs.c

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/srv/fs/devfs/devfs.c (modified) (8 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>
+#include <task.h>
 #include <libfs.h>
 #include "devfs.h"
@@ -51 +52 @@
 
 static vfs_info_t devfs_vfs_info = {
-        .name = "devfs",
+        .name = NAME,
+        .concurrent_read_write = false,
+        .write_retains_size = false,
 };
 
@@ -59 +62 @@
 {
         if (iid)
-                ipc_answer_0(iid, EOK);
+                async_answer_0(iid, EOK);
         
         while (true) {
@@ -65 +68 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch  (IPC_GET_METHOD(call)) {
+                switch  (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         return;
@@ -73 +76 @@
                 case VFS_OUT_MOUNT:
                         devfs_mount(callid, &call);
+                        break;
+                case VFS_OUT_UNMOUNTED:
+                        devfs_unmounted(callid, &call);
+                        break;
+                case VFS_OUT_UNMOUNT:
+                        devfs_unmount(callid, &call);
                         break;
                 case VFS_OUT_LOOKUP:
@@ -102 +111 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }
@@ -117 +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");
@@ -131 +140 @@
         
         printf(NAME ": Accepting connections\n");
+        task_retval(0);
         async_manager();