Changeset 08f747e in mainline for uspace/srv/devman/match.c

Timestamp:

2010-11-26T21:49:30Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8e423a2d, dac43be

Parents:

e4dbfda (diff), da55d5b (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 development/ changes

File:

• uspace/srv/devman/match.c (modified) (2 diffs)

uspace/srv/devman/match.c

@@ -35 +35 @@
 #include "devman.h"
 
+/** Compute compound score of driver and device.
+ *
+ * @param driver Match id of the driver.
+ * @param device Match id of the device.
+ * @return Compound score.
+ * @retval 0 No match at all.
+ */
+static int compute_match_score(match_id_t *driver, match_id_t *device)
+{
+        if (str_cmp(driver->id, device->id) == 0) {
+                /*
+                 * The strings matches, return their score multiplied.
+                 */
+                return driver->score * device->score;
+        } else {
+                /*
+                 * Different strings, return zero.
+                 */
+                return 0;
+        }
+}
+
 int get_match_score(driver_t *drv, node_t *dev)
 {
@@ -44 +66 @@
         
         /*
-         * Find first matching pair.
+         * Go through all pairs, return the highest score obtainetd.
          */
+        int highest_score = 0;
+        
         link_t *drv_link = drv->match_ids.ids.next;
         while (drv_link != drv_head) {
-                link_t *dev_link = dev->match_ids.ids.next;
+                link_t *dev_link = dev_head->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;
+                        
+                        int score = compute_match_score(drv_id, dev_id);
+                        if (score > highest_score) {
+                                highest_score = score;
                         }
 
                         dev_link = dev_link->next;
                 }
+                
                 drv_link = drv_link->next;
         }
         
-        return 0;
+        return highest_score;
 }