Changeset 3842a955 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-06-19T15:59:42Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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/drv/generic/driver.c (modified) (6 diffs)

uspace/lib/drv/generic/driver.c

@@ -139 +139 @@
 find_interrupt_context_by_id(interrupt_context_list_t *list, int id)
 {
+        interrupt_context_t *ctx;
+        
         fibril_mutex_lock(&list->mutex);
         
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
+        list_foreach(list->contexts, link) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->id == id) {
@@ -150 +149 @@
                         return ctx;
                 }
-                link = link->next;
         }
         
@@ -160 +158 @@
 find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
+        interrupt_context_t *ctx;
+        
         fibril_mutex_lock(&list->mutex);
         
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
+        list_foreach(list->contexts, link) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->irq == irq && ctx->dev == dev) {
@@ -171 +168 @@
                         return ctx;
                 }
-                link = link->next;
         }
         
@@ -231 +227 @@
 }
 
-static ddf_fun_t *driver_get_function(link_t *functions, devman_handle_t handle)
+static ddf_fun_t *driver_get_function(list_t *functions, devman_handle_t handle)
 {
         ddf_fun_t *fun = NULL;
         
         fibril_mutex_lock(&functions_mutex);
-        link_t *link = functions->next;
-        
-        while (link != functions) {
+        
+        list_foreach(*functions, link) {
                 fun = list_get_instance(link, ddf_fun_t, link);
                 if (fun->handle == handle) {
@@ -244 +239 @@
                         return fun;
                 }
-                
-                link = link->next;
         }