Changes in uspace/lib/mbr/libmbr.h [a2aa81cb:9bda5d90] in mainline

File:

• uspace/lib/mbr/libmbr.h (modified) (7 diffs)

uspace/lib/mbr/libmbr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
  * Copyright (c) 2011, 2012, 2013 Dominik Taborsky
  * All rights reserved.
@@ -74 +73 @@
 
 typedef enum {
-        /** Other flags unknown - saving previous state */
         /** Bootability */
-        ST_BOOT = 7,
+        ST_BOOT = 0,
         /** Logical partition, 0 = primary, 1 = logical*/
-        ST_LOGIC = 8
+        ST_LOGIC = 1
 } MBR_FLAGS;
 
@@ -103 +101 @@
         /** Partition overlapping */
         ERR_OVERLAP,
-        /** Partition out of bounds */
+        /** Logical partition out of bounds */
         ERR_OUT_BOUNDS,
         /** No space left for EBR */
@@ -109 +107 @@
         /** Out of memory */
         ERR_NOMEM,
-        /** Libblock error */
-        ERR_LIBBLOCK,
-} mbr_err_val;
+} MBR_ERR_VAL;
 
 
@@ -147 +143 @@
         /** Raw access to data */
         br_block_t raw_data;
+        /** Device where the data are from */
+        service_id_t device;
 } mbr_t;
 
@@ -157 +155 @@
         uint8_t type;
         /** Flags */
-        uint16_t status;
+        uint8_t status;
         /** Address of first block */
         uint32_t start_addr;
@@ -181 +179 @@
 
 /** Both header and partition list */
-typedef struct mbr_label {
-        /** MBR header */
+typedef struct mbr_table {
         mbr_t * mbr;
-        /** Partition list */
         mbr_partitions_t * parts;
-        /** Device where the data are from (or for) */
-        service_id_t device;
-} mbr_label_t;
-
-/* Alloc complete label structure */
-extern mbr_label_t * mbr_alloc_label(void);
-
-/* Read/Write MBR header.
+} mbr_table_t;
+
+/** Read/Write MBR header.
  * WARNING: when changing both header and partitions, write first header,
  * then partitions. The MBR headers' raw_data is NOT updated to follow
  * partition changes. */
 extern mbr_t * mbr_alloc_mbr(void);
-extern int mbr_read_mbr(mbr_label_t *, service_id_t);
-extern int mbr_write_mbr(mbr_label_t *, service_id_t);
-extern int mbr_is_mbr(mbr_label_t *);
-
-/* Read/Write/Set MBR partitions.
+extern mbr_t * mbr_read_mbr(service_id_t dev_handle);
+extern int mbr_write_mbr(mbr_t * mbr, service_id_t dev_handle);
+extern int mbr_is_mbr(mbr_t * mbr);
+
+/** Read/Write/Set MBR partitions.
  * NOTE: Writing partitions writes the complete header as well. */
-extern int mbr_read_partitions(mbr_label_t *);
-extern int          mbr_write_partitions(mbr_label_t *, service_id_t);
-extern mbr_part_t * mbr_alloc_partition(void);
+extern mbr_partitions_t * mbr_read_partitions(mbr_t * mbr);
+extern int                      mbr_write_partitions(mbr_partitions_t * parts, mbr_t * mbr, service_id_t dev_handle);
+extern mbr_part_t *     mbr_alloc_partition(void);
 extern mbr_partitions_t * mbr_alloc_partitions(void);
-extern mbr_err_val  mbr_add_partition(mbr_label_t *, mbr_part_t *);
-extern int          mbr_remove_partition(mbr_label_t *, size_t);
-extern int          mbr_get_flag(mbr_part_t *, MBR_FLAGS);
-extern void         mbr_set_flag(mbr_part_t *, MBR_FLAGS, bool);
-extern uint32_t     mbr_get_next_aligned(uint32_t, unsigned int);
+extern MBR_ERR_VAL      mbr_add_partition(mbr_partitions_t * parts, mbr_part_t * partition);
+extern int                      mbr_remove_partition(mbr_partitions_t * parts, size_t idx);
+extern int                      mbr_get_flag(mbr_part_t * p, MBR_FLAGS flag);
+extern void                     mbr_set_flag(mbr_part_t * p, MBR_FLAGS flag, bool value);
+extern uint32_t         mbr_get_next_aligned(uint32_t addr, unsigned int alignment);
 
 #define mbr_part_foreach(parts, iterator)       \
-        for (iterator  = list_get_instance((parts)->list.head.next, mbr_part_t, link); \
-             iterator != list_get_instance(&((parts)->list.head), mbr_part_t, link); \
-             iterator  = list_get_instance(iterator->link.next, mbr_part_t, link))
-
-
-/* free() wrapper functions. */
-extern void mbr_free_label(mbr_label_t *);
-extern void mbr_free_mbr(mbr_t *);
-extern void mbr_free_partition(mbr_part_t *);
-extern void mbr_free_partitions(mbr_partitions_t *);
+                        for (iterator  = list_get_instance((parts)->list.head.next, mbr_part_t, link); \
+                                 iterator != list_get_instance(&((parts)->list.head), mbr_part_t, link); \
+                                 iterator  = list_get_instance(iterator->link.next, mbr_part_t, link))
+
+
+/** free() wrapper functions. */
+extern void mbr_free_mbr(mbr_t * mbr);
+extern void mbr_free_partition(mbr_part_t * p);
+extern void mbr_free_partitions(mbr_partitions_t * parts);
 
 #endif