Changeset c028b22 in mainline for uspace/srv/fs/fat/fat.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/fat/fat.c (modified) (6 diffs)

uspace/srv/fs/fat/fat.c

@@ -39 +39 @@
 #include "fat.h"
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -76 +76 @@
  * request has been completed.
  */
-static void fat_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void fat_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         if (iid) {
@@ -88 +88 @@
         
         dprintf(NAME ": connection opened\n");
-        while (1) {
-                ipc_callid_t callid;
+        
+        while (true) {
                 ipc_call_t call;
-        
-                callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
                         return;
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         fat_mounted(callid, &call);
@@ -144 +145 @@
 int main(int argc, char **argv)
 {
-        int vfs_phone;
-        int rc;
-
         printf(NAME ": HelenOS FAT file system server\n");
-
-        rc = fat_idx_init();
+        
+        int rc = fat_idx_init();
         if (rc != EOK)
                 goto err;
-
-        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
-        if (vfs_phone < EOK) {
+        
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
                 return -1;
         }
         
-        rc = fs_register(vfs_phone, &fat_reg, &fat_vfs_info, fat_connection);
+        rc = fs_register(vfs_sess, &fat_reg, &fat_vfs_info, fat_connection);
         if (rc != EOK) {
                 fat_idx_fini();
@@ -168 +167 @@
         task_retval(0);
         async_manager();
-        /* not reached */
+        
+        /* Not reached */
         return 0;
-
+        
 err:
         printf(NAME ": Failed to register file system (%d)\n", rc);
@@ -178 +178 @@
 /**
  * @}
- */ 
+ */