Changeset e4f8c77 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• uspace/srv/devman/devman.c (modified) (9 diffs)

uspace/srv/devman/devman.c

@@ -466 +466 @@
         fibril_mutex_lock(&drivers_list->drivers_mutex);
         
-        link_t *link = drivers_list->drivers.next;
-        while (link != &drivers_list->drivers) {
+        list_foreach(drivers_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 score = get_match_score(drv, node);
@@ -474 +473 @@
                         best_drv = drv;
                 }
-                link = link->next;
         }
         
@@ -536 +534 @@
         driver_t *res = NULL;
         driver_t *drv = NULL;
-        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        link = drv_list->drivers.next;
-        while (link != &drv_list->drivers) {
+        list_foreach(drv_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 if (str_cmp(drv->name, drv_name) == 0) {
@@ -547 +543 @@
                         break;
                 }
-
-                link = link->next;
         }
         
@@ -584 +578 @@
          * that has not been passed to the driver.
          */
-        link = driver->devices.next;
-        while (link != &driver->devices) {
+        link = driver->devices.head.next;
+        while (link != &driver->devices.head) {
                 dev = list_get_instance(link, dev_node_t, driver_devices);
                 if (dev->passed_to_driver) {
@@ -622 +616 @@
                  * Restart the cycle to go through all devices again.
                  */
-                link = driver->devices.next;
+                link = driver->devices.head.next;
         }
 
@@ -1187 +1181 @@
 
         fun_node_t *fun;
-        link_t *link;
-
-        for (link = dev->functions.next;
-            link != &dev->functions;
-            link = link->next) {
+
+        list_foreach(dev->functions, link) {
                 fun = list_get_instance(link, fun_node_t, dev_functions);
 
@@ -1385 +1376 @@
 {
         dev_class_t *cl;
-        link_t *link = class_list->classes.next;
-        
-        while (link != &class_list->classes) {
+        
+        list_foreach(class_list->classes, link) {
                 cl = list_get_instance(link, dev_class_t, link);
                 if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
                 }
-                link = link->next;
         }
         
@@ -1408 +1397 @@
         assert(dev_name != NULL);
 
-        link_t *link;
-        for (link = dev_class->devices.next;
-            link != &dev_class->devices;
-            link = link->next) {
+        list_foreach(dev_class->devices, link) {
                 dev_class_info_t *dev = list_get_instance(link,
                     dev_class_info_t, link);