Changeset fdbc3ff in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2010-11-19T23:50:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/drv/generic/driver.c (modified) (3 diffs)

uspace/lib/drv/generic/driver.c

@@ -139 +139 @@
 }
 
-static device_t * driver_get_device(link_t *devices, device_handle_t handle)
+static device_t * driver_get_device(link_t *devices, devman_handle_t handle)
 {
         device_t *dev = NULL;
@@ -163 +163 @@
         int res = EOK;
         
-        device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -221 +221 @@
          * the device to which the client connected.
          */
-        device_handle_t handle = IPC_GET_ARG2(*icall);
+        devman_handle_t handle = IPC_GET_ARG2(*icall);
         device_t *dev = driver_get_device(&devices, handle);