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

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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) (5 diffs)

uspace/lib/drv/generic/driver.c

@@ -63 +63 @@
 
 /** Driver structure */
-static driver_t *driver;
+static const driver_t *driver;
 
 /** Devices */
@@ -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;
@@ -419 +413 @@
                  * handling ("remote interface").
                  */
-                remote_iface_t *rem_iface = get_remote_iface(iface_idx);
+                const remote_iface_t *rem_iface = get_remote_iface(iface_idx);
                 assert(rem_iface != NULL);
                 
@@ -962 +956 @@
 }
 
-int ddf_driver_main(driver_t *drv)
+int ddf_driver_main(const driver_t *drv)
 {
         /*