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

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

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)
 {
+        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;
         }
         
@@ -324 +317 @@
         }
         
+        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
@@ -361 +360 @@
                         if (default_handler != NULL) {
                                 (*default_handler)(fun, callid, &call);
-                                break;
+                                continue;
                         }
                         
@@ -372 +371 @@
                             driver->name, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -384 +383 @@
                             "with id %d.\n", handle, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -403 +402 @@
                             "invalid interface method.", driver->name);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -413 +412 @@
                  */
                 (*iface_method_ptr)(fun, ops, callid, &call);
-                break;
         }
 }
@@ -428 +426 @@
 
 /** Function for handling connections to device driver. */
-static void driver_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Select interface */