Changeset 89c57b6 in mainline for uspace/lib/c/generic/clipboard.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/c/generic/clipboard.c (modified) (6 diffs)

uspace/lib/c/generic/clipboard.c

@@ -39 +39 @@
 
 #include <clipboard.h>
+#include <ipc/ns.h>
 #include <ipc/services.h>
 #include <ipc/clipboard.h>
@@ -54 +55 @@
 {
         while (clip_phone < 0)
-                clip_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_CLIPBOARD, 0, 0);
+                clip_phone = service_connect_blocking(SERVICE_CLIPBOARD, 0, 0);
 }
 
@@ -75 +76 @@
                 clip_connect();
                 
-                ipcarg_t rc = async_req_1_0(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE);
+                sysarg_t rc = async_req_1_0(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE);
                 
                 async_serialize_end();
@@ -85 +86 @@
                 
                 aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, NULL);
-                ipcarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
+                sysarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
                 if (rc != EOK) {
-                        ipcarg_t rc_orig;
+                        sysarg_t rc_orig;
                         async_wait_for(req, &rc_orig);
                         async_serialize_end();
@@ -119 +120 @@
                 clip_connect();
                 
-                ipcarg_t size;
-                ipcarg_t tag;
-                ipcarg_t rc = async_req_0_2(clip_phone, CLIPBOARD_CONTENT, &size, &tag);
+                sysarg_t size;
+                sysarg_t tag;
+                sysarg_t rc = async_req_0_2(clip_phone, CLIPBOARD_CONTENT, &size, &tag);
                 
                 async_serialize_end();
@@ -158 +159 @@
                         
                         if (rc != EOK) {
-                                ipcarg_t rc_orig;
+                                sysarg_t rc_orig;
                                 async_wait_for(req, &rc_orig);
                                 async_serialize_end();