Changeset cb569e6 in mainline for uspace/lib/c/generic/devmap.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (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.

File:

• uspace/lib/c/generic/devmap.c (modified) (8 diffs)

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);