Changes in uspace/srv/bd/vbd/vbd.c [beb83c1:fafb8e5] in mainline

File:

• uspace/srv/bd/vbd/vbd.c (modified) (10 diffs)

uspace/srv/bd/vbd/vbd.c

@@ -129 +129 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_disk_info_srv()");
 
-        disk_sid = IPC_GET_ARG1(*icall);
+        disk_sid = ipc_get_arg1(icall);
         rc = vbds_disk_info(disk_sid, &dinfo);
         if (rc != EOK) {
@@ -169 +169 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create_srv()");
 
-        disk_sid = IPC_GET_ARG1(*icall);
-        ltype = IPC_GET_ARG2(*icall);
+        disk_sid = ipc_get_arg1(icall);
+        ltype = ipc_get_arg2(icall);
         rc = vbds_label_create(disk_sid, ltype);
         async_answer_0(icall, rc);
@@ -182 +182 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_delete_srv()");
 
-        disk_sid = IPC_GET_ARG1(*icall);
+        disk_sid = ipc_get_arg1(icall);
         rc = vbds_label_delete(disk_sid);
         async_answer_0(icall, rc);
@@ -203 +203 @@
         }
 
-        sid = IPC_GET_ARG1(*icall);
+        sid = ipc_get_arg1(icall);
 
         category_id_t *id_buf = (category_id_t *) malloc(size);
@@ -233 +233 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_get_info_srv()");
 
-        part = IPC_GET_ARG1(*icall);
+        part = ipc_get_arg1(icall);
         rc = vbds_part_get_info(part, &pinfo);
         if (rc != EOK) {
@@ -274 +274 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_create_srv()");
 
-        disk_sid = IPC_GET_ARG1(*icall);
+        disk_sid = ipc_get_arg1(icall);
 
         ipc_call_t call;
@@ -313 +313 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_delete_srv()");
 
-        part = IPC_GET_ARG1(*icall);
+        part = ipc_get_arg1(icall);
         rc = vbds_part_delete(part);
         async_answer_0(icall, rc);
@@ -327 +327 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_suggest_ptype_srv()");
 
-        disk_sid = IPC_GET_ARG1(*icall);
-        pcnt = IPC_GET_ARG2(*icall);
+        disk_sid = ipc_get_arg1(icall);
+        pcnt = ipc_get_arg2(icall);
 
         rc = vbds_suggest_ptype(disk_sid, pcnt, &ptype);
@@ -370 +370 @@
                 ipc_call_t call;
                 async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 if (!method) {
@@ -418 +418 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_client_conn()");
 
-        sid = (service_id_t) IPC_GET_ARG2(*icall);
+        sid = (service_id_t) ipc_get_arg2(icall);
 
         if (sid == ctl_sid)