Changeset 469739f in mainline for uspace/lib/mbr/libmbr.h

Timestamp:

2013-05-30T13:58:10Z (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:

c9f61150, cb328ab

Parents:

9bda5d90 (diff), a2aa81cb (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:

API changes, bug fixing

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.
@@ -73 +74 @@
 
 typedef enum {
+        /** Other flags unknown - saving previous state */
         /** Bootability */
-        ST_BOOT = 0,
+        ST_BOOT = 7,
         /** Logical partition, 0 = primary, 1 = logical*/
-        ST_LOGIC = 1
+        ST_LOGIC = 8
 } MBR_FLAGS;
 
@@ -101 +103 @@
         /** Partition overlapping */
         ERR_OVERLAP,
-        /** Logical partition out of bounds */
+        /** Partition out of bounds */
         ERR_OUT_BOUNDS,
         /** No space left for EBR */
@@ -107 +109 @@
         /** Out of memory */
         ERR_NOMEM,
-} MBR_ERR_VAL;
+        /** Libblock error */
+        ERR_LIBBLOCK,
+} mbr_err_val;
 
 
@@ -143 +147 @@
         /** Raw access to data */
         br_block_t raw_data;
-        /** Device where the data are from */
-        service_id_t device;
 } mbr_t;
 
@@ -155 +157 @@
         uint8_t type;
         /** Flags */
-        uint8_t status;
+        uint16_t status;
         /** Address of first block */
         uint32_t start_addr;
@@ -179 +181 @@
 
 /** Both header and partition list */
-typedef struct mbr_table {
+typedef struct mbr_label {
+        /** MBR header */
         mbr_t * mbr;
+        /** Partition list */
         mbr_partitions_t * parts;
-} mbr_table_t;
-
-/** Read/Write MBR header.
+        /** 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.
  * 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 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.
+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.
  * NOTE: Writing partitions writes the complete header as well. */
-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 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_alloc_partitions(void);
-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);
+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);
 
 #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_mbr(mbr_t * mbr);
-extern void mbr_free_partition(mbr_part_t * p);
-extern void mbr_free_partitions(mbr_partitions_t * parts);
+        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 *);
 
 #endif