Changeset b7a4d06 in mainline for uspace/srv/bd/vbd/vbd.c

Timestamp:

2015-07-18T12:55:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c43db5f

Parents:

70815a24

Message:

Most of extended (but not logical) partition support.

File:

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

uspace/srv/bd/vbd/vbd.c

@@ -107 +107 @@
 {
         service_id_t disk_sid;
-        vbds_disk_info_t dinfo;
+        vbd_disk_info_t dinfo;
         int rc;
 
@@ -127 +127 @@
         }
 
-        if (size != sizeof(vbds_disk_info_t)) {
+        if (size != sizeof(vbd_disk_info_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -219 +219 @@
         part = IPC_GET_ARG1(*icall);
         rc = vbds_part_get_info(part, &pinfo);
-        async_answer_5(iid, (sysarg_t)rc, pinfo.index,
-            LOWER32(pinfo.block0), UPPER32(pinfo.block0),
-            LOWER32(pinfo.nblocks), UPPER32(pinfo.nblocks));
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(vbd_part_info_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(callid, &pinfo,
+            min(size, sizeof(pinfo)));
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        async_answer_0(iid, EOK);
 }