Changeset 1c8bfe8 in mainline for uspace/lib/mbr/libmbr.c

Timestamp:

2013-06-25T00:27:47Z (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:

6317b33, 9256d093

Parents:

6e8e4e19 (diff), cb328ab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

GPT updates

File:

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

uspace/lib/mbr/libmbr.c

@@ -94 +94 @@
  */
 int mbr_read_mbr(mbr_label_t *label, service_id_t dev_handle)
-{
-        if (label == NULL)
-                return EINVAL;
-        
+{       
         int rc;
         
@@ -195 +192 @@
                 
                 rc_ext = decode_part(&(label->mbr->raw_data.pte[i]), p, 0);
-                printf("p: %d %u %u\n", rc_ext, p->start_addr, p->length);
                 mbr_set_flag(p, ST_LOGIC, false);
                 rc = mbr_add_partition(label, p);
@@ -207 +203 @@
                 if (rc_ext) {
                         ext = p;
-                        printf("ext: %u %u\n", p->start_addr, p->length);
                         label->parts->l_extended = &p->link;
                 }
@@ -231 +226 @@
 int mbr_write_partitions(mbr_label_t *label, service_id_t dev_handle)
 {
+        if (label->parts == NULL)
+                return EOK;
+        
+        if (label->mbr == NULL)
+                label->mbr = mbr_alloc_mbr();
+        
         int i = 0;
         int rc;
@@ -248 +249 @@
         for (i = 0; i < N_PRIMARY; i++) {
                 p = list_get_instance(l, mbr_part_t, link);     
-                printf("status: %hu\n", p->status);
                 encode_part(p, &(label->mbr->raw_data.pte[i]), 0, false);
                 l = l->next;