Changeset 8b5690f in mainline for uspace/srv/clip/clip.c

Timestamp:

2011-02-03T05:11:01Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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) (12 diffs)

uspace/srv/clip/clip.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <bool.h>
-#include <ipc/ipc.h>
 #include <async.h>
+#include <ipc/ns.h>
 #include <ipc/services.h>
 #include <ipc/clipboard.h>
@@ -62 +62 @@
                 
                 fibril_mutex_unlock(&clip_mtx);
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 break;
         case CLIPBOARD_TAG_DATA:
                 rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size);
                 if (rc != EOK) {
-                        ipc_answer_0(rid, rc);
+                        async_answer_0(rid, rc);
                         break;
                 }
@@ -81 +81 @@
                 
                 fibril_mutex_unlock(&clip_mtx);
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
                 break;
         default:
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
         }
 }
@@ -99 +99 @@
         case CLIPBOARD_TAG_DATA:
                 if (!async_data_read_receive(&callid, &size)) {
-                        ipc_answer_0(callid, EINVAL);
-                        ipc_answer_0(rid, EINVAL);
+                        async_answer_0(callid, EINVAL);
+                        async_answer_0(rid, EINVAL);
                         break;
                 }
@@ -106 +106 @@
                 if (clip_tag != CLIPBOARD_TAG_DATA) {
                         /* So far we only understand binary data */
-                        ipc_answer_0(callid, EOVERFLOW);
-                        ipc_answer_0(rid, EOVERFLOW);
+                        async_answer_0(callid, EOVERFLOW);
+                        async_answer_0(rid, EOVERFLOW);
                         break;
                 }
@@ -113 +113 @@
                 if (clip_size != size) {
                         /* The client expects different size of data */
-                        ipc_answer_0(callid, EOVERFLOW);
-                        ipc_answer_0(rid, EOVERFLOW);
+                        async_answer_0(callid, EOVERFLOW);
+                        async_answer_0(rid, EOVERFLOW);
                         break;
                 }
@@ -120 +120 @@
                 sysarg_t retval = async_data_read_finalize(callid, clip_data, size);
                 if (retval != EOK) {
-                        ipc_answer_0(rid, retval);
+                        async_answer_0(rid, retval);
                         break;
                 }
                 
-                ipc_answer_0(rid, EOK);
+                async_answer_0(rid, EOK);
         default:
                 /*
@@ -130 +130 @@
                  * data from the clipbard
                  */
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 break;
         }
@@ -145 +145 @@
         
         fibril_mutex_unlock(&clip_mtx);
-        ipc_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
+        async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
 }
 
@@ -151 +151 @@
 {
         /* Accept connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         bool cont = true;
@@ -172 +172 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOENT);
+                        async_answer_0(callid, ENOENT);
                 }
         }
@@ -183 +183 @@
         async_set_client_connection(clip_connection);
         
-        sysarg_t phonead;
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_CLIPBOARD, 0, 0, &phonead) != 0) 
+        if (service_register(SERVICE_CLIPBOARD) != EOK)
                 return -1;