Changeset 3be9d10 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2018-03-21T21:29:31Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3e242d2

Parents:

eadaeae8

Message:

Get rid of ipc_callid_t

File:

• uspace/srv/hid/compositor/compositor.c (modified) (11 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -589 +589 @@
 }
 
-static void comp_window_get_event(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_window_get_event(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
 {
         window_event_t *event = (window_event_t *) prodcons_consume(&win->queue);
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t len;
 
@@ -613 +613 @@
 }
 
-static void comp_window_damage(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_window_damage(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
 {
         double x = IPC_GET_ARG1(*icall);
@@ -634 +634 @@
 }
 
-static void comp_window_grab(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_window_grab(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
 {
         sysarg_t pos_id = IPC_GET_ARG1(*icall);
@@ -693 +693 @@
 }
 
-static void comp_window_resize(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void comp_window_resize(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         unsigned int flags;
@@ -836 +836 @@
 }
 
-static void comp_window_close(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_window_close(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
 {
         /* Stop managing the window. */
@@ -879 +879 @@
 }
 
-static void comp_window_close_request(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_window_close_request(window_t *win, cap_call_handle_t iid, ipc_call_t *icall)
 {
         window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
@@ -894 +894 @@
 }
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_call_t call;
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
 
@@ -1042 +1042 @@
 }
 
-static void comp_mode_change(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_mode_change(viewport_t *vp, cap_call_handle_t iid, ipc_call_t *icall)
 {
         sysarg_t mode_idx = IPC_GET_ARG2(*icall);
@@ -1121 +1121 @@
 #endif
 
-static void comp_visualizer_disconnect(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
+static void comp_visualizer_disconnect(viewport_t *vp, cap_call_handle_t iid, ipc_call_t *icall)
 {
         /* Release viewport resources. */
@@ -1137 +1137 @@
 }
 
-static void vsl_notifications(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vsl_notifications(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         viewport_t *vp = NULL;
@@ -1155 +1155 @@
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+                cap_call_handle_t callid = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {