Changes in uspace/srv/clipboard/clipboard.c [a35b458:77f0a1d] in mainline

File:

• uspace/srv/clipboard/clipboard.c (modified) (10 diffs)

uspace/srv/clipboard/clipboard.c

@@ -47 +47 @@
 static service_id_t svc_id;
 
-static void clip_put_data(ipc_callid_t rid, ipc_call_t *request)
+static void clip_put_data(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         char *data;
@@ -65 +65 @@
 
                 fibril_mutex_unlock(&clip_mtx);
-                async_answer_0(rid, EOK);
+                async_answer_0(req_handle, EOK);
                 break;
         case CLIPBOARD_TAG_DATA:
                 rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size);
                 if (rc != EOK) {
-                        async_answer_0(rid, rc);
+                        async_answer_0(req_handle, rc);
                         break;
                 }
@@ -84 +84 @@
 
                 fibril_mutex_unlock(&clip_mtx);
-                async_answer_0(rid, EOK);
+                async_answer_0(req_handle, EOK);
                 break;
         default:
-                async_answer_0(rid, EINVAL);
-        }
-}
-
-static void clip_get_data(ipc_callid_t rid, ipc_call_t *request)
+                async_answer_0(req_handle, EINVAL);
+        }
+}
+
+static void clip_get_data(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         fibril_mutex_lock(&clip_mtx);
 
-        ipc_callid_t callid;
+        cap_call_handle_t chandle;
         size_t size;
 
@@ -101 +101 @@
         switch (IPC_GET_ARG1(*request)) {
         case CLIPBOARD_TAG_DATA:
-                if (!async_data_read_receive(&callid, &size)) {
-                        async_answer_0(callid, EINVAL);
-                        async_answer_0(rid, EINVAL);
+                if (!async_data_read_receive(&chandle, &size)) {
+                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(req_handle, EINVAL);
                         break;
                 }
@@ -109 +109 @@
                 if (clip_tag != CLIPBOARD_TAG_DATA) {
                         /* So far we only understand binary data */
-                        async_answer_0(callid, EOVERFLOW);
-                        async_answer_0(rid, EOVERFLOW);
+                        async_answer_0(chandle, EOVERFLOW);
+                        async_answer_0(req_handle, EOVERFLOW);
                         break;
                 }
@@ -116 +116 @@
                 if (clip_size != size) {
                         /* The client expects different size of data */
-                        async_answer_0(callid, EOVERFLOW);
-                        async_answer_0(rid, EOVERFLOW);
-                        break;
-                }
-
-                errno_t retval = async_data_read_finalize(callid, clip_data, size);
+                        async_answer_0(chandle, EOVERFLOW);
+                        async_answer_0(req_handle, EOVERFLOW);
+                        break;
+                }
+
+                errno_t retval = async_data_read_finalize(chandle, clip_data, size);
                 if (retval != EOK) {
-                        async_answer_0(rid, retval);
-                        break;
-                }
-
-                async_answer_0(rid, EOK);
+                        async_answer_0(req_handle, retval);
+                        break;
+                }
+
+                async_answer_0(req_handle, EOK);
                 break;
         default:
@@ -134 +134 @@
                  * data from the clipbard
                  */
-                async_answer_0(rid, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 break;
         }
@@ -141 +141 @@
 }
 
-static void clip_content(ipc_callid_t rid, ipc_call_t *request)
+static void clip_content(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         fibril_mutex_lock(&clip_mtx);
@@ -149 +149 @@
 
         fibril_mutex_unlock(&clip_mtx);
-        async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
-}
-
-static void clip_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+        async_answer_2(req_handle, EOK, (sysarg_t) size, (sysarg_t) tag);
+}
+
+static void clip_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
+    void *arg)
 {
         /* Accept connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call))
@@ -166 +167 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case CLIPBOARD_PUT_DATA:
-                        clip_put_data(callid, &call);
+                        clip_put_data(chandle, &call);
                         break;
                 case CLIPBOARD_GET_DATA:
-                        clip_get_data(callid, &call);
+                        clip_get_data(chandle, &call);
                         break;
                 case CLIPBOARD_CONTENT:
-                        clip_content(callid, &call);
+                        clip_content(chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, ENOENT);
+                        async_answer_0(chandle, ENOENT);
                 }
         }