Changeset b12d3cc in mainline

Timestamp:

2010-11-26T14:56:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

da55d5b

Parents:

bbe7848 (diff), 0d6915f (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 ddf-fixes branch

Location:

uspace

Files:

• lib/drv/generic/driver.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)
• srv/devman/match.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -165 +165 @@
         
         devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
+    
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -172 +174 @@
         
         add_to_devices_list(dev);
+        dev->parent = driver_get_device(&devices, parent_dev_handle);
+        
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {

uspace/srv/devman/devman.c

@@ -651 +651 @@
         
         /* Send the device to the driver. */
-        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
-            &answer);
+        devman_handle_t parent_handle;
+        if (node->parent) {
+                parent_handle = node->parent->handle;
+        } else {
+                parent_handle = 0;
+        }
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
+            parent_handle, &answer);
         
         /* Send the device's name to the driver. */

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;
 }