Changeset 5863a95 in mainline for uspace/drv

Timestamp:

2010-12-17T08:59:35Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

58854f2

Parents:

70e5ad5 (diff), 11658b64 (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 development/ changes

Location:

uspace/drv

Files:

• ns8250/ns8250.c (modified) (1 diff)
• vhc/conn.h (modified) (1 diff)
• vhc/conndev.c (modified) (2 diffs)
• vhc/debug.c (modified) (1 diff)
• vhc/devices.c (modified) (1 diff)
• vhc/vhcd.h (modified) (1 diff)

uspace/drv/ns8250/ns8250.c

@@ -887 +887 @@
     ipc_call_t *call)
 {
-        ipcarg_t method = IPC_GET_METHOD(*call);
+        sysarg_t method = IPC_GET_IMETHOD(*call);
         int ret;
         unsigned int baud_rate, parity, word_length, stop_bits;

uspace/drv/vhc/conn.h

@@ -42 +42 @@
 #include "devices.h"
 
-void connection_handler_host(ipcarg_t);
+void connection_handler_host(sysarg_t);
 
 usb_hcd_transfer_ops_t vhc_transfer_ops;

uspace/drv/vhc/conndev.c

@@ -47 +47 @@
 {
         ipc_call_t answer_data;
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         aid_t req;
         int rc;
@@ -83 +83 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        ipcarg_t method = IPC_GET_METHOD(*icall);
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
 
         if (method == IPC_M_CONNECT_TO_ME) {

uspace/drv/vhc/debug.c

@@ -42 +42 @@
 /** Debug print informing of invalid call.
  */
-void dprintf_inval_call(int level, ipc_call_t call, ipcarg_t phone_hash)
+void dprintf_inval_call(int level, ipc_call_t call, sysarg_t phone_hash)
 {
         dprintf(level, "phone%#x: invalid call [%u (%u, %u, %u, %u, %u)]",
             phone_hash,
-            IPC_GET_METHOD(call),
+            IPC_GET_IMETHOD(call),
             IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call),
             IPC_GET_ARG4(call), IPC_GET_ARG5(call));

uspace/drv/vhc/devices.c

@@ -100 +100 @@
                 
                 ipc_call_t answer_data;
-                ipcarg_t answer_rc;
+                sysarg_t answer_rc;
                 aid_t req;
                 int rc = EOK;

uspace/drv/vhc/vhcd.h

@@ -47 +47 @@
 #define dprintf(level, format, ...) \
         usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
-void dprintf_inval_call(int, ipc_call_t, ipcarg_t);
+void dprintf_inval_call(int, ipc_call_t, sysarg_t);
 
 #endif