Changeset 3be9d10 in mainline for uspace/srv/bd

Timestamp:

2018-03-21T21:29:31Z (8 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

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (2 diffs)
• rd/rd.c (modified) (1 diff)
• sata_bd/sata_bd.c (modified) (1 diff)
• vbd/disk.c (modified) (1 diff)
• vbd/disk.h (modified) (1 diff)
• vbd/vbd.c (modified) (17 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -68 +68 @@
 static void print_usage(void);
 static errno_t file_bd_init(const char *fname);
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
+static void file_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *);
 
 static errno_t file_bd_open(bd_srvs_t *, bd_srv_t *);
@@ -201 +201 @@
 }
 
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void file_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         bd_conn(iid, icall, &bd_srvs);

uspace/srv/bd/rd/rd.c

@@ -94 +94 @@
 static bd_srvs_t bd_srvs;
 
-static void rd_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void rd_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         bd_conn(iid, icall, &bd_srvs);

uspace/srv/bd/sata_bd/sata_bd.c

@@ -167 +167 @@
 
 /** Block device connection handler. */
-static void sata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void sata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         service_id_t dsid;

uspace/srv/bd/vbd/disk.c

@@ -1068 +1068 @@
 }
 
-void vbds_bd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void vbds_bd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         vbds_part_t *part;

uspace/srv/bd/vbd/disk.h

@@ -55 +55 @@
 extern errno_t vbds_part_delete(vbds_part_id_t);
 extern errno_t vbds_suggest_ptype(service_id_t, label_pcnt_t, label_ptype_t *);
-extern void vbds_bd_conn(ipc_callid_t, ipc_call_t *, void *);
+extern void vbds_bd_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 #endif

uspace/srv/bd/vbd/vbd.c

@@ -53 +53 @@
 #define NAME  "vbd"
 
-static void vbds_client_conn(ipc_callid_t, ipc_call_t *, void *);
+static void vbds_client_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static service_id_t ctl_sid;
@@ -87 +87 @@
 }
 
-static void vbds_get_disks_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void vbds_get_disks_srv(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -121 +121 @@
 }
 
-static void vbds_disk_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_disk_info_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         service_id_t disk_sid;
@@ -136 +136 @@
         }
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -161 +161 @@
 }
 
-static void vbds_label_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_label_create_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         service_id_t disk_sid;
@@ -175 +175 @@
 }
 
-static void vbds_label_delete_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_label_delete_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         service_id_t disk_sid;
@@ -187 +187 @@
 }
 
-static void vbds_label_get_parts_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
+static void vbds_label_get_parts_srv(cap_call_handle_t iid, ipc_call_t *icall)
+{
+        cap_call_handle_t callid;
         size_t size;
         size_t act_size;
@@ -225 +225 @@
 }
 
-static void vbds_part_get_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_get_info_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         vbds_part_id_t part;
@@ -240 +240 @@
         }
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -265 +265 @@
 }
 
-static void vbds_part_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_create_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         service_id_t disk_sid;
@@ -276 +276 @@
         disk_sid = IPC_GET_ARG1(*icall);
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_write_receive(&callid, &size)) {
@@ -306 +306 @@
 }
 
-static void vbds_part_delete_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_delete_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         vbds_part_id_t part;
@@ -318 +318 @@
 }
 
-static void vbds_suggest_ptype_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_suggest_ptype_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
         service_id_t disk_sid;
@@ -336 +336 @@
         }
 
-        ipc_callid_t callid;
+        cap_call_handle_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
@@ -360 +360 @@
 }
 
-static void vbds_ctl_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vbds_ctl_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_client_conn()");
@@ -369 +369 @@
         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);
 
@@ -412 +412 @@
 }
 
-static void vbds_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vbds_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         service_id_t sid;