Changeset f57ccb5 in mainline for uspace/lib/label/src/mbr.c

Timestamp:

2015-08-11T16:03:59Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0bde8523

Parents:

1b23e33

Message:

Set partition type based on selected filesystem type.

File:

• uspace/lib/label/src/mbr.c (modified) (10 diffs)

uspace/lib/label/src/mbr.c

@@ -54 +54 @@
 static int mbr_part_create(label_t *, label_part_spec_t *, label_part_t **);
 static int mbr_part_destroy(label_part_t *);
+static int mbr_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
 
 static void mbr_unused_pte(mbr_pte_t *);
@@ -77 +78 @@
         .part_get_info = mbr_part_get_info,
         .part_create = mbr_part_create,
-        .part_destroy = mbr_part_destroy
+        .part_destroy = mbr_part_destroy,
+        .suggest_ptype = mbr_suggest_ptype
 };
 
@@ -485 +487 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "mbr_part_get_info: index=%d ptype=%d",
-            (int)part->index, (int)part->ptype);
+            (int)part->index, (int)part->ptype.t.num);
         if (link_used(&part->llog))
                 pinfo->pkind = lpk_logical;
-        else if (part->ptype == mbr_pt_extended)
+        else if (part->ptype.t.num == mbr_pt_extended)
                 pinfo->pkind = lpk_extended;
         else
@@ -503 +505 @@
         int rc;
 
+        if (pspec->ptype.fmt != lptf_num)
+                return EINVAL;
+
         part = calloc(1, sizeof(label_part_t));
         if (part == NULL)
@@ -521 +526 @@
                 break;
         case lpk_extended:
-                part->ptype = mbr_pt_extended;
-                if (pspec->ptype != 0) {
+                part->ptype.fmt = lptf_num;
+                part->ptype.t.num = mbr_pt_extended;
+                if (pspec->ptype.t.num != 0) {
                         rc = EINVAL;
                         goto error;
@@ -705 +711 @@
 }
 
+static int mbr_suggest_ptype(label_t *label, label_pcnt_t pcnt,
+    label_ptype_t *ptype)
+{
+        ptype->fmt = lptf_num;
+        ptype->t.num = 0;
+
+        switch (pcnt) {
+        case lpc_exfat:
+                ptype->t.num = mbr_pt_ms_advanced;
+                break;
+        case lpc_ext4:
+                ptype->t.num = mbr_pt_linux;
+                break;
+        case lpc_fat12_16:
+                ptype->t.num = mbr_pt_fat16_lba;
+                break;
+        case lpc_fat32:
+                ptype->t.num = mbr_pt_fat32_lba;
+                break;
+        case lpc_minix:
+                ptype->t.num = mbr_pt_minix;
+                break;
+        }
+
+        if (ptype->t.num == 0)
+                return EINVAL;
+
+        return EOK;
+}
+
+
 static void mbr_unused_pte(mbr_pte_t *pte)
 {
@@ -716 +753 @@
         if ((part->nblocks >> 32) != 0)
                 return EINVAL;
-        if ((part->ptype >> 8) != 0)
+        if ((part->ptype.t.num >> 8) != 0)
                 return EINVAL;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "mbr_part_to_pte: a0=%" PRIu64
             " len=%" PRIu64 " ptype=%d", part->block0, part->nblocks,
-            (int)part->ptype);
+            (int)part->ptype.t.num);
         memset(pte, 0, sizeof(mbr_pte_t));
-        pte->ptype = part->ptype;
+        pte->ptype = part->ptype.t.num;
         pte->first_lba = host2uint32_t_le(part->block0);
         pte->length = host2uint32_t_le(part->nblocks);
@@ -746 +783 @@
                 return ENOMEM;
 
-        part->ptype = pte->ptype;
+        part->ptype.fmt = lptf_num;
+        part->ptype.t.num = pte->ptype;
         part->index = index;
         part->block0 = block0;
@@ -786 +824 @@
         nlparts = list_count(&label->log_parts);
 
-        part->ptype = pte->ptype;
+        part->ptype.fmt = lptf_num;
+        part->ptype.t.num = pte->ptype;
         part->index = mbr_nprimary + 1 + nlparts;
         part->block0 = block0;
@@ -816 +855 @@
         if (pthis != NULL) {
                 memset(pthis, 0, sizeof(mbr_pte_t));
-                pthis->ptype = part->ptype;
+                pthis->ptype = part->ptype.t.num;
                 pthis->first_lba = host2uint32_t_le(part->hdr_blocks);
                 pthis->length = host2uint32_t_le(part->nblocks);