Changeset f1fae414 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2011-06-22T01:34:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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 mainline changes.

File:

• uspace/lib/c/generic/devman.c (modified) (4 diffs)

uspace/lib/c/generic/devman.c

@@ -35 +35 @@
  */
 
+#include <adt/list.h>
 #include <str.h>
 #include <ipc/services.h>
@@ -194 +195 @@
         
         exch = devman_exchange_begin(DEVMAN_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0, NULL);
+        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
         devman_exchange_end(exch);
         
@@ -231 +232 @@
         }
         
-        link_t *link = match_ids->ids.next;
         match_id_t *match_id = NULL;
         
-        while (link != &match_ids->ids) {
+        list_foreach(match_ids->ids, link) {
                 match_id = list_get_instance(link, match_id_t, link);
                 
@@ -255 +255 @@
                         return retval;
                 }
-                
-                link = link->next;
         }