Changeset b7a4d06 in mainline for uspace/lib/fdisk

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/fdisk

Files:

• include/fdisk.h (modified) (1 diff)
• include/types/fdisk.h (modified) (4 diffs)
• src/fdisk.c (modified) (5 diffs)

uspace/lib/fdisk/include/fdisk.h

@@ -72 +72 @@
 extern int fdisk_ltype_format(label_type_t, char **);
 extern int fdisk_fstype_format(fdisk_fstype_t, char **);
+extern int fdisk_pkind_format(label_pkind_t, char **);
 
 #endif

uspace/lib/fdisk/include/types/fdisk.h

@@ -119 +119 @@
         /** Label type */
         label_type_t ltype;
+        /** Label flags */
+        label_flags_t flags;
 } fdisk_label_info_t;
 
@@ -131 +133 @@
         /** Capacity */
         fdisk_cap_t capacity;
+        /** Partition kind */
+        label_pkind_t pkind;
         /** File system type */
         fdisk_fstype_t fstype;
@@ -147 +151 @@
         /** Desired capacity */
         fdisk_cap_t capacity;
+        /** Partition kind */
+        label_pkind_t pkind;
         /** File system type */
         fdisk_fstype_t fstype;
@@ -153 +159 @@
 /** Partition info */
 typedef struct {
+        /** Capacity */
         fdisk_cap_t capacity;
+        /** Partition kind */
+        label_pkind_t pkind;
         /** File system type */
         fdisk_fstype_t fstype;

uspace/lib/fdisk/src/fdisk.c

@@ -271 +271 @@
         part->block0 = pinfo.block0;
         part->nblocks = pinfo.nblocks;
+        part->pkind = pinfo.pkind;
 
         /* Insert to list by block address */
@@ -442 +443 @@
         info->dcnt = vinfo.dcnt;
         info->ltype = vinfo.ltype;
+        info->flags = vinfo.flags;
         return EOK;
 error:
@@ -497 +499 @@
         info->capacity = part->capacity;
         info->fstype = part->fstype;
+        info->pkind = part->pkind;
         return EOK;
 }
@@ -671 +674 @@
 }
 
+int fdisk_pkind_format(label_pkind_t pkind, char **rstr)
+{
+        const char *spkind;
+        char *s;
+
+        spkind = NULL;
+        switch (pkind) {
+        case lpk_primary:
+                spkind = "Primary";
+                break;
+        case lpk_extended:
+                spkind = "Extended";
+                break;
+        case lpk_logical:
+                spkind = "Logical";
+                break;
+        }
+
+        s = str_dup(spkind);
+        if (s == NULL)
+                return ENOMEM;
+
+        *rstr = s;
+        return EOK;
+}
+
 /** Get free partition index. */
 static int fdisk_part_get_free_idx(fdisk_dev_t *dev, int *rindex)
@@ -765 +794 @@
                 return EIO;
 
+        memset(vpspec, 0, sizeof(vbd_part_spec_t));
         vpspec->index = index;
         vpspec->block0 = fblock0;
         vpspec->nblocks = req_blocks;
-        vpspec->ptype = 42;
+        vpspec->pkind = pspec->pkind;
+        if (pspec->pkind != lpk_extended)
+                vpspec->ptype = 42;
+
         return EOK;
 }