Changeset ffa2c8ef in mainline for uspace/srv/clip/clip.c

Timestamp:

2011-01-29T11:36:08Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

46b881c

Parents:

64d2b10

Message:

do not intermix low-level IPC methods with async framework methods

File:

• uspace/srv/clip/clip.c (modified) (11 diffs)

uspace/srv/clip/clip.c

@@ -30 +30 @@
 #include <bool.h>
 #include <async.h>
-#include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
@@ -63 +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;
                 }
@@ -82 +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);
         }
 }
@@ -100 +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;
                 }
@@ -107 +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;
                 }
@@ -114 +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;
                 }
@@ -121 +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:
                 /*
@@ -131 +130 @@
                  * data from the clipbard
                  */
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 break;
         }
@@ -146 +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);
 }
 
@@ -152 +151 @@
 {
         /* Accept connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         bool cont = true;
@@ -173 +172 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOENT);
+                        async_answer_0(callid, ENOENT);
                 }
         }