Changeset 973ef9fc in mainline for uspace/srv/clip/clip.c

Timestamp:

2010-12-25T21:20:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/srv/clip/clip.c (modified) (5 diffs)

uspace/srv/clip/clip.c

@@ -118 +118 @@
                 }
                 
-                ipcarg_t retval = async_data_read_finalize(callid, clip_data, size);
+                sysarg_t retval = async_data_read_finalize(callid, clip_data, size);
                 if (retval != EOK) {
                         ipc_answer_0(rid, retval);
@@ -145 +145 @@
         
         fibril_mutex_unlock(&clip_mtx);
-        ipc_answer_2(rid, EOK, (ipcarg_t) size, (ipcarg_t) tag);
+        ipc_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
 }
 
@@ -158 +158 @@
                 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;
@@ -172 +172 @@
                         break;
                 default:
-                        if (!(callid & IPC_CALLID_NOTIFICATION))
-                                ipc_answer_0(callid, ENOENT);
+                        ipc_answer_0(callid, ENOENT);
                 }
         }
@@ -184 +183 @@
         async_set_client_connection(clip_connection);
         
-        ipcarg_t phonead;
+        sysarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_CLIPBOARD, 0, 0, &phonead) != 0) 
                 return -1;