Changeset 77a194c in mainline for uspace/lib/label/include/std/mbr.h

Timestamp:

2015-11-04T18:55:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (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:

Merge new disk partitioning architecture.

File:

• uspace/lib/label/include/std/mbr.h (moved) (moved from uspace/lib/mbr/mbr.h ) (4 diffs)

uspace/lib/label/include/std/mbr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2011-2013 Dominik Taborsky
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
- /** @addtogroup libmbr
+/** @addtogroup bd
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef LIBMBR_MBR_H_
-#define LIBMBR_MBR_H_
+#ifndef LIBLABEL_STD_MBR_H_
+#define LIBLABEL_STD_MBR_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 enum {
+        /** Block address of Master Boot Record. */
+        mbr_ba = 0,
+
+        /** First block allowed for allocation */
+        mbr_ablock0 = 18,
+
         /** Number of primary partition records */
-        N_PRIMARY = 4,
-        
+        mbr_nprimary = 4,
+
         /** Boot record signature */
-        BR_SIGNATURE = 0xAA55
+        mbr_br_signature = 0xAA55,
+
+        /** EBR PTE slot describing partition corresponding to this EBR */
+        mbr_ebr_pte_this = 0,
+        /** EBR PTE slot describing the next EBR */
+        mbr_ebr_pte_next = 1
 };
 
-enum {
-        /** Non-bootable */
-        B_INACTIVE = 0x00,
-        /** Bootable */
-        B_ACTIVE = 0x80,
-        /** Anything else means invalid */
-};
-
-enum {
+enum mbr_ptype {
         /** Unused partition entry */
-        PT_UNUSED = 0x00,
+        mbr_pt_unused       = 0x00,
         /** Extended partition */
-        PT_EXTENDED = 0x05,
+        mbr_pt_extended     = 0x05,
         /** Extended partition with LBA */
-        PT_EXTENDED_LBA = 0x0F,
-        /** GPT Protective partition */
-        PT_GPT = 0xEE,
+        mbr_pt_extended_lba = 0x0f,
+        /** FAT16 with LBA */
+        mbr_pt_fat16_lba    = 0x0e,
+        /** FAT32 with LBA */
+        mbr_pt_fat32_lba    = 0x0c,
+        /** IFS, HPFS, NTFS, exFAT */
+        mbr_pt_ms_advanced  = 0x07,
+        /** Minix */
+        mbr_pt_minix        = 0x81,
+        /** Linux */
+        mbr_pt_linux        = 0x83,
+        /** GPT Protective */
+        mbr_pt_gpt_protect  = 0xee 
 };
 
@@ -79 +91 @@
         /** Number of blocks in partition */
         uint32_t length;
-} __attribute__((packed)) pt_entry_t;
+} __attribute__((packed)) mbr_pte_t;
 
 /** Structure of a boot-record block */
 typedef struct {
-        /** Area for boot code */
+        /* Area for boot code */
         uint8_t code_area[440];
-        /** Optional media ID */
+
+        /* Optional media ID */
         uint32_t media_id;
-        /** Padding */
+
         uint16_t pad0;
+
         /** Partition table entries */
-        pt_entry_t pte[N_PRIMARY];
+        mbr_pte_t pte[mbr_nprimary];
+
         /** Boot record block signature (@c BR_SIGNATURE) */
         uint16_t signature;
-} __attribute__((packed)) br_block_t;
+} __attribute__((packed)) mbr_br_block_t;
 
 #endif
 
+/** @}
+ */