Changeset b72efe8 in mainline for uspace/srv/devman

Timestamp:

2011-06-19T14:38:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

74464e8

Parents:

1d1bb0f

Message:

Separate list_t typedef from link_t (user-space part).

• list_t represents lists
• Use list_first(), list_last(), list_empty() where appropriate
• Use list_foreach() where possible
• assert_link_not_used()
• usb_hid_report_path_free() shall not unlink the path, caller must do it

Location:

uspace/srv/devman

Files:

• devman.c (modified) (9 diffs)
• devman.h (modified) (6 diffs)
• match.c (modified) (2 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);

uspace/srv/devman/devman.h

@@ -96 +96 @@
         /** List of device ids for device-to-driver matching. */
         match_id_list_t match_ids;
-        /** Pointer to the linked list of devices controlled by this driver. */
-        link_t devices;
+        /** List of devices controlled by this driver. */
+        list_t devices;
         
         /**
@@ -108 +108 @@
 typedef struct driver_list {
         /** List of drivers */
-        link_t drivers;
+        list_t drivers;
         /** Fibril mutex for list of drivers. */
         fibril_mutex_t drivers_mutex;
@@ -130 +130 @@
         
         /** List of device functions. */
-        link_t functions;
+        list_t functions;
         /** Driver of this device. */
         driver_t *drv;
@@ -170 +170 @@
         match_id_list_t match_ids;
         
-        /** The list of device classes to which this device function belongs. */
-        link_t classes;
+        /** List of device classes to which this device function belongs. */
+        list_t classes;
         /** Devmap handle if the device function is registered by devmap. */
         devmap_handle_t devmap_handle;
@@ -228 +228 @@
          * this class.
          */
-        link_t devices;
+        list_t devices;
         
         /**
@@ -280 +280 @@
 typedef struct class_list {
         /** List of classes. */
-        link_t classes;
+        list_t classes;
         
         /**

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;