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

Timestamp:

2011-06-17T16:48: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:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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

@@ -361 +361 @@
                         if (default_handler != NULL) {
                                 (*default_handler)(fun, callid, &call);
-                                break;
+                                continue;
                         }
                         
@@ -372 +372 @@
                             driver->name, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -384 +384 @@
                             "with id %d.\n", handle, iface_idx);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -403 +403 @@
                             "invalid interface method.", driver->name);
                         async_answer_0(callid, ENOTSUP);
-                        break;
+                        continue;
                 }
                 
@@ -413 +413 @@
                  */
                 (*iface_method_ptr)(fun, ops, callid, &call);
-                break;
         }
 }
@@ -428 +427 @@
 
 /** 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 */