Changeset a9b6bec in mainline for uspace/lib/drv/generic

Timestamp:

2010-12-14T20:19:41Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

11658b64

Parents:

37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

Location:

uspace/lib/drv/generic

Files:

• dev_iface.c (modified) (1 diff)
• driver.c (modified) (5 diffs)
• remote_usbhc.c (modified) (3 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -56 +56 @@
 
 remote_iface_func_ptr_t
-get_remote_method(remote_iface_t *rem_iface, ipcarg_t iface_method_idx)
+get_remote_method(remote_iface_t *rem_iface, sysarg_t iface_method_idx)
 {
         if (iface_method_idx >= rem_iface->method_count) {

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 */

uspace/lib/drv/generic/remote_usbhc.c

@@ -122 +122 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
+        sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
         async_transaction_t * trans = (async_transaction_t *)buffer_hash;
         if (trans == NULL) {
@@ -197 +197 @@
                 ipc_answer_0(callid, rc);
         } else {
-                ipc_answer_1(callid, EOK, (ipcarg_t) address);
+                ipc_answer_1(callid, EOK, (sysarg_t) address);
         }
 }
@@ -254 +254 @@
 
         // FIXME - answer according to outcome
-        ipc_answer_1(trans->caller, EOK, (ipcarg_t)trans);
+        ipc_answer_1(trans->caller, EOK, (sysarg_t)trans);
 
         trans->size = actual_size;