Changeset 1fe9bf6 in mainline for uspace/srv/devman/match.c

Timestamp:

2010-11-21T17:13:32Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

31860b7

Parents:

8b3bff5 (diff), 4087a33 (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:

Merged updates from HelenOS mainline + changes from branch

/vojtechhorky/ddf_proposal/

File:

• uspace/srv/devman/match.c (modified) (1 diff)

uspace/srv/devman/match.c

@@ -43 +43 @@
                 return 0;
         
+        /*
+         * Find first matching pair.
+         */
         link_t *drv_link = drv->match_ids.ids.next;
-        link_t *dev_link = dev->match_ids.ids.next;
-        
-        match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
-        match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
-        
-        int score_next_drv = 0;
-        int score_next_dev = 0;
-        
-        do {
-                match_id_t *tmp_ma_id;
-        
-                if (str_cmp(drv_id->id, dev_id->id) == 0) {
-                        /*
-                         * We found a match.
-                         * Return the score of the match.
-                         */
-                        return drv_id->score * dev_id->score;
+        while (drv_link != drv_head) {
+                link_t *dev_link = dev->match_ids.ids.next;
+                while (dev_link != dev_head) {
+                        match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
+                        match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
+
+                        if (str_cmp(drv_id->id, dev_id->id) == 0) {
+                                /*
+                                 * We found a match.
+                                 * Return the score of the match.
+                                 */
+                                return drv_id->score * dev_id->score;
+                        }
+
+                        dev_link = dev_link->next;
                 }
-                
-                /*
-                 * Compute the next score we get, if we advance in the driver's
-                 * list of match ids.
-                 */
-                if (drv_link->next != drv_head) {
-                        tmp_ma_id = list_get_instance(drv_link->next,
-                            match_id_t, link);
-                        score_next_drv = dev_id->score * tmp_ma_id->score;
-                } else {
-                        score_next_drv = 0;
-                }
-                
-                /*
-                 * Compute the next score we get, if we advance in the device's
-                 * list of match ids.
-                 */
-                if (dev_link->next != dev_head) {
-                        tmp_ma_id = list_get_instance(dev_link->next,
-                            match_id_t, link);
-                        score_next_dev = drv_id->score * tmp_ma_id->score;
-                } else {
-                        score_next_dev = 0;
-                }
-                
-                /*
-                 * Advance in one of the two lists, so we get the next highest
-                 * score.
-                 */
-                if (score_next_drv > score_next_dev) {
-                        drv_link = drv_link->next;
-                        drv_id = list_get_instance(drv_link, match_id_t, link);
-                } else {
-                        dev_link = dev_link->next;
-                        dev_id = list_get_instance(dev_link, match_id_t, link);
-                }
-                
-        } while (drv_link->next != drv_head && dev_link->next != dev_head);
+                drv_link = drv_link->next;
+        }
         
         return 0;