Changeset 3be9d10 in mainline for uspace/srv/locsrv/locsrv.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/locsrv/locsrv.c (modified) (25 diffs)

uspace/srv/locsrv/locsrv.c

@@ -339 +339 @@
 {
         ipc_call_t icall;
-        ipc_callid_t iid = async_get_call(&icall);
+        cap_call_handle_t iid = async_get_call(&icall);
 
         if (IPC_GET_IMETHOD(icall) != LOC_SERVER_REGISTER) {
@@ -453 +453 @@
  *
  */
-static void loc_service_register(ipc_callid_t iid, ipc_call_t *icall,
+static void loc_service_register(cap_call_handle_t iid, ipc_call_t *icall,
     loc_server_t *server)
 {
@@ -541 +541 @@
  *
  */
-static void loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall,
+static void loc_service_unregister(cap_call_handle_t iid, ipc_call_t *icall,
     loc_server_t *server)
 {
@@ -568 +568 @@
 }
 
-static void loc_category_get_name(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_category_get_name(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -607 +607 @@
 }
 
-static void loc_service_get_name(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_service_get_name(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -656 +656 @@
 }
 
-static void loc_service_get_server_name(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_service_get_server_name(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -708 +708 @@
  *
  */
-static void loc_forward(ipc_callid_t callid, ipc_call_t *call, void *arg)
+static void loc_forward(cap_call_handle_t callid, ipc_call_t *call, void *arg)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -738 +738 @@
  *
  */
-static void loc_service_get_id(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_service_get_id(cap_call_handle_t iid, ipc_call_t *icall)
 {
         char *fqsn;
@@ -801 +801 @@
  *
  */
-static void loc_namespace_get_id(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_namespace_get_id(cap_call_handle_t iid, ipc_call_t *icall)
 {
         char *name;
@@ -855 +855 @@
  *
  */
-static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_callback_create(cap_call_handle_t iid, ipc_call_t *icall)
 {
         cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
@@ -899 +899 @@
  *
  */
-static void loc_category_get_id(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_category_get_id(cap_call_handle_t iid, ipc_call_t *icall)
 {
         char *name;
@@ -927 +927 @@
 }
 
-static void loc_id_probe(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_id_probe(cap_call_handle_t iid, ipc_call_t *icall)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -946 +946 @@
 }
 
-static void loc_get_namespace_count(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_get_namespace_count(cap_call_handle_t iid, ipc_call_t *icall)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -953 +953 @@
 }
 
-static void loc_get_service_count(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_get_service_count(cap_call_handle_t iid, ipc_call_t *icall)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -967 +967 @@
 }
 
-static void loc_get_categories(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_get_categories(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -1006 +1006 @@
 }
 
-static void loc_get_namespaces(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_get_namespaces(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -1055 +1055 @@
 }
 
-static void loc_get_services(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_get_services(cap_call_handle_t iid, ipc_call_t *icall)
 {
         /* FIXME: Use faster algorithm which can make better use
            of namespaces */
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -1118 +1118 @@
 }
 
-static void loc_category_get_svcs(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void loc_category_get_svcs(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -1170 +1170 @@
 
 
-static void loc_null_create(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_null_create(cap_call_handle_t iid, ipc_call_t *icall)
 {
         fibril_mutex_lock(&null_services_mutex);
@@ -1244 +1244 @@
 }
 
-static void loc_null_destroy(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_null_destroy(cap_call_handle_t iid, ipc_call_t *icall)
 {
         sysarg_t i = IPC_GET_ARG1(*icall);
@@ -1272 +1272 @@
 }
 
-static void loc_service_add_to_cat(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_service_add_to_cat(cap_call_handle_t iid, ipc_call_t *icall)
 {
         category_t *cat;
@@ -1393 +1393 @@
  *
  */
-static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void loc_connection_supplier(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
@@ -1404 +1404 @@
         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))
@@ -1451 +1451 @@
  *
  */
-static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void loc_connection_consumer(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
@@ -1458 +1458 @@
         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))