Changeset b7a4d06 in mainline for uspace/lib/c

Timestamp:

2015-07-18T12:55:12Z (10 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.

Location:

uspace/lib/c

Files:

• generic/vbd.c (modified) (1 diff)
• generic/vol.c (modified) (2 diffs)
• include/types/label.h (modified) (1 diff)
• include/vbd.h (modified) (3 diffs)
• include/vol.h (modified) (1 diff)

uspace/lib/c/generic/vbd.c

@@ -264 +264 @@
 {
         async_exch_t *exch;
-        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);
+        sysarg_t retval;
+        ipc_call_t answer;
+
+        exch = async_exchange_begin(vbd->sess);
+        aid_t req = async_send_1(exch, VBD_PART_GET_INFO, part, &answer);
+        int rc = async_data_read_start(exch, pinfo, sizeof(vbd_part_info_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
         return EOK;
 }

uspace/lib/c/generic/vol.c

@@ -192 +192 @@
 {
         async_exch_t *exch;
-        sysarg_t dcnt, ltype;
+        sysarg_t dcnt, ltype, flags;
         int retval;
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_2(exch, VOL_DISK_INFO, sid, &dcnt, &ltype);
+        retval = async_req_1_3(exch, VOL_DISK_INFO, sid, &dcnt, &ltype,
+            &flags);
         async_exchange_end(exch);
 
@@ -204 +205 @@
         vinfo->dcnt = (label_disk_cnt_t)dcnt;
         vinfo->ltype = (label_type_t)ltype;
+        vinfo->flags = (label_flags_t)flags;
         return EOK;
 }

uspace/lib/c/include/types/label.h

@@ -58 +58 @@
 #define LT_LIMIT (lt_gpt + 1)
 
+/** Partition kind */
+typedef enum {
+        /** Primary partition */
+        lpk_primary,
+        /** Extended partition */
+        lpk_extended,
+        /** Logical partition */
+        lpk_logical
+} label_pkind_t;
+
+/** Label flags */
+typedef enum {
+        /** Label supports extended (and logical) partitions */
+        lf_ext_supp = 0x1,
+        /** Currently it is possible to create a primary partition */
+        lf_can_create_pri = 0x2,
+        /** Currently it is possible to create an extended partition */
+        lf_can_create_ext = 0x4,
+        /** Currrently it is possible to create a logical partition */
+        lf_can_create_log = 0x8
+} label_flags_t;
 
 #endif

uspace/lib/c/include/vbd.h

@@ -51 +51 @@
         /** Label type */
         label_type_t ltype;
+        /** Label flags */
+        label_flags_t flags;
         /** First block that can be allocated */
         aoff64_t ablock0;
@@ -67 +69 @@
         /** Number of blocks */
         aoff64_t nblocks;
+        /** Partition kind */
+        label_pkind_t pkind;
         /** Partition type */
         uint64_t ptype;
@@ -75 +79 @@
         /** Partition index */
         int index;
+        /** Partition kind */
+        label_pkind_t pkind;
         /** First block */
         aoff64_t block0;

uspace/lib/c/include/vol.h

@@ -53 +53 @@
         /** Label type, if disk contents is label */
         label_type_t ltype;
+        /** Label flags */
+        label_flags_t flags;
 } vol_disk_info_t;