Changeset feeac0d in mainline for uspace/lib/drv

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

uspace/lib/drv/generic

Files:

• driver.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -98 +98 @@
 static ddf_dev_t *driver_get_device(devman_handle_t handle)
 {
-        ddf_dev_t *dev = NULL;
-        
         assert(fibril_mutex_is_locked(&devices_mutex));
         
-        list_foreach(devices, link) {
-                dev = list_get_instance(link, ddf_dev_t, link);
+        list_foreach(devices, link, ddf_dev_t, dev) {
                 if (dev->handle == handle)
                         return dev;
@@ -113 +110 @@
 static ddf_fun_t *driver_get_function(devman_handle_t handle)
 {
-        ddf_fun_t *fun = NULL;
-        
         assert(fibril_mutex_is_locked(&functions_mutex));
         
-        list_foreach(functions, link) {
-                fun = list_get_instance(link, ddf_fun_t, link);
+        list_foreach(functions, link, ddf_fun_t, fun) {
                 if (fun->handle == handle)
                         return fun;

uspace/lib/drv/generic/interrupt.c

@@ -138 +138 @@
     interrupt_context_list_t *list, int id)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->id == id) {
                         fibril_mutex_unlock(&list->mutex);
@@ -157 +154 @@
     interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->irq == irq && ctx->dev == dev) {
                         fibril_mutex_unlock(&list->mutex);