Changeset 30440ed in mainline for uspace/lib/mbr/libmbr.c

Timestamp:

2013-04-08T23:15:42Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

256cbfe

Parents:

271e24a

Message:

save progress

File:

• uspace/lib/mbr/libmbr.c (modified) (16 diffs)

uspace/lib/mbr/libmbr.c

@@ -150 +150 @@
                         return NULL;
                 }
-                list_append(&(p->link), &(parts->list));
+                //list_append(&(p->link), &(parts->list));
                 p->ebr = NULL;
-                if (decode_part(&(mbr->raw_data.pte[i]), p, 0))
+                if (decode_part(&(mbr->raw_data.pte[i]), p, 0)) {
                         ext = p;
+                        parts->l_extended = list_last(&(parts->list));
+                }
+                mbr_set_flag(p, ST_LOGIC, false);
+                mbr_add_partition(parts, p);
         }
 
@@ -183 +187 @@
         
         br_block_t * last_ebr = NULL;
-
-
+        link_t * it;
+        
+        DEBUG_PRINT_3(LIBMBR_NAME "Writing partitions: n_primary: %u, n_logical:%u, l_extended:%p", parts->n_primary, parts->n_logical, parts->l_extended);
+        
         rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
         if (rc != EOK) {
+                DEBUG_PRINT_2(LIBMBR_NAME ": Error (%d): %s.\n", rc, str_error(rc));
                 return rc;
         }
@@ -193 +200 @@
                 goto no_extended;
 
-        aoff64_t addr = ext->start_addr;
+        uint32_t base = ext->start_addr;
+        uint32_t addr = base;
+        uint32_t prev_addr;
         mbr_part_t * prev_part = NULL;
 
-        list_foreach(parts->list, it) {
-                p = list_get_instance(it, mbr_part_t, link);
+        list_foreach(parts->list, iter) {
+                p = list_get_instance(iter, mbr_part_t, link);
                 if (mbr_get_flag(p, ST_LOGIC)) {
                         // writing logical partition
-
+                        
+                        if (p->start_addr < base || p->start_addr + p->length > base + ext->length) {
+                                // out of bounds
+                                return EINVAL;
+                        }
+                        
+                        
                         if (p->ebr == NULL) {
                                 p->ebr = alloc_br();
@@ -210 +225 @@
                         }
 
-
-                        encode_part(p, &(p->ebr->pte[0]), addr);
+                        
+                        
+                        
                         if (prev_part != NULL) {
-                                encode_part(p, &(prev_part->ebr->pte[1]), ext->start_addr);
-                                rc = block_write_direct(dev_handle, p->start_addr, 1, prev_part->ebr);
-                                if (rc != EOK)
+                                // addr is the address of EBR
+                                addr = p->start_addr - base;
+                                // base-1 means start_lba+1
+                                encode_part(p, &(p->ebr->pte[0]), addr - 1);
+                                encode_part(p, &(prev_part->ebr->pte[1]), base);
+                                rc = block_write_direct(dev_handle, prev_addr, 1, prev_part->ebr);
+                                if (rc != EOK) {
+                                        DEBUG_PRINT_2(LIBMBR_NAME ": Error (%d): %s.\n", rc, str_error(rc));
                                         goto end;
+                                }
+                        } else {
+                                // addr is the address of EBR
+                                addr = base;
+                                // base-1 means start_lba+1
+                                encode_part(p, &(p->ebr->pte[0]), base - 1);
                         }
                         
-                        addr = p->start_addr;
+                        //addr = p->start_addr;
+                        prev_addr = addr;
                         prev_part = p;
                 } else {
@@ -261 +289 @@
         }
         
-        if (rc != EOK)
+        if (rc != EOK) {
+                DEBUG_PRINT_2(LIBMBR_NAME ": Error (%d): %s.\n", rc, str_error(rc));
                 goto end;
+        }
 
         goto skip;
@@ -268 +298 @@
 no_extended:
 
-        list_foreach(parts->list, it) {
+        /*list_foreach(parts->list, it) {
                 p = list_get_instance(it, mbr_part_t, link);
                 if (mbr_get_flag(p, ST_LOGIC)) {
@@ -282 +312 @@
                         ++i;
                 }
-        }
+        }*/
+        
+        it = parts->list.head.next;
+        for (i = 0; i < N_PRIMARY; i++) {
+                if (it != &parts->list.head) {
+                        p = list_get_instance(it, mbr_part_t, link);
+                        if (mbr_get_flag(p, ST_LOGIC)) {
+                                // extended does not exist, fail
+                                return EINVAL;
+                        } else {
+                                // writing primary partition
+                                if (i >= 4)
+                                        return EINVAL;
+
+                                encode_part(p, &(mbr->raw_data.pte[i]), 0);
+
+                        }
+                        
+                        it = it->next;
+                } else {
+                        encode_part(NULL, &(mbr->raw_data.pte[i]), 0);
+                }
+        }
+        
 
 skip:
         rc = block_write_direct(dev_handle, 0, 1, &(mbr->raw_data));
-        if (rc != EOK)
+        if (rc != EOK) {
+                DEBUG_PRINT_2(LIBMBR_NAME ": Error (%d): %s.\n", rc, str_error(rc));
                 goto end;
+        }
 
         /*
@@ -382 +437 @@
 
         list_initialize(&(parts->list));
+        
+        parts->n_primary = 0;
+        parts->n_logical = 0;
+        parts->l_extended = NULL;
 
         return parts;
@@ -387 +446 @@
 
 /** Add partition */
-int mbr_add_partition(mbr_partitions_t * parts, mbr_part_t * partition)
-{
-        list_append(&(partition->link), &(parts->list));
+int mbr_add_partition(mbr_partitions_t * parts, mbr_part_t * p)
+{
+        list_append(&(p->link), &(parts->list));
+        if (mbr_get_flag(p, ST_LOGIC)) {
+                parts->n_logical += 1;
+        } else {
+                parts->n_primary += 1;
+        }
+        /* if we're adding new logical partition, we need 1 sector for the EBR 
+         * for that partition (including the next one); we'd better make sure here
+         * before writing */
+        if (mbr_get_flag(p, ST_LOGIC) && p->ebr == NULL) {
+                p->start_addr += 1;
+                p->length -= 1;
+        }
+        //FIXME: we can have multiple extended partitions! :-(
+        
         return EOK;
 }
@@ -396 +469 @@
 int mbr_remove_partition(mbr_partitions_t * parts, size_t idx)
 {
+        DEBUG_PRINT_1(LIBMBR_NAME "Removing partition: %d\n", idx);
         link_t * l = list_nth(&(parts->list), idx);
+        if (l == parts->l_extended) {
+                DEBUG_PRINT_0(LIBMBR_NAME "Removing extended partition.\n");
+                parts->l_extended = NULL;
+        }
         list_remove(l);
         mbr_part_t * p = list_get_instance(l, mbr_part_t, link);
+        if (mbr_get_flag(p, ST_LOGIC)) {
+                parts->n_logical -= 1;
+        } else {
+                parts->n_primary -= 1;
+        }
+        
+        
         mbr_free_partition(p);
         
@@ -448 +533 @@
                 mbr_free_partition(p);
         }
+        
+        free(parts);
 }
 
@@ -465 +552 @@
 }
 
-/** Parse partition entry to mbr_part_t */
+/** Parse partition entry to mbr_part_t
+ * @return              returns 1, if extended partition, 0 otherwise
+ * */
 static int decode_part(pt_entry_t * src, mbr_part_t * trgt, uint32_t base)
 {
@@ -480 +569 @@
 }
 
-/** Parse MBR contents to mbr_part_t list
- * parameter 'p' is allocated for only used primary partitions
- */
+/** Parse MBR contents to mbr_part_t list */
 static int decode_logical(mbr_t * mbr, mbr_partitions_t * parts, mbr_part_t * ext)
 {
@@ -496 +583 @@
 
 
-        uint32_t addr = ext->start_addr;
-        //uint32_t base = ext->start_addr;
+        uint32_t base = ext->start_addr;
+        uint32_t addr = base;
         br_block_t * ebr;
 
@@ -503 +590 @@
         if (rc != EOK)
                 return rc;
-
-        do {
+        
+        ebr = alloc_br();
+        if (ebr == NULL) {
+                rc = ENOMEM;
+                goto end;
+        }
+
+        rc = block_read_direct(mbr->device, addr, 1, ebr);
+        if (rc != EOK) {
+                goto free_ebr_end;
+        }
+
+        if (uint16_t_le2host(ebr->signature) != BR_SIGNATURE) {
+                rc = EINVAL;
+                goto free_ebr_end;
+        }
+        
+        if (ebr->pte[0].ptype == PT_UNUSED) {
+                rc = EOK;
+                goto free_ebr_end;
+        }
+        
+        p = mbr_alloc_partition();
+        if (p == NULL) {
+                rc = ENOMEM;
+                goto free_ebr_end;
+        }
+        
+
+        decode_part(&(ebr->pte[0]), p, base);
+        mbr_set_flag(p, ST_LOGIC, true);
+        p->ebr = ebr;
+        mbr_add_partition(parts, p);
+
+        addr = uint32_t_le2host(ebr->pte[1].first_lba) + base;
+        
+        while (ebr->pte[1].ptype != PT_UNUSED) {
                 ebr = alloc_br();
                 if (ebr == NULL) {
-                        return ENOMEM;
+                        rc = ENOMEM;
+                        goto end;
                 }
 
                 rc = block_read_direct(mbr->device, addr, 1, ebr);
                 if (rc != EOK) {
-                        return rc;
-                }
-
-                //FIXME: is this the right way?
+                        goto free_ebr_end;
+                }
+
                 if (uint16_t_le2host(ebr->signature) != BR_SIGNATURE) {
-                        return EINVAL;
+                        rc = EINVAL;
+                        goto free_ebr_end;
                 }
 
                 p = mbr_alloc_partition();
-
-                decode_part(&(ebr->pte[0]), p, addr);
+                if (p == NULL) {
+                        rc = ENOMEM;
+                        goto free_ebr_end;
+                }
+
+                decode_part(&(ebr->pte[0]), p, base);
                 mbr_set_flag(p, ST_LOGIC, true);
                 p->ebr = ebr;
                 mbr_add_partition(parts, p);
 
-                //TODO: Check this code
-                addr = ebr->pte[1].first_lba + ext->start_addr;
-        } while (ebr->pte[1].ptype != PT_UNUSED);
-
-
+                addr = uint32_t_le2host(ebr->pte[1].first_lba) + base;
+        }
+        
+        rc = EOK;
+        
+free_ebr_end:
+        free(ebr);
+        
+end:
         block_fini(mbr->device);
 
-        return EOK;
+        return rc;
 }
 
@@ -543 +674 @@
                 trgt->status = mbr_get_flag(src, ST_BOOT) ? B_ACTIVE : B_INACTIVE;
                 trgt->ptype = src->type;
-                trgt->first_lba = host2uint32_t_le(src->start_addr - base + 63); //63 sectors skipped
-                trgt->length = host2uint32_t_le(src->length - 64);      //63 + 1 (EBR)
+                trgt->first_lba = host2uint32_t_le(src->start_addr - base);
+                trgt->length = host2uint32_t_le(src->length);
         } else {
                 trgt->status = 0;