Changeset 3be9d10 in mainline for uspace/lib/fs/libfs.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/fs/libfs.c (modified) (21 diffs)

uspace/lib/fs/libfs.c

@@ -71 +71 @@
 static char fs_name[FS_NAME_MAXLEN + 1];
 
-static void libfs_link(libfs_ops_t *, fs_handle_t, ipc_callid_t,
+static void libfs_link(libfs_ops_t *, fs_handle_t, cap_call_handle_t,
     ipc_call_t *);
-static void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t,
+static void libfs_lookup(libfs_ops_t *, fs_handle_t, cap_call_handle_t,
     ipc_call_t *);
-static void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
-static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
+static void libfs_stat(libfs_ops_t *, fs_handle_t, cap_call_handle_t, ipc_call_t *);
+static void libfs_open_node(libfs_ops_t *, fs_handle_t, cap_call_handle_t,
     ipc_call_t *);
-static void libfs_statfs(libfs_ops_t *, fs_handle_t, ipc_callid_t,
+static void libfs_statfs(libfs_ops_t *, fs_handle_t, cap_call_handle_t,
     ipc_call_t *);
 
-static void vfs_out_fsprobe(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_fsprobe(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -87 +87 @@
         vfs_fs_probe_info_t info;
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
@@ -108 +108 @@
 }
 
-static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_mounted(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -133 +133 @@
 }
 
-static void vfs_out_unmounted(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_unmounted(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -143 +143 @@
 }
 
-static void vfs_out_link(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_link(cap_call_handle_t rid, ipc_call_t *req)
 {
         libfs_link(libfs_ops, reg.fs_handle, rid, req);
 }
 
-static void vfs_out_lookup(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_lookup(cap_call_handle_t rid, ipc_call_t *req)
 {
         libfs_lookup(libfs_ops, reg.fs_handle, rid, req);
 }
 
-static void vfs_out_read(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_read(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -170 +170 @@
 }
 
-static void vfs_out_write(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_write(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -189 +189 @@
 }
 
-static void vfs_out_truncate(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_truncate(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -202 +202 @@
 }
 
-static void vfs_out_close(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_close(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -213 +213 @@
 }
 
-static void vfs_out_destroy(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_destroy(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -230 +230 @@
 }
 
-static void vfs_out_open_node(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_open_node(cap_call_handle_t rid, ipc_call_t *req)
 {
         libfs_open_node(libfs_ops, reg.fs_handle, rid, req);
 }
 
-static void vfs_out_stat(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_stat(cap_call_handle_t rid, ipc_call_t *req)
 {
         libfs_stat(libfs_ops, reg.fs_handle, rid, req);
 }
 
-static void vfs_out_sync(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_sync(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -251 +251 @@
 }
 
-static void vfs_out_statfs(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_statfs(cap_call_handle_t rid, ipc_call_t *req)
 {
         libfs_statfs(libfs_ops, reg.fs_handle, rid, req);
 }
 
-static void vfs_out_is_empty(ipc_callid_t rid, ipc_call_t *req)
+static void vfs_out_is_empty(cap_call_handle_t rid, ipc_call_t *req)
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
@@ -278 +278 @@
 }
 
-static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vfs_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         if (iid) {
@@ -291 +291 @@
         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))
@@ -479 +479 @@
 {
         size_t size;
-        ipc_callid_t wcall;
+        cap_call_handle_t wcall;
 
         if (!async_data_write_receive(&wcall, &size))
@@ -492 +492 @@
 /** Link a file at a path.
  */
-void libfs_link(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+void libfs_link(libfs_ops_t *ops, fs_handle_t fs_handle, cap_call_handle_t rid,
     ipc_call_t *req)
 {
@@ -540 +540 @@
  *
  */
-void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, cap_call_handle_t rid,
     ipc_call_t *req)
 {
@@ -720 +720 @@
 }
 
-void libfs_stat(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+void libfs_stat(libfs_ops_t *ops, fs_handle_t fs_handle, cap_call_handle_t rid,
     ipc_call_t *request)
 {
@@ -730 +730 @@
         on_error(rc, answer_and_return(rid, rc));
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
@@ -759 +759 @@
 }
 
-void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, cap_call_handle_t rid,
     ipc_call_t *request)
 {
@@ -769 +769 @@
         on_error(rc, answer_and_return(rid, rc));
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
@@ -819 +819 @@
  *
  */
-void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, cap_call_handle_t rid,
     ipc_call_t *request)
 {