Changeset 9bda5d90 in mainline for uspace/lib/mbr/libmbr.c

Timestamp:

2013-05-03T01:20:11Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

469739f, c9f61150, f6c8fca

Parents:

700f89e

Message:

libmbr final

File:

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

uspace/lib/mbr/libmbr.c

@@ -54 +54 @@
 
 /** Allocate memory for mbr_t */
-mbr_t * mbr_alloc_mbr()
-{
-        return alloc_br();
+mbr_t * mbr_alloc_mbr(void)
+{
+        return malloc(sizeof(mbr_t));
 }
 
@@ -405 +405 @@
                 
                 // if it's extended, is there any other one?
-                if (p->type == PT_EXTENDED && parts->l_extended != NULL) {
+                if ((p->type == PT_EXTENDED || p->type == PT_EXTENDED_LBA) && parts->l_extended != NULL) {
                         return ERR_EXTENDED_PRESENT;
                 }
@@ -425 +425 @@
                 }
                 parts->n_primary += 1;
+                
+                if (p->type == PT_EXTENDED || p->type == PT_EXTENDED_LBA)
+                        parts->l_extended = &(p->link);
         }