Changeset 69059 in vbox for trunk

Timestamp:

Oct 12, 2017 12:31:42 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118339

Message:

UDF: Some more structures.

Location:

trunk

Files:

• include/iprt/formats/udf.h (modified) (2 diffs)
• src/VBox/Runtime/common/fs/isovfs.cpp (modified) (1 diff)

trunk/include/iprt/formats/udf.h

@@ -840 +840 @@
     /** 0x02: Reserved \#1. */
     uint16_t        uReserved1;
-    /** 0x04: Partition number (UDF_ENTITY_ID_VPM_PARTITION_TYPE,
+    /** 0x04: Partition ID type (UDF_ENTITY_ID_VPM_PARTITION_TYPE,
      *  UDF_ENTITY_ID_SPM_PARTITION_TYPE, or UDF_ENTITY_ID_MPM_PARTITION_TYPE). */
     UDFENTITYID     idPartitionType;
@@ -847 +847 @@
     /** 0x26: Partition number. */
     uint16_t        uPartitionNo;
-    /** 0x28: Reserved \#2. */
-    uint8_t         abReserved2[24];
+    /** 0x28: Data specific to the partition ID type. */
+    union
+    {
+        /** 0x28: Generic view. */
+        uint8_t     ab[24];
+
+        /** UDF_ENTITY_ID_VPM_PARTITION_TYPE. */
+        struct
+        {
+            /** 0x28: Reserved. */
+            uint8_t         abReserved2[24];
+        } Vpm;
+
+        /** UDF_ENTITY_ID_SPM_PARTITION_TYPE. */
+        struct
+        {
+            /** 0x28: Packet length in blocks.   */
+            uint16_t        cBlocksPerPacket;
+            /** 0x2a: Number of sparing tables. */
+            uint8_t         cSparingTables;
+            /** 0x2b: Reserved padding byte. */
+            uint8_t         bReserved2;
+            /** 0x2c: The size of each sparing table. */
+            uint32_t        cbSparingTable;
+            /** 0x30: The sparing table locations (logical block). */
+            uint32_t        aoffSparingTables[4];
+        } Spm;
+
+        /** UDF_ENTITY_ID_MPM_PARTITION_TYPE. */
+        struct
+        {
+            /** 0x28: Metadata file entry location (logical block). */
+            uint32_t        offMetadataFile;
+            /** 0x2c: Metadata mirror file entry location (logical block). */
+            uint32_t        offMetadataMirrorFile;
+            /** 0x30: Metadata bitmap file entry location (logical block). */
+            uint32_t        offMetadataBitmapFile;
+            /** 0x34: The metadata allocation unit (logical blocks) */
+            uint32_t        cBlocksAllocationUnit;
+            /** 0x38: The metadata allocation unit alignment (logical blocks). */
+            uint16_t        cBlocksAlignmentUnit;
+            /** 0x3a: Flags, UDFPARTMAPMETADATA_F_XXX. */
+            uint8_t         fFlags;
+            /** 0x3b: Reserved. */
+            uint8_t         abReserved2[5];
+        } Mpm;
+    } u;
 } UDFPARTMAPTYPE2;
 AssertCompileSize(UDFPARTMAPTYPE2, 64);
 /** Pointer to a type 2 partition map. */
 typedef UDFPARTMAPTYPE2 *PUDFPARTMAPTYPE2;
-/** Pointer to a const type 2 partition map1. */
+/** Pointer to a const type 2 partition map. */
 typedef UDFPARTMAPTYPE2 const *PCUDFPARTMAPTYPE2;
+
+/** @name UDFPARTMAPMETADATA_F_XXX
+ * @{ */
+/** Indicates that the metadata is mirrored too, not just the file entry. */
+#define UDFPARTMAPMETADATA_F_DATA_MIRRORED      UINT8_C(1)
+/** @} */
 
 

trunk/src/VBox/Runtime/common/fs/isovfs.cpp

@@ -4787 +4787 @@
                     UDF_LOG2_MEMBER_EX(pType2, "#06RX16", uVolumeSeqNo, 5);
                     UDF_LOG2_MEMBER_EX(pType2, "#06RX16", uPartitionNo, 5);
+                    if (UDF_ENTITY_ID_EQUALS(&pType2->idPartitionType, UDF_ENTITY_ID_SPM_PARTITION_TYPE))
+                    {
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#06RX16", Spm.cBlocksPerPacket, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#04RX8", Spm.cSparingTables, 5);
+                        if (pType2->u.Spm.bReserved2)
+                            UDF_LOG2_MEMBER_EX(&pType2->u, "#04RX8", Spm.bReserved2, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Spm.cbSparingTable, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Spm.aoffSparingTables[0], 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Spm.aoffSparingTables[1], 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Spm.aoffSparingTables[2], 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Spm.aoffSparingTables[3], 5);
+                    }
+                    else if (UDF_ENTITY_ID_EQUALS(&pType2->idPartitionType, UDF_ENTITY_ID_MPM_PARTITION_TYPE))
+                    {
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Mpm.offMetadataFile, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Mpm.offMetadataMirrorFile, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Mpm.offMetadataBitmapFile, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#010RX32", Mpm.cBlocksAllocationUnit, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#06RX16", Mpm.cBlocksAlignmentUnit, 5);
+                        UDF_LOG2_MEMBER_EX(&pType2->u, "#04RX8", Mpm.fFlags, 5);
+                        if (!ASMMemIsZero(pType2->u.Mpm.abReserved2, sizeof(pType2->u.Mpm.abReserved2)))
+                            UDF_LOG2_MEMBER_EX(&pType2->u, ".5Rhxs", Mpm.abReserved2, 5);
+                    }
                 }
                 else