re-defined CDROM_VOLUME_DESCRIPTOR to be a union including Boot Record Volume Descriptor and Primary Volume Description.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6250 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2008-10-27 03:34:58 +00:00
parent a397f1b06e
commit 3052ec6b91
1 changed files with 40 additions and 17 deletions

View File

@ -1,7 +1,11 @@
/** @file /** @file
ElTorito Partitions Format Definition. ElTorito Partitions Format Definition.
This file includes some defintions from
1. "El Torito" Bootable CD-ROM Format Specification, Version 1.0.
2. Volume and File Structure of CDROM for Information Interchange,
Standard ECMA-119. (IS0 9660)
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2008, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -15,9 +19,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _ELTORITO_H_ #ifndef _ELTORITO_H_
#define _ELTORITO_H_ #define _ELTORITO_H_
// ///
// CDROM_VOLUME_DESCRIPTOR.Types /// CDROM_VOLUME_DESCRIPTOR.Types, defined in ISO 9660
// ///
#define CDVOL_TYPE_STANDARD 0x0 #define CDVOL_TYPE_STANDARD 0x0
#define CDVOL_TYPE_CODED 0x1 #define CDVOL_TYPE_CODED 0x1
#define CDVOL_TYPE_END 0xFF #define CDVOL_TYPE_END 0xFF
@ -53,24 +57,43 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#pragma pack(1) #pragma pack(1)
/// ///
/// El Torito Volume Descriptor /// El Torito Volume Descriptor
/// Note that the CDROM_VOLUME_DESCRIPTOR does not match the ISO-9660 /// Note that the CDROM_VOLUME_DESCRIPTOR does not match the ISO-9660
/// descriptor. For some reason descriptor used by El Torito is /// descriptor. For some reason descriptor used by El Torito is
/// different, but they start the same. The El Torito descriptor /// different, but they start the same. The El Torito descriptor
/// is left shifted 1 byte starting with the SystemId. (Note this /// is left shifted 1 byte starting with the SystemId. (Note this
/// causes the field to get unaligned) /// causes the field to get unaligned)
/// ///
typedef struct { typedef union {
UINT8 Type; struct {
CHAR8 Id[5]; // CD001 UINT8 Type;
UINT8 Version; CHAR8 Id[5]; ///< "CD001"
CHAR8 SystemId[26]; CHAR8 Reserved[82];
CHAR8 Unused[38]; } Unknown;
UINT8 EltCatalog[4];
CHAR8 Unused2[5]; struct {
UINT32 VolSpaceSize[2]; UINT8 Type; ///< Must be 0
} CDROM_VOLUME_DESCRIPTOR; CHAR8 Id[5]; ///< "CD001"
UINT8 Version; ///< Must be 1
CHAR8 SystemId[32]; ///< "EL TORITO SPECIFICATION"
CHAR8 Unused[32]; ///< Must be 0
UINT8 EltCatalog[4]; ///< Absolute pointer to first sector of Boot Catalog
CHAR8 Unused2[13]; ///< Must be 0
} BootRecordVolume;
struct {
UINT8 Type;
CHAR8 Id[5]; ///< "CD001"
UINT8 Version;
UINT8 Unused; ///< Must be 0
CHAR8 SystemId[32];
CHAR8 VolumeId[32];
UINT8 Unused2[8]; ///< Must be 0
UINT32 VolSpaceSize[2]; ///< the number of Logical Blocks
} PrimaryVolume;
} CDROM_VOLUME_DESCRIPTOR;
/// ///
/// Catalog Entry /// Catalog Entry