Changeset 1626cd4 in mainline for uspace/lib/label/src/gpt.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/label/src/gpt.c (modified) (13 diffs)

uspace/lib/label/src/gpt.c

@@ -37 +37 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <mem.h>
 #include <stdlib.h>
 
@@ -46 +47 @@
 static void gpt_close(label_t *);
 static int gpt_destroy(label_t *);
+static int gpt_get_info(label_t *, label_info_t *);
 static label_part_t *gpt_part_first(label_t *);
 static label_part_t *gpt_part_next(label_part_t *);
@@ -52 +54 @@
 static int gpt_part_destroy(label_part_t *);
 
-static int gpt_pte_to_part(label_t *, gpt_entry_t *);
+static int gpt_pte_to_part(label_t *, gpt_entry_t *, int);
 
 const uint8_t efi_signature[8] = {
@@ -64 +66 @@
         .close = gpt_close,
         .destroy = gpt_destroy,
+        .get_info = gpt_get_info,
         .part_first = gpt_part_first,
         .part_next = gpt_part_next,
@@ -83 +86 @@
         uint64_t ba;
         uint32_t entry;
+        uint64_t ba_min, ba_max;
         int i;
         int rc;
@@ -126 +130 @@
         bcnt = (num_entries + esize - 1) / esize;
         ba = uint64_t_le2host(gpt_hdr->entry_lba);
+        ba_min = uint64_t_le2host(gpt_hdr->first_usable_lba);
+        ba_max = uint64_t_le2host(gpt_hdr->last_usable_lba);
 
         if (num_entries < 1) {
@@ -133 +139 @@
 
         if (esize < sizeof(gpt_entry_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (ba_max < ba_min) {
                 rc = EINVAL;
                 goto error;
@@ -151 +162 @@
         for (entry = 0; entry < num_entries; entry++) {
                 eptr = (gpt_entry_t *)(etable + entry * esize);
-                rc = gpt_pte_to_part(label, eptr);
+                rc = gpt_pte_to_part(label, eptr, entry + 1);
                 if (rc != EOK)
                         goto error;
@@ -163 +174 @@
         label->ops = &gpt_label_ops;
         label->ltype = lt_gpt;
+        label->ablock0 = ba_min;
+        label->anblocks = ba_max - ba_min + 1;
         *rlabel = label;
         return EOK;
@@ -187 +200 @@
 }
 
+static int gpt_get_info(label_t *label, label_info_t *linfo)
+{
+        memset(linfo, 0, sizeof(label_info_t));
+        linfo->dcnt = dc_label;
+        linfo->ltype = lt_gpt;
+        linfo->ablock0 = label->ablock0;
+        linfo->anblocks = label->anblocks;
+        return EOK;
+}
+
 static label_part_t *gpt_part_first(label_t *label)
 {
@@ -211 +234 @@
 static void gpt_part_get_info(label_part_t *part, label_part_info_t *pinfo)
 {
+        pinfo->index = part->index;
         pinfo->block0 = part->block0;
         pinfo->nblocks = part->nblocks;
@@ -218 +242 @@
     label_part_t **rpart)
 {
-        return EOK;
+        return ENOTSUP;
 }
 
 static int gpt_part_destroy(label_part_t *part)
 {
-        return EOK;
-}
-
-static int gpt_pte_to_part(label_t *label, gpt_entry_t *pte)
+        return ENOTSUP;
+}
+
+static int gpt_pte_to_part(label_t *label, gpt_entry_t *pte, int index)
 {
         label_part_t *part;
@@ -250 +274 @@
                 return EINVAL;
 
+        part->index = index;
         part->block0 = b0;
         part->nblocks = b1 - b0 + 1;