Changeset 991f645 in mainline for uspace/lib/c

Timestamp:

2010-11-18T17:39:28Z (15 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.

Location:

uspace/lib/c

Files:

• generic/devmap.c (modified) (8 diffs)
• generic/vfs/vfs.c (modified) (4 diffs)
• include/devmap.h (modified) (2 diffs)
• include/ipc/devmap.h (modified) (2 diffs)
• include/sys/stat.h (modified) (2 diffs)
• include/vfs/vfs.h (modified) (1 diff)

uspace/lib/c/generic/devmap.c

@@ -132 +132 @@
  *
  */
-int devmap_device_register(const char *fqdn, dev_handle_t *handle)
+int devmap_device_register(const char *fqdn, devmap_handle_t *handle)
 {
         int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
@@ -163 +163 @@
         
         if (handle != NULL)
-                *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
         
         return retval;
 }
 
-int devmap_device_get_handle(const char *fqdn, dev_handle_t *handle, unsigned int flags)
+int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, unsigned int flags)
 {
         int phone = devmap_get_phone(DEVMAP_CLIENT, flags);
@@ -194 +194 @@
         if (retval != EOK) {
                 if (handle != NULL)
-                        *handle = (dev_handle_t) -1;
+                        *handle = (devmap_handle_t) -1;
                 return retval;
         }
         
         if (handle != NULL)
-                *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
         
         return retval;
 }
 
-int devmap_namespace_get_handle(const char *name, dev_handle_t *handle, unsigned int flags)
+int devmap_namespace_get_handle(const char *name, devmap_handle_t *handle, unsigned int flags)
 {
         int phone = devmap_get_phone(DEVMAP_CLIENT, flags);
@@ -230 +230 @@
         if (retval != EOK) {
                 if (handle != NULL)
-                        *handle = (dev_handle_t) -1;
+                        *handle = (devmap_handle_t) -1;
                 return retval;
         }
         
         if (handle != NULL)
-                *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
         
         return retval;
 }
 
-devmap_handle_type_t devmap_handle_probe(dev_handle_t handle)
+devmap_handle_type_t devmap_handle_probe(devmap_handle_t handle)
 {
         int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
@@ -255 +255 @@
 }
 
-int devmap_device_connect(dev_handle_t handle, unsigned int flags)
+int devmap_device_connect(devmap_handle_t handle, unsigned int flags)
 {
         int phone;
@@ -305 +305 @@
 }
 
-static size_t devmap_count_devices_internal(int phone, dev_handle_t ns_handle)
+static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
 {
         ipcarg_t count;
@@ -325 +325 @@
 }
 
-size_t devmap_count_devices(dev_handle_t ns_handle)
+size_t devmap_count_devices(devmap_handle_t ns_handle)
 {
         int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
@@ -387 +387 @@
 }
 
-size_t devmap_get_devices(dev_handle_t ns_handle, dev_desc_t **data)
+size_t devmap_get_devices(devmap_handle_t ns_handle, dev_desc_t **data)
 {
         int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);

uspace/lib/c/generic/vfs/vfs.c

@@ -136 +136 @@
         }
         
-        dev_handle_t dev_handle;
-        int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+        devmap_handle_t devmap_handle;
+        int res = devmap_device_get_handle(fqdn, &devmap_handle, flags);
         if (res != EOK) {
                 if (null_id != -1)
@@ -159 +159 @@
         
         ipcarg_t rc_orig;
-        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, devmap_handle, flags, NULL);
         ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -328 +328 @@
         ipc_call_t answer;
         aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle,
-            node->dev_handle, node->index, oflag, &answer);
+            node->devmap_handle, node->index, oflag, &answer);
         
         ipcarg_t rc;
@@ -797 +797 @@
         if (rc == EOK) {
                 node->fs_handle = stat.fs_handle;
-                node->dev_handle = stat.dev_handle;
+                node->devmap_handle = stat.devmap_handle;
                 node->index = stat.index;
         }

uspace/lib/c/include/devmap.h

@@ -44 +44 @@
 
 extern int devmap_driver_register(const char *, async_client_conn_t);
-extern int devmap_device_register(const char *, dev_handle_t *);
+extern int devmap_device_register(const char *, devmap_handle_t *);
 
-extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int);
-extern int devmap_namespace_get_handle(const char *, dev_handle_t *, unsigned int);
-extern devmap_handle_type_t devmap_handle_probe(dev_handle_t);
+extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);
+extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int);
+extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
 
-extern int devmap_device_connect(dev_handle_t, unsigned int);
+extern int devmap_device_connect(devmap_handle_t, unsigned int);
 
 extern int devmap_null_create(void);
@@ -56 +56 @@
 
 extern size_t devmap_count_namespaces(void);
-extern size_t devmap_count_devices(dev_handle_t);
+extern size_t devmap_count_devices(devmap_handle_t);
 
 extern size_t devmap_get_namespaces(dev_desc_t **);
-extern size_t devmap_get_devices(dev_handle_t, dev_desc_t **);
+extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
 
 #endif

uspace/lib/c/include/ipc/devmap.h

@@ -40 +40 @@
 #define DEVMAP_NAME_MAXLEN  255
 
-typedef ipcarg_t dev_handle_t;
+typedef ipcarg_t devmap_handle_t;
 
 typedef enum {
@@ -81 +81 @@
 
 typedef struct {
-        dev_handle_t handle;
+        devmap_handle_t handle;
         char name[DEVMAP_NAME_MAXLEN + 1];
 } dev_desc_t;

uspace/lib/c/include/sys/stat.h

@@ -43 +43 @@
 struct stat {
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         fs_index_t index;
         unsigned int lnkcnt;
@@ -49 +49 @@
         bool is_directory;
         aoff64_t size;
-        dev_handle_t device;
+        devmap_handle_t device;
 };
 

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

@@ -47 +47 @@
 typedef struct {
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         fs_index_t index;
 } fdi_node_t;