Changeset 985e26d2 in mainline for uspace/srv/fs/fat/fat.c

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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

@@ -43 +43 @@
 #include <errno.h>
 #include <unistd.h>
+#include <task.h>
 #include <stdio.h>
 #include <libfs.h>
 #include "../../vfs/vfs.h"
 
+#define NAME    "fat"
 
 vfs_info_t fat_vfs_info = {
-        .name = "fat",
+        .name = NAME,
 };
 
@@ -83 +85 @@
         }
         
-        dprintf("VFS-FAT connection established.\n");
+        dprintf(NAME ": connection opened\n");
         while (1) {
                 ipc_callid_t callid;
@@ -137 +139 @@
         int rc;
 
-        printf("fat: HelenOS FAT file system server.\n");
+        printf(NAME ": HelenOS FAT file system server\n");
 
         rc = fat_idx_init();
@@ -145 +147 @@
         vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
         if (vfs_phone < EOK) {
-                printf("fat: failed to connect to VFS\n");
+                printf(NAME ": failed to connect to VFS\n");
                 return -1;
         }
@@ -155 +157 @@
         }
         
-        dprintf("FAT filesystem registered, fs_handle=%d.\n",
-            fat_reg.fs_handle);
-
+        printf(NAME ": Accepting connections\n");
+        task_retval(0);
         async_manager();
         /* not reached */
@@ -163 +164 @@
 
 err:
-        printf("Failed to register the FAT file system (%d)\n", rc);
+        printf(NAME ": Failed to register file system (%d)\n", rc);
         return rc;
 }