Changeset 3842a955 in mainline for uspace/srv/devman/match.c

Timestamp:

2011-06-19T15:59:42Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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/srv/devman/match.c (modified) (2 diffs)

uspace/srv/devman/match.c

@@ -59 +59 @@
 int get_match_score(driver_t *drv, dev_node_t *dev)
 {
-        link_t *drv_head = &drv->match_ids.ids;
-        link_t *dev_head = &dev->pfun->match_ids.ids;
+        link_t *drv_head = &drv->match_ids.ids.head;
+        link_t *dev_head = &dev->pfun->match_ids.ids.head;
         
-        if (list_empty(drv_head) || list_empty(dev_head))
+        if (list_empty(&drv->match_ids.ids) ||
+            list_empty(&dev->pfun->match_ids.ids)) {
                 return 0;
+        }
         
         /*
@@ -70 +72 @@
         int highest_score = 0;
         
-        link_t *drv_link = drv->match_ids.ids.next;
+        link_t *drv_link = drv->match_ids.ids.head.next;
         while (drv_link != drv_head) {
                 link_t *dev_link = dev_head->next;