Changes in uspace/srv/devman/devman.c [b72efe8:c7bbf029] in mainline

File:

• uspace/srv/devman/devman.c (modified) (17 diffs)

uspace/srv/devman/devman.c

@@ -466 +466 @@
         fibril_mutex_lock(&drivers_list->drivers_mutex);
         
-        list_foreach(drivers_list->drivers, link) {
+        link_t *link = drivers_list->drivers.next;
+        while (link != &drivers_list->drivers) {
                 drv = list_get_instance(link, driver_t, drivers);
                 score = get_match_score(drv, node);
@@ -473 +474 @@
                         best_drv = drv;
                 }
+                link = link->next;
         }
         
@@ -534 +536 @@
         driver_t *res = NULL;
         driver_t *drv = NULL;
+        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        list_foreach(drv_list->drivers, link) {
+        link = drv_list->drivers.next;
+        while (link != &drv_list->drivers) {
                 drv = list_get_instance(link, driver_t, drivers);
                 if (str_cmp(drv->name, drv_name) == 0) {
@@ -543 +547 @@
                         break;
                 }
+
+                link = link->next;
         }
         
@@ -558 +564 @@
         dev_node_t *dev;
         link_t *link;
+        int phone;
 
         log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
@@ -563 +570 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-        
-        async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-            DRIVER_DEVMAN, 0, 0);
-        async_exchange_end(exch);
-
-        if (!sess) {
+
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+
+        if (phone < 0) {
                 fibril_mutex_unlock(&driver->driver_mutex);
                 return;
@@ -578 +582 @@
          * that has not been passed to the driver.
          */
-        link = driver->devices.head.next;
-        while (link != &driver->devices.head) {
+        link = driver->devices.next;
+        while (link != &driver->devices) {
                 dev = list_get_instance(link, dev_node_t, driver_devices);
                 if (dev->passed_to_driver) {
@@ -598 +602 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(sess, driver, dev, tree);
+                add_device(phone, driver, dev, tree);
 
                 /*
@@ -616 +620 @@
                  * Restart the cycle to go through all devices again.
                  */
-                link = driver->devices.head.next;
-        }
-
-        async_hangup(sess);
+                link = driver->devices.next;
+        }
+
+        async_hangup(phone);
 
         /*
@@ -669 +673 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->sess = NULL;
+        drv->phone = -1;
 }
 
@@ -733 +737 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
-    dev_tree_t *tree)
+void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -743 +746 @@
             drv->name, dev->pfun->name);
         
+        sysarg_t rc;
+        ipc_call_t answer;
+        
         /* Send the device to the driver. */
         devman_handle_t parent_handle;
@@ -750 +756 @@
                 parent_handle = 0;
         }
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle,
+
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle,
             parent_handle, &answer);
         
-        /* Send the device name to the driver. */
-        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
+        /* Send the device's name to the driver. */
+        rc = async_data_write_start(phone, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
-        
-        async_exchange_end(exch);
-        
         if (rc != EOK) {
                 /* TODO handle error */
@@ -823 +823 @@
         if (is_running) {
                 /* Notify the driver about the new device. */
-                async_exch_t *exch = async_exchange_begin(drv->sess);
-                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-                    DRIVER_DEVMAN, 0, 0);
-                async_exchange_end(exch);
-                
-                if (sess) {
-                        add_device(sess, drv, dev, tree);
-                        async_hangup(sess);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone >= 0) {
+                        add_device(phone, drv, dev, tree);
+                        async_hangup(phone);
                 }
         }
@@ -1181 +1177 @@
 
         fun_node_t *fun;
-
-        list_foreach(dev->functions, link) {
+        link_t *link;
+
+        for (link = dev->functions.next;
+            link != &dev->functions;
+            link = link->next) {
                 fun = list_get_instance(link, fun_node_t, dev_functions);
 
@@ -1376 +1375 @@
 {
         dev_class_t *cl;
-        
-        list_foreach(class_list->classes, link) {
+        link_t *link = class_list->classes.next;
+        
+        while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
                 if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
                 }
+                link = link->next;
         }
         
@@ -1397 +1398 @@
         assert(dev_name != NULL);
 
-        list_foreach(dev_class->devices, link) {
+        link_t *link;
+        for (link = dev_class->devices.next;
+            link != &dev_class->devices;
+            link = link->next) {
                 dev_class_info_t *dev = list_get_instance(link,
                     dev_class_info_t, link);