Changeset b5e68c8 in mainline for uspace/lib/fs/libfs.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/fs/libfs.h (modified) (4 diffs)

uspace/lib/fs/libfs.h

@@ -39 +39 @@
 #include <ipc/vfs.h>
 #include <stdint.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <devmap.h>
@@ -47 +46 @@
         int phone;
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 } mp_data_t;
 
@@ -61 +60 @@
          * argument holds the output argument.
          */
-        int (* root_get)(fs_node_t **, dev_handle_t);
+        int (* root_get)(fs_node_t **, devmap_handle_t);
         int (* match)(fs_node_t **, fs_node_t *, const char *);
-        int (* node_get)(fs_node_t **, dev_handle_t, fs_index_t);
+        int (* node_get)(fs_node_t **, devmap_handle_t, fs_index_t);
         int (* node_open)(fs_node_t *);
         int (* node_put)(fs_node_t *);
-        int (* create)(fs_node_t **, dev_handle_t, int);
+        int (* create)(fs_node_t **, devmap_handle_t, int);
         int (* destroy)(fs_node_t *);
         int (* link)(fs_node_t *, fs_node_t *, const char *);
@@ -81 +80 @@
         bool (* is_directory)(fs_node_t *);
         bool (* is_file)(fs_node_t *);
-        dev_handle_t (* device_get)(fs_node_t *);
+        devmap_handle_t (* device_get)(fs_node_t *);
 } libfs_ops_t;
 
 typedef struct {
         int fs_handle;           /**< File system handle. */
-        ipcarg_t vfs_phonehash;  /**< Initial VFS phonehash. */
         uint8_t *plb_ro;         /**< Read-only PLB view. */
 } fs_reg_t;