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

Timestamp:

2013-09-13T00:36:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

• uspace/lib/drv/generic/driver.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -98 +98 @@
 static ddf_dev_t *driver_get_device(devman_handle_t handle)
 {
-        ddf_dev_t *dev = NULL;
-        
         assert(fibril_mutex_is_locked(&devices_mutex));
         
-        list_foreach(devices, link) {
-                dev = list_get_instance(link, ddf_dev_t, link);
+        list_foreach(devices, link, ddf_dev_t, dev) {
                 if (dev->handle == handle)
                         return dev;
@@ -113 +110 @@
 static ddf_fun_t *driver_get_function(devman_handle_t handle)
 {
-        ddf_fun_t *fun = NULL;
-        
         assert(fibril_mutex_is_locked(&functions_mutex));
         
-        list_foreach(functions, link) {
-                fun = list_get_instance(link, ddf_fun_t, link);
+        list_foreach(functions, link, ddf_fun_t, fun) {
                 if (fun->handle == handle)
                         return fun;