Changeset 7ae249d in mainline for uspace/lib/fs/libfs.h

Timestamp:

2011-07-29T14:47:52Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

00c2de63, 1814ee4d, ffff746

Parents:

9350bfdd (diff), f5d51de (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.

File:

• uspace/lib/fs/libfs.h (modified) (3 diffs)

uspace/lib/fs/libfs.h

@@ -43 +43 @@
 
 typedef struct {
+        int (* mounted)(devmap_handle_t, const char *, fs_index_t *, aoff64_t *,
+            unsigned *);
+        int (* unmounted)(devmap_handle_t);
+        int (* read)(devmap_handle_t, fs_index_t, aoff64_t, size_t *);
+        int (* write)(devmap_handle_t, fs_index_t, aoff64_t, size_t *,
+            aoff64_t *);
+        int (* truncate)(devmap_handle_t, fs_index_t, aoff64_t);
+        int (* close)(devmap_handle_t, fs_index_t);
+        int (* destroy)(devmap_handle_t, fs_index_t);
+        int (* sync)(devmap_handle_t, fs_index_t);
+} vfs_out_ops_t;
+
+typedef struct {
         bool mp_active;
         async_sess_t *sess;
@@ -71 +84 @@
         int (* has_children)(bool *, fs_node_t *);
         /*
-         * The second set of methods are usually mere getters that do not return
-         * an integer error code.
+         * The second set of methods are usually mere getters that do not
+         * return an integer error code.
          */
         fs_index_t (* index_get)(fs_node_t *);
         aoff64_t (* size_get)(fs_node_t *);
         unsigned int (* lnkcnt_get)(fs_node_t *);
-        char (* plb_get_char)(unsigned pos);
         bool (* is_directory)(fs_node_t *);
         bool (* is_file)(fs_node_t *);
@@ -88 +100 @@
 } fs_reg_t;
 
-extern int fs_register(async_sess_t *, fs_reg_t *, vfs_info_t *,
-    async_client_conn_t);
+extern int fs_register(async_sess_t *, vfs_info_t *, vfs_out_ops_t *,
+    libfs_ops_t *);
 
 extern void fs_node_initialize(fs_node_t *);
-
-extern void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_unmount(libfs_ops_t *, ipc_callid_t, ipc_call_t *);
-extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-extern void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
-    ipc_call_t *);
 
 #endif