From 88a19367979a28e41e88ef2c9637a0f41d1c3bc6 Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 27 Oct 2008 06:51:17 +0000
Subject: [PATCH] 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@6251 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index ce3305039d..444bc95d49 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -111,8 +111,8 @@ PartitionInstallElToritoChildHandles (
     //
     // Check for valid volume descriptor signature
     //
-    if (VolDescriptor->Type == CDVOL_TYPE_END ||
-        CompareMem (VolDescriptor->Id, CDVOL_ID, sizeof (VolDescriptor->Id)) != 0
+    if (VolDescriptor->Unknown.Type == CDVOL_TYPE_END ||
+        CompareMem (VolDescriptor->Unknown.Id, CDVOL_ID, sizeof (VolDescriptor->Unknown.Id)) != 0
         ) {
       //
       // end of Volume descriptor list
@@ -123,19 +123,19 @@ PartitionInstallElToritoChildHandles (
     // Read the Volume Space Size from Primary Volume Descriptor 81-88 byte,
     // the 32-bit numerical values is stored in Both-byte orders
     //
-    if (VolDescriptor->Type == CDVOL_TYPE_CODED) {
-      VolSpaceSize = VolDescriptor->VolSpaceSize[0];
+    if (VolDescriptor->PrimaryVolume.Type == CDVOL_TYPE_CODED) {
+      VolSpaceSize = VolDescriptor->PrimaryVolume.VolSpaceSize[0];
     }
     //
     // Is it an El Torito volume descriptor?
     //
-    if (CompareMem (VolDescriptor->SystemId, CDVOL_ELTORITO_ID, sizeof (CDVOL_ELTORITO_ID) - 1) != 0) {
+    if (CompareMem (VolDescriptor->BootRecordVolume.SystemId, CDVOL_ELTORITO_ID, sizeof (CDVOL_ELTORITO_ID) - 1) != 0) {
       continue;
     }
     //
     // Read in the boot El Torito boot catalog
     //
-    Lba = UNPACK_INT32 (VolDescriptor->EltCatalog);
+    Lba = UNPACK_INT32 (VolDescriptor->BootRecordVolume.EltCatalog);
     if (Lba > Media->LastBlock) {
       continue;
     }