Changeset 3be9d10 in mainline for uspace/lib/c/generic/io/con_srv.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/lib/c/generic/io/con_srv.c (modified) (16 diffs)

uspace/lib/c/generic/io/con_srv.c

@@ -66 +66 @@
 }
 
-static void con_read_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_read_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -72 +72 @@
         size_t size;
         errno_t rc;
-        ipc_callid_t rcallid;
+        cap_call_handle_t rcallid;
 
         if (!async_data_read_receive(&rcallid, &size)) {
@@ -108 +108 @@
 }
 
-static void con_write_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_write_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -133 +133 @@
 }
 
-static void con_sync_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_sync_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -145 +145 @@
 }
 
-static void con_clear_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_clear_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -157 +157 @@
 }
 
-static void con_set_pos_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -175 +175 @@
 }
 
-static void con_get_pos_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -191 +191 @@
 }
 
-static void con_get_size_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_size_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -207 +207 @@
 }
 
-static void con_get_color_cap_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_color_cap_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -222 +222 @@
 }
 
-static void con_set_style_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_style_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -238 +238 @@
 }
 
-static void con_set_color_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_color_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -258 +258 @@
 }
 
-static void con_set_rgb_color_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_rgb_color_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -276 +276 @@
 }
 
-static void con_set_cursor_visibility_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_cursor_visibility_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -292 +292 @@
 }
 
-static void con_get_event_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_event_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -340 +340 @@
 }
 
-errno_t con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs)
+errno_t con_conn(cap_call_handle_t iid, ipc_call_t *icall, con_srvs_t *srvs)
 {
         con_srv_t *srv;
@@ -366 +366 @@
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid = 0;
+                cap_call_handle_t callid = 0;
 
                 while (callid == 0) {