Changeset 991f645 in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2010-11-18T17:39:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0b5a4131

Parents:

51a268f

Message:

Rename dev_handle_t to devmap_handle_t and make it explicitly clear that
dev_handle_t is a handle understood by devmap.

File:

• uspace/srv/fs/devfs/devfs_ops.c (modified) (10 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -54 +54 @@
 typedef struct {
         devmap_handle_type_t type;
-        dev_handle_t handle;
+        devmap_handle_t handle;
 } devfs_node_t;
 
 /** Opened devices structure */
 typedef struct {
-        dev_handle_t handle;
+        devmap_handle_t handle;
         int phone;
         size_t refcount;
@@ -84 +84 @@
 {
         device_t *dev = hash_table_get_instance(item, device_t, link);
-        return (dev->handle == (dev_handle_t) key[DEVICES_KEY_HANDLE]);
+        return (dev->handle == (devmap_handle_t) key[DEVICES_KEY_HANDLE]);
 }
 
@@ -99 +99 @@
 
 static int devfs_node_get_internal(fs_node_t **rfn, devmap_handle_type_t type,
-    dev_handle_t handle)
+    devmap_handle_t handle)
 {
         devfs_node_t *node = (devfs_node_t *) malloc(sizeof(devfs_node_t));
@@ -122 +122 @@
 }
 
-static int devfs_root_get(fs_node_t **rfn, dev_handle_t dev_handle)
+static int devfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
 {
         return devfs_node_get_internal(rfn, DEV_HANDLE_NONE, 0);
@@ -154 +154 @@
                 
                 /* Search root namespace */
-                dev_handle_t namespace;
+                devmap_handle_t namespace;
                 if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
                         count = devmap_get_devices(namespace, &devs);
@@ -200 +200 @@
 }
 
-static int devfs_node_get(fs_node_t **rfn, dev_handle_t dev_handle, fs_index_t index)
+static int devfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
 {
         return devfs_node_get_internal(rfn, devmap_handle_probe(index), index);
@@ -269 +269 @@
 }
 
-static int devfs_create_node(fs_node_t **rfn, dev_handle_t dev_handle, int lflag)
+static int devfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag)
 {
         assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
@@ -304 +304 @@
                 
                 /* Root namespace */
-                dev_handle_t namespace;
+                devmap_handle_t namespace;
                 if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
                         count = devmap_count_devices(namespace);
@@ -372 +372 @@
 }
 
-static dev_handle_t devfs_device_get(fs_node_t *fn)
+static devmap_handle_t devfs_device_get(fs_node_t *fn)
 {
         devfs_node_t *node = (devfs_node_t *) fn->data;
@@ -501 +501 @@
                 
                 /* Search root namespace */
-                dev_handle_t namespace;
+                devmap_handle_t namespace;
                 if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
                         count = devmap_get_devices(namespace, &desc);