https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d99a70597628cfbca3bb051720c4dbef6acc9db
commit 5d99a70597628cfbca3bb051720c4dbef6acc9db
Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Sun Sep 22 17:43:42 2024 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Wed Sep 25 12:56:46 2024 +0200
[FREELDR] Minimally reformat include/fs/iso.h
---
boot/freeldr/freeldr/include/fs/iso.h | 128 +++++++++++++++++-----------------
1 file changed, 63 insertions(+), 65 deletions(-)
diff --git a/boot/freeldr/freeldr/include/fs/iso.h
b/boot/freeldr/freeldr/include/fs/iso.h
index 8786e8d5dd2..765f49b1fe5 100644
--- a/boot/freeldr/freeldr/include/fs/iso.h
+++ b/boot/freeldr/freeldr/include/fs/iso.h
@@ -20,82 +20,80 @@
#pragma once
#include <pshpack1.h>
-struct _DIR_RECORD
+typedef struct _DIR_RECORD
{
- UCHAR RecordLength; // 1
- UCHAR ExtAttrRecordLength; // 2
- ULONG ExtentLocationL; // 3-6
- ULONG ExtentLocationM; // 7-10
- ULONG DataLengthL; // 11-14
- ULONG DataLengthM; // 15-18
- UCHAR Year; // 19
- UCHAR Month; // 20
- UCHAR Day; // 21
- UCHAR Hour; // 22
- UCHAR Minute; // 23
- UCHAR Second; // 24
- UCHAR TimeZone; // 25
- UCHAR FileFlags; // 26
- UCHAR FileUnitSize; // 27
- UCHAR InterleaveGapSize; // 28
- ULONG VolumeSequenceNumber; // 29-32
- UCHAR FileIdLength; // 33
- UCHAR FileId[1]; // 34
-};
-typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD;
+ UCHAR RecordLength; // 1
+ UCHAR ExtAttrRecordLength; // 2
+ ULONG ExtentLocationL; // 3-6
+ ULONG ExtentLocationM; // 7-10
+ ULONG DataLengthL; // 11-14
+ ULONG DataLengthM; // 15-18
+ UCHAR Year; // 19
+ UCHAR Month; // 20
+ UCHAR Day; // 21
+ UCHAR Hour; // 22
+ UCHAR Minute; // 23
+ UCHAR Second; // 24
+ UCHAR TimeZone; // 25
+ UCHAR FileFlags; // 26
+ UCHAR FileUnitSize; // 27
+ UCHAR InterleaveGapSize; // 28
+ ULONG VolumeSequenceNumber; // 29-32
+ UCHAR FileIdLength; // 33
+ UCHAR FileId[1]; // 34
+} DIR_RECORD, *PDIR_RECORD;
-/* Volume Descriptor header*/
-struct _VD_HEADER
+/* Volume Descriptor header */
+typedef struct _VD_HEADER
{
- UCHAR VdType; // 1
- UCHAR StandardId[5]; // 2-6
- UCHAR VdVersion; // 7
-};
-typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER;
+ UCHAR VdType; // 1
+ UCHAR StandardId[5]; // 2-6
+ UCHAR VdVersion; // 7
+} VD_HEADER, *PVD_HEADER;
-/* Primary Volume Descriptor */
-struct _PVD
+/*
+ * Primary Volume Descriptor
+ * See also cdfs/cd.h RAW_ISO_VD
+ */
+typedef struct _PVD
{
- UCHAR VdType; // 1
- CHAR StandardId[5]; // 2-6
- UCHAR VdVersion; // 7
- UCHAR unused0; // 8
- CHAR SystemId[32]; // 9-40
- CHAR VolumeId[32]; // 41-72
- UCHAR unused1[8]; // 73-80
- ULONG VolumeSpaceSizeL; // 81-84
- ULONG VolumeSpaceSizeM; // 85-88
- UCHAR unused2[32]; // 89-120
- ULONG VolumeSetSize; // 121-124
- ULONG VolumeSequenceNumber; // 125-128
- ULONG LogicalBlockSize; // 129-132
- ULONG PathTableSizeL; // 133-136
- ULONG PathTableSizeM; // 137-140
- ULONG LPathTablePos; // 141-144
- ULONG LOptPathTablePos; // 145-148
- ULONG MPathTablePos; // 149-152
- ULONG MOptPathTablePos; // 153-156
- DIR_RECORD RootDirRecord; // 157-190
- CHAR VolumeSetIdentifier[128]; // 191-318
- CHAR PublisherIdentifier[128]; // 319-446
+ UCHAR VdType; // 1
+ CHAR StandardId[5]; // 2-6
+ UCHAR VdVersion; // 7
+ UCHAR unused0; // 8
+ CHAR SystemId[32]; // 9-40
+ CHAR VolumeId[32]; // 41-72
+ UCHAR unused1[8]; // 73-80
+ ULONG VolumeSpaceSizeL; // 81-84
+ ULONG VolumeSpaceSizeM; // 85-88
+ UCHAR unused2[32]; // 89-120
+ ULONG VolumeSetSize; // 121-124
+ ULONG VolumeSequenceNumber; // 125-128
+ ULONG LogicalBlockSize; // 129-132
+ ULONG PathTableSizeL; // 133-136
+ ULONG PathTableSizeM; // 137-140
+ ULONG LPathTablePos; // 141-144
+ ULONG LOptPathTablePos; // 145-148
+ ULONG MPathTablePos; // 149-152
+ ULONG MOptPathTablePos; // 153-156
+ DIR_RECORD RootDirRecord; // 157-190
+ CHAR VolumeSetIdentifier[128]; // 191-318
+ CHAR PublisherIdentifier[128]; // 319-446
- /* more data ... */
-
-};
+ /* more data ... */
+} PVD, *PPVD;
#include <poppack.h>
-typedef struct _PVD PVD, *PPVD;
-
-typedef struct
+typedef struct _ISO_FILE_INFO
{
- ULONG FileStart; // File start sector
- ULONG FileSize; // File size
- ULONG FilePointer; // File pointer
- BOOLEAN Directory;
- ULONG DriveNumber;
-} ISO_FILE_INFO, * PISO_FILE_INFO;
+ ULONG FileStart; // File start sector
+ ULONG FileSize; // File size
+ ULONG FilePointer; // File pointer
+ BOOLEAN Directory;
+ ULONG DriveNumber;
+} ISO_FILE_INFO, *PISO_FILE_INFO;
const DEVVTBL* IsoMount(ULONG DeviceId);
