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

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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) (7 diffs)

uspace/lib/drv/generic/driver.c

@@ -81 +81 @@
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
 {
-        int id = (int)IPC_GET_METHOD(*icall);
+        int id = (int)IPC_GET_IMETHOD(*icall);
         interrupt_context_t *ctx;
         
@@ -200 +200 @@
                 ipc_callid_t callid = async_get_call(&call);
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -254 +254 @@
                 ipc_call_t call;
                 callid = async_get_call(&call);
-                ipcarg_t method = IPC_GET_METHOD(call);
+                sysarg_t method = IPC_GET_IMETHOD(call);
                 int iface_idx;
                 
@@ -308 +308 @@
 
                         /* get the method of the remote interface */
-                        ipcarg_t iface_method_idx = IPC_GET_ARG1(call);
+                        sysarg_t iface_method_idx = IPC_GET_ARG1(call);
                         remote_iface_func_ptr_t iface_method_ptr =
                             get_remote_method(rem_iface, iface_method_idx);
@@ -346 +346 @@
 {
         /* Select interface */
-        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
+        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
         case DRIVER_DEVMAN:
                 /* handle PnP events from device manager */
@@ -418 +418 @@
                 goto failure;
 
-        goto leave;
+        return EOK;
 
 failure:
@@ -431 +431 @@
         }
 
-leave:
         return rc;
 }