Changeset 1626cd4 in mainline for uspace/lib/c/generic/vbd.c

Timestamp:

2015-07-02T19:01:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6a0d4ce2

Parents:

3faa03d

Message:

Propagate label and partition block ranges and other info up through the stack.

File:

• uspace/lib/c/generic/vbd.c (modified) (3 diffs)

uspace/lib/c/generic/vbd.c

@@ -37 +37 @@
 #include <ipc/vbd.h>
 #include <loc.h>
+#include <macros.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -106 +107 @@
 }
 
+#include <io/log.h>
 /** Get disk information. */
 int vbd_disk_info(vbd_t *vbd, service_id_t sid, vbd_disk_info_t *vinfo)
 {
         async_exch_t *exch;
-        sysarg_t ltype;
-        int retval;
-
-        exch = async_exchange_begin(vbd->sess);
-        retval = async_req_1_1(exch, VBD_DISK_INFO, sid, &ltype);
-        async_exchange_end(exch);
-
-        if (retval != EOK)
-                return EIO;
-
-        vinfo->ltype = (label_type_t)ltype;
+        sysarg_t retval;
+        ipc_call_t answer;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() begin exchange");
+        exch = async_exchange_begin(vbd->sess);
+        aid_t req = async_send_1(exch, VBD_DISK_INFO, sid, &answer);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() read start");
+        int rc = async_data_read_start(exch, vinfo, sizeof(vbd_disk_info_t));
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() end exch");
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() wait fore req reply");
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() done");
         return EOK;
 }
@@ -257 +270 @@
 {
         async_exch_t *exch;
-        int retval;
-
-        exch = async_exchange_begin(vbd->sess);
-        retval = async_req_1_0(exch, VBD_PART_GET_INFO, part);
-        async_exchange_end(exch);
-
-        if (retval != EOK)
-                return EIO;
-
+        sysarg_t index;
+        sysarg_t b0_lo, b0_hi;
+        sysarg_t nb_lo, nb_hi;
+        int retval;
+
+        exch = async_exchange_begin(vbd->sess);
+        retval = async_req_1_5(exch, VBD_PART_GET_INFO, part, &index,
+            &b0_lo, &b0_hi, &nb_lo, &nb_hi);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return EIO;
+
+        pinfo->index = index;
+        pinfo->block0 = MERGE_LOUP32(b0_lo, b0_hi);
+        pinfo->nblocks = MERGE_LOUP32(nb_lo, nb_hi);
         return EOK;
 }