Changeset 107f2e0 in mainline for uspace/lib/c/include/vfs/vfs.h

Timestamp:

2011-08-19T16:56:41Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f00af83

Parents:

cf22ada (diff), 45059d6b (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/lib/c/include/vfs/vfs.h (modified) (2 diffs)

uspace/lib/c/include/vfs/vfs.h

@@ -40 +40 @@
 #include <ipc/loc.h>
 #include <stdio.h>
+#include <async.h>
 
-/** Libc version of the VFS triplet.
- *
- * Unique identification of a file system node
- * within a file system instance.
- *
- */
-typedef struct {
-        fs_handle_t fs_handle;
-        service_id_t service_id;
-        fs_index_t index;
-} fdi_node_t;
+enum vfs_change_state_type {
+        VFS_PASS_HANDLE
+};
 
 extern char *absolutize(const char *, size_t *);
@@ -59 +52 @@
 extern int unmount(const char *);
 
-extern int open_node(fdi_node_t *, int);
-extern int fd_node(int, fdi_node_t *);
+extern int fhandle(FILE *, int *);
 
-extern FILE *fopen_node(fdi_node_t *, const char *);
-extern int fnode(FILE *, fdi_node_t *);
+extern int fd_wait(void);
+
+extern async_exch_t *vfs_exchange_begin(void);
+extern void vfs_exchange_end(async_exch_t *);
 
 #endif