Changeset 6a44ee4 in mainline for uspace/srv/fs/devfs/devfs.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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

@@ -41 +41 @@
 #include <stdio.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -59 +59 @@
 fs_reg_t devfs_reg;
 
-static void devfs_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void devfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         if (iid)
@@ -68 +68 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch  (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call))
                         return;
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         devfs_mounted(callid, &call);
@@ -119 +120 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS Device Filesystem\n");
+        printf("%s: HelenOS Device Filesystem\n", NAME);
         
         if (!devfs_init()) {
-                printf(NAME ": failed to initialize devfs\n");
+                printf("%s: failed to initialize devfs\n", NAME);
                 return -1;
         }
         
-        int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
-        if (vfs_phone < EOK) {
-                printf(NAME ": Unable to connect to VFS\n");
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
+                printf("%s: Unable to connect to VFS\n", NAME);
                 return -1;
         }
         
-        int rc = fs_register(vfs_phone, &devfs_reg, &devfs_vfs_info,
+        int rc = fs_register(vfs_sess, &devfs_reg, &devfs_vfs_info,
             devfs_connection);
         if (rc != EOK) {
-                printf(NAME ": Failed to register file system (%d)\n", rc);
+                printf("%s: Failed to register file system (%d)\n", NAME, rc);
                 return rc;
         }
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         task_retval(0);
         async_manager();