Changeset 3be9d10 in mainline for uspace/srv/net/inetsrv/inetcfg.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/net/inetsrv/inetcfg.c (modified) (19 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -253 +253 @@
 }
 
-static void inetcfg_addr_create_static_srv(ipc_callid_t iid,
+static void inetcfg_addr_create_static_srv(cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -260 +260 @@
         sysarg_t link_id = IPC_GET_ARG1(*icall);
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_write_receive(&callid, &size)) {
@@ -296 +296 @@
 }
 
-static void inetcfg_addr_delete_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_addr_delete_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         sysarg_t addr_id;
@@ -309 +309 @@
 }
 
-static void inetcfg_addr_get_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void inetcfg_addr_get_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()");
@@ -327 +327 @@
         }
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -367 +367 @@
 }
 
-static void inetcfg_addr_get_id_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_addr_get_id_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         char *name;
@@ -391 +391 @@
 }
 
-static void inetcfg_get_addr_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_callid_t rcallid;
+static void inetcfg_get_addr_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+        cap_call_handle_t rcallid;
         size_t count;
         size_t max_size;
@@ -425 +425 @@
 }
 
-static void inetcfg_get_link_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_callid_t rcallid;
+static void inetcfg_get_link_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+        cap_call_handle_t rcallid;
         size_t count;
         size_t max_size;
@@ -459 +459 @@
 }
 
-static void inetcfg_get_sroute_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_callid_t rcallid;
+static void inetcfg_get_sroute_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+        cap_call_handle_t rcallid;
         size_t count;
         size_t max_size;
@@ -493 +493 @@
 }
 
-static void inetcfg_link_add_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_link_add_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -506 +506 @@
 }
 
-static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_callid_t name_callid;
-        ipc_callid_t laddr_callid;
+static void inetcfg_link_get_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+        cap_call_handle_t name_callid;
+        cap_call_handle_t laddr_callid;
         size_t name_max_size;
         size_t laddr_max_size;
@@ -559 +559 @@
 }
 
-static void inetcfg_link_remove_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_link_remove_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -572 +572 @@
 }
 
-static void inetcfg_sroute_create_srv(ipc_callid_t iid,
+static void inetcfg_sroute_create_srv(cap_call_handle_t iid,
     ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_create_srv()");
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_write_receive(&callid, &size)) {
@@ -633 +633 @@
 }
 
-static void inetcfg_sroute_delete_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_sroute_delete_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         sysarg_t sroute_id;
@@ -646 +646 @@
 }
 
-static void inetcfg_sroute_get_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void inetcfg_sroute_get_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()");
@@ -664 +664 @@
         }
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -717 +717 @@
 }
 
-static void inetcfg_sroute_get_id_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_sroute_get_id_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
         char *name;
@@ -738 +738 @@
 }
 
-void inet_cfg_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void inet_cfg_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_cfg_conn()");
@@ -747 +747 @@
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+                cap_call_handle_t callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);