Changeset b0f00a9 in mainline for uspace/srv/fs/exfat/exfat.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/exfat/exfat.c (moved) (moved from uspace/srv/hid/adb_mouse/adb_dev.c ) (2 diffs)

uspace/srv/fs/exfat/exfat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -27 +29 @@
  */
 
-/** @addtogroup mouse
+/** @addtogroup fs
  * @{
  */ 
-/** @file
- * @brief
+
+/**
+ * @file        exfat.c
+ * @brief       FAT file system driver for HelenOS.
  */
 
-#include <ipc/adb.h>
+#include "exfat.h"
+#include <ipc/services.h>
+#include <ns.h>
 #include <async.h>
-#include <vfs/vfs.h>
-#include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <task.h>
+#include <stdio.h>
+#include <libfs.h>
+#include "../../vfs/vfs.h"
 
-#include "adb_mouse.h"
-#include "adb_dev.h"
+#define NAME    "exfat"
 
-static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall);
+vfs_info_t exfat_vfs_info = {
+        .name = NAME,
+        .concurrent_read_write = false,
+        .write_retains_size = false,
+        .instance = 0,
+};
 
-static int dev_phone;
+int main(int argc, char **argv)
+{
+        printf(NAME ": HelenOS exFAT file system server\n");
 
-int adb_dev_init(void)
-{
-        const char *input = "/dev/adb/mouse";
-        int input_fd;
-
-        printf(NAME ": open %s\n", input);
-
-        input_fd = open(input, O_RDONLY);
-        if (input_fd < 0) {
-                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
-                return false;
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        exfat_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
         }
 
-        dev_phone = fd_phone(input_fd);
-        if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
-        }
+        int rc = exfat_idx_init();
+        if (rc != EOK)
+                goto err;
 
-        /* NB: The callback connection is slotted for removal */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
-                printf(NAME ": Failed to create callback from device\n");
-                return false;
+        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_sess, &exfat_vfs_info, &exfat_ops, &exfat_libfs_ops);
+        if (rc != EOK) {
+                exfat_idx_fini();
+                goto err;
+        }
+        
+        printf(NAME ": Accepting connections\n");
+        task_retval(0);
+        async_manager();
+
+        /* not reached */
         return 0;
+
+err:
+        printf(NAME ": Failed to register file system (%d)\n", rc);
+        return rc;
 }
 
-static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall)
-{
-        /* Ignore parameters, the connection is already opened */
-        while (true) {
-
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-
-                int retval;
-
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* TODO: Handle hangup */
-                        return;
-                case IPC_FIRST_USER_METHOD:
-                        mouse_handle_data(IPC_GET_ARG1(call));
-                        break;
-                default:
-                        retval = ENOENT;
-                }
-                async_answer_0(callid, retval);
-        }
-}
 
 /**