Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 8 insertions, 4 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h b/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
index 4c1462712c..a2e6fd4f5b 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/AcpiDescription/AcpiDescription.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 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        

@@ -28,6 +28,7 @@ Abstract:
     0x3c699197, 0x93c, 0x4c69, {0xb0, 0x6b, 0x12, 0x8a, 0xe3, 0x48, 0x1d, 0xc9} \

   }

 

+#pragma pack(1)

 typedef struct {

   UINT8   AddressSpaceId;

   UINT8   RegisterBitWidth;

@@ -52,7 +53,6 @@ typedef struct {
 // Following structure defines ACPI Description information.

 // This information is platform specific, may be consumed by DXE generic driver.

 //

-#pragma pack(1)

 typedef struct _EFI_ACPI_DESCRIPTION {

   //

   // For Timer

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h b/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
index 8e5025161f..396d89cbd4 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PciOptionRomTable/PciOptionRomTable.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 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        

@@ -20,6 +20,7 @@ Abstract:
 --*/

 

 #ifndef _PCI_OPTION_ROM_TABLE_GUID_H_

+#define _PCI_OPTION_ROM_TABLE_GUID_H_

 

 #define EFI_PCI_OPTION_ROM_TABLE_GUID \

   { 0x7462660f, 0x1cbd, 0x48da, {0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c} }

diff --git a/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h b/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
index 7fc640de96..57f91b7ff3 100644
--- a/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/PeiPeCoffLoader/PeiPeCoffLoader.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 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        

@@ -75,6 +75,9 @@ typedef struct {
 #ifdef EFI_NT_EMULATOR

   VOID                              **ModHandle;

 #endif

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

+  EFI_PHYSICAL_ADDRESS              HiiResourceData;

+#endif

 } EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT;

 

 typedef