Changeset 3f0a7971 in mainline for uspace/lib/fs/libfs.h

Timestamp:

2010-11-18T22:34:23Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (diff), 45f04f8 (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

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

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

uspace/lib/fs/libfs.h

@@ -47 +47 @@
         int phone;
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 } mp_data_t;
 
@@ -61 +61 @@
          * 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 +81 @@
         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;