Changes in uspace/lib/drv/generic/driver.c [ff65e91:79ae36dd] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (13 diffs)

uspace/lib/drv/generic/driver.c

@@ -139 +139 @@
 find_interrupt_context_by_id(interrupt_context_list_t *list, int id)
 {
+        fibril_mutex_lock(&list->mutex);
+        
+        link_t *link = list->contexts.next;
         interrupt_context_t *ctx;
         
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
+        while (link != &list->contexts) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->id == id) {
@@ -149 +150 @@
                         return ctx;
                 }
+                link = link->next;
         }
         
@@ -158 +160 @@
 find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
+        fibril_mutex_lock(&list->mutex);
+        
+        link_t *link = list->contexts.next;
         interrupt_context_t *ctx;
         
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
+        while (link != &list->contexts) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->irq == irq && ctx->dev == dev) {
@@ -168 +171 @@
                         return ctx;
                 }
+                link = link->next;
         }
         
@@ -227 +231 @@
 }
 
-static ddf_fun_t *driver_get_function(list_t *functions, devman_handle_t handle)
+static ddf_fun_t *driver_get_function(link_t *functions, devman_handle_t handle)
 {
         ddf_fun_t *fun = NULL;
         
         fibril_mutex_lock(&functions_mutex);
-        
-        list_foreach(*functions, link) {
+        link_t *link = functions->next;
+        
+        while (link != functions) {
                 fun = list_get_instance(link, ddf_fun_t, link);
                 if (fun->handle == handle) {
@@ -239 +244 @@
                         return fun;
                 }
+                
+                link = link->next;
         }
         
@@ -317 +324 @@
         }
         
-        if (fun->conn_handler != NULL) {
-                /* Driver has a custom connection handler. */
-                (*fun->conn_handler)(iid, icall, (void *)fun);
-                return;
-        }
-        
         /*
          * TODO - if the client is not a driver, check whether it is allowed to
@@ -360 +361 @@
                         if (default_handler != NULL) {
                                 (*default_handler)(fun, callid, &call);
-                                continue;
+                                break;
                         }
                         
@@ -371 +372 @@
                             driver->name, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        continue;
+                        break;
                 }
                 
@@ -383 +384 @@
                             "with id %d.\n", handle, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        continue;
+                        break;
                 }
                 
@@ -402 +403 @@
                             "invalid interface method.", driver->name);
                         async_answer_0(callid, ENOTSUP);
-                        continue;
+                        break;
                 }
                 
@@ -412 +413 @@
                  */
                 (*iface_method_ptr)(fun, ops, callid, &call);
+                break;
         }
 }
@@ -426 +428 @@
 
 /** Function for handling connections to device driver. */
-static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void driver_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Select interface */