Changeset 9bda5d90 in mainline for uspace/lib

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

Location:

uspace/lib

Files:

• gpt/libgpt.c (modified) (1 diff)
• gpt/libgpt.h (modified) (1 diff)
• mbr/libmbr.c (modified) (3 diffs)
• mbr/libmbr.h (modified) (1 diff)

uspace/lib/gpt/libgpt.c

@@ -59 +59 @@
 
 /** Allocate memory for gpt header */
-gpt_t * gpt_alloc_gpt_header()
+gpt_t * gpt_alloc_gpt_header(void)
 {
         return malloc(sizeof(gpt_t));

uspace/lib/gpt/libgpt.h

@@ -139 +139 @@
 
 
-extern gpt_t * gpt_alloc_gpt_header();
+extern gpt_t * gpt_alloc_gpt_header(void);
 extern gpt_t * gpt_read_gpt_header(service_id_t dev_handle);
 extern int gpt_write_gpt_header(gpt_t * header, service_id_t dev_handle);
 
-extern gpt_partitions_t *       gpt_alloc_partitions();
+extern gpt_partitions_t *       gpt_alloc_partitions(void);
 extern gpt_partitions_t *       gpt_read_partitions     (gpt_t * gpt);
 extern int                                      gpt_write_partitions    (gpt_partitions_t * parts, gpt_t * header, service_id_t dev_handle);

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);
         }
 

uspace/lib/mbr/libmbr.h

@@ -188 +188 @@
  * then partitions. The MBR headers' raw_data is NOT updated to follow
  * partition changes. */
-extern mbr_t * mbr_alloc_mbr();
+extern mbr_t * mbr_alloc_mbr(void);
 extern mbr_t * mbr_read_mbr(service_id_t dev_handle);
 extern int mbr_write_mbr(mbr_t * mbr, service_id_t dev_handle);