1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

  1.1) Bug fixes. (For details, please check  Documents & files: Snapshot/Release Notes at https://edk.tianocore.org/servlets/ProjectDocumentList?folderID=43&expandFolder=43&folderID=6)
  1.2) Add new UEFI protocol definitions for AbsolutePointer, FormBrowser2, HiiConfigAccess, HiiConfigRouting, HiiDatabase, HiiFont, HiiImage, HiiString, SimpleTextInputEx, DPC protocol.
  1.3) Add Smbios 2.5, 2.6 supports.

  Incompatible changes hilighted:
  1) EFI_MANAGED_NETWORK_PROTOCOL_GUID changed.
  2) EFI_IP4_IPCONFIG_DATA changed.

2) Add in EdkCompatibilityPkg/EdkCompatibilityPkg.dsc to build all libraries in this package.

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

11 files changed, 176 insertions, 26 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubRecords.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubRecords.h
index baaf1819cc..949446b5ce 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubRecords.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubRecords.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                  

 All rights reserved. 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        

@@ -29,8 +29,11 @@ Abstract:
 #ifndef _DATAHUB_RECORDS_H_

 #define _DATAHUB_RECORDS_H_

 

-

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

+#include "TianoHii.h"

+#else

 #include "EfiInternalFormRepresentation.h"

+#endif

 #include "DataHubSubClass.h"

 #include "DataHubSubClassProcessor.h"

 #include "DataHubSubClassCache.h"

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassCache.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassCache.h
index 0e7ed3212d..33dc63b579 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassCache.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassCache.h
@@ -73,7 +73,8 @@ typedef enum {
   EfiCacheAssociativity4Way = 5,

   EfiCacheAssociativityFully = 6,

   EfiCacheAssociativity8Way = 7,

-  EfiCacheAssociativity16Way = 8

+  EfiCacheAssociativity16Way = 8,

+  EfiCacheAssociativity24Way = 9

 } EFI_CACHE_ASSOCIATIVITY_DATA;

 

 typedef struct {  

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
index 2ab674324d..38e35f1932 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -188,6 +188,7 @@ typedef struct {
   EFI_MEMORY_TYPE_DETAIL      MemoryTypeDetail;

   UINT16                      MemorySpeed;

   EFI_MEMORY_STATE            MemoryState;

+  UINT8                       MemoryAttributes;

 } EFI_MEMORY_ARRAY_LINK;

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
index 901a464487..5c3e6dae04 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h
@@ -1,6 +1,6 @@
 /*++

  

-Copyright (c) 2004 - 2006, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -43,6 +43,11 @@ typedef struct {
   UINT8   LastPciBus;

 } EFI_MISC_LAST_PCI_BUS;

 

+typedef struct {

+  UINT8      FunctionNum  :3;

+  UINT8      DeviceNum    :5;

+} EFI_MISC_DEV_FUNC_NUM;

+

 //

 //////////////////////////////////////////////////////////////////////////////

 //

@@ -225,6 +230,10 @@ typedef enum {
   EfiMiscChassisTypeRackMountChassis = 0x17,

   EfiMiscChassisTypeSealedCasePc = 0x18,

   EfiMiscChassisMultiSystemChassis = 0x19,

+  EfiMiscChassisCompactPCI = 0x1A,

+  EfiMiscChassisAdvancedTCA = 0x1B,

+  EfiMiscChassisBlade = 0x1C,

+  EfiMiscChassisBladeEnclosure = 0x1D

 } EFI_MISC_CHASSIS_TYPE;

 

 typedef struct {

@@ -323,6 +332,7 @@ typedef enum {
   EfiPortConnectorTypeHeadPhoneMiniJack = 0x1F,

   EfiPortConnectorTypeBNC = 0x20,

   EfiPortConnectorType1394 = 0x21,

+  EfiPortConnectorTypeSasSata = 0x22,

   EfiPortConnectorTypePC98 = 0xA0,

   EfiPortConnectorTypePC98Hireso = 0xA1,

   EfiPortConnectorTypePCH98 = 0xA2,

@@ -364,6 +374,8 @@ typedef enum {
   EfiPortTypeAudioPort = 0x1D,

   EfiPortTypeModemPort = 0x1E,

   EfiPortTypeNetworkPort = 0x1F,

+  EfiPortTypeSata = 0x20,

+  EfiPortTypeSas = 0x21,

   EfiPortType8251Compatible = 0xA0,

   EfiPortType8251FifoCompatible = 0xA1,

   EfiPortTypeOther = 0xFF,

@@ -412,6 +424,11 @@ typedef enum {
   EfiSlotTypePC98LocalBus = 0xA3,

   EfiSlotTypePC98Card = 0xA4,

   EfiSlotTypePciExpress = 0xA5,

+  EfiSlotTypePciExpressX1 = 0xA6,

+  EfiSlotTypePciExpressX2 = 0xA7,

+  EfiSlotTypePciExpressX4 = 0xA8,

+  EfiSlotTypePciExpressX8 = 0xA9,

+  EfiSlotTypePciExpressX16 = 0xAA

 } EFI_MISC_SLOT_TYPE;

 

 typedef enum {  

@@ -469,6 +486,9 @@ typedef struct {
   UINT16                        SlotId;

   EFI_MISC_SLOT_CHARACTERISTICS SlotCharacteristics;

   EFI_DEVICE_PATH_PROTOCOL      SlotDevicePath;

+  UINT16                        SegmentGroupNum;

+  UINT8                         BusNum;

+  EFI_MISC_DEV_FUNC_NUM         DevFuncNum;

 } EFI_MISC_SYSTEM_SLOT_DESIGNATION;      

 

 //

@@ -486,6 +506,9 @@ typedef enum {
   EfiOnBoardDeviceTypeEthernet = 5,

   EfiOnBoardDeviceTypeTokenRing = 6,

   EfiOnBoardDeviceTypeSound = 7,

+  EfiOnBoardDeviceTypePataController = 8,

+  EfiOnBoardDeviceTypeSataController = 9,

+  EfiOnBoardDeviceTypeSasController = 10

 } EFI_MISC_ONBOARD_DEVICE_TYPE;

 

 typedef struct {

@@ -1010,6 +1033,48 @@ typedef struct {
 //

 //////////////////////////////////////////////////////////////////////////////

 //

+//Additional Information Record - SMBIOS Type 40

+//

+typedef struct {                       

+  UINT8                   EntryLength; 

+  UINT8                   ReferencedSmbiosType;

+  EFI_INTER_LINK_DATA     ReferencedLink;

+  UINT8                   ReferencedOffset;

+  STRING_REF              EntryString;

+  EFI_PHYSICAL_ADDRESS    ValueAddress;

+} EFI_MISC_ADDITIONAL_INFORMATION_ENTRY;                               

+                                   

+typedef struct {

+  UINT8                                  NumberOfAdditionalInformationEntries;

+  EFI_PHYSICAL_ADDRESS                   AdditionalInfoEntriesAddr;

+} EFI_MISC_ADDITIONAL_INFORMATION;

+

+#define EFI_MISC_ADDITIONAL_INFORMATION_RECORD_NUMBER 0x00000022

+

+//

+//////////////////////////////////////////////////////////////////////////////

+//

+//Onboard Devices Extended Infomation Record - SMBIOS Type 41

+//

+typedef struct {

+  UINT8     TypeOfDevice:7;

+  UINT8     DeviceStatus:1;

+} EFI_MISC_DEVICE_TYPE;

+

+typedef struct {

+  STRING_REF              ReferenceDesignation;

+  EFI_MISC_DEVICE_TYPE    DeviceType;

+  UINT8                   DeviceTypeInstance;

+  UINT16                  SegmentGroupNum;

+  UINT8                   BusNum;

+  EFI_MISC_DEV_FUNC_NUM   DevFuncNum;

+} EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION;

+

+#define EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION_RECORD_NUMBER 0x00000023

+

+//

+//////////////////////////////////////////////////////////////////////////////

+//

 // Generic Data Record - All SMBIOS Type

 // Put smbios raw data into one datahub record directly. Smbios driver would

 // copy smbios raw data into smbios table but not take any translation.

@@ -1113,7 +1178,9 @@ typedef union {
   EFI_MISC_IPMI_INTERFACE_TYPE_DATA                     MiscIpmiInterfaceTypeData;

   EFI_MISC_SYSTEM_POWER_SUPPLY                          MiscPowerSupplyInfo;

   EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION                  MiscSmbiosStructEncapsulation; 

-  EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD                  MiscManagementDeviceThreshold; 

+  EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD                  MiscManagementDeviceThreshold;

+  EFI_MISC_ADDITIONAL_INFORMATION                       MiscAdditionalInformation;

+  EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION         MiscOnBoardDevicesExtendedInformation;

 } EFI_MISC_SUBCLASS_RECORDS;

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassProcessor.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassProcessor.h
index ed0c885da0..90952fffdc 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassProcessor.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassProcessor.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -190,10 +190,16 @@ typedef enum {
   EfiProcessorFamilyHobbit       = 0x70,

   EfiProcessorFamilyCrusoeTM5000 = 0x78,

   EfiProcessorFamilyCrusoeTM3000 = 0x79,

+  EfiProcessorFamilyEfficeonTM8000 = 0x7A,

   EfiProcessorFamilyWeitek       = 0x80,

   EfiProcessorFamilyItanium      = 0x82,

   EfiProcessorFamilyAmdAthlon64  = 0x83,

   EfiProcessorFamilyAmdOpteron   = 0x84,

+  EfiProcessorFamilyAmdSempron   = 0x85,

+  EfiProcessorFamilyAmdTurion64Mobile = 0x86,

+  EfiProcessorFamilyDualCoreAmdOpteron = 0x87,

+  EfiProcessorFamilyAmdAthlon64X2DualCore = 0x88,

+  EfiProcessorFamilyAmdTurion64X2Mobile   = 0x89,

   EfiProcessorFamilyPARISC       = 0x90,

   EfiProcessorFamilyPaRisc8500   = 0x91,

   EfiProcessorFamilyPaRisc8000   = 0x92,

@@ -215,13 +221,35 @@ typedef enum {
   EfiProcessorFamilyIntelCeleronD = 0xBA,

   EfiProcessorFamilyIntelPentiumD = 0xBB,

   EfiProcessorFamilyIntelPentiumEx = 0xBC,

+  EfiProcessorFamilyIntelCoreBrand = 0xBD,

+  EfiProcessorFamilyReserved       = 0xBE,

+  EfiProcessorFamilyIntelCore2     = 0xBF,

   EfiProcessorFamilyIBM390       = 0xC8,

   EfiProcessorFamilyG4           = 0xC9,

   EfiProcessorFamilyG5           = 0xCA,

+  EfiProcessorFamilyG6           = 0xCB,

+  EfiProcessorFamilyzArchitectur = 0xCC,

+  EfiProcessorFamilyViaC7M      = 0xD2,

+  EfiProcessorFamilyViaC7D      = 0xD3,

+  EfiProcessorFamilyViaC7       = 0xD4,

+  EfiProcessorFamilyViaEden     = 0xD5,

   EfiProcessorFamilyi860         = 0xFA,

-  EfiProcessorFamilyi960         = 0xFB

+  EfiProcessorFamilyi960         = 0xFB,

+  EfiProcessorFamilyIndicatorFamily2    = 0xFE

 } EFI_PROCESSOR_FAMILY_DATA;

 

+typedef enum {

+  EfiProcessorFamilySh3           = 0x104,

+  EfiProcessorFamilySh4           = 0x105,

+  EfiProcessorFamilyArm           = 0x118,

+  EfiProcessorFamilyStrongArm     = 0x119,

+  EfiProcessorFamily6x86          = 0x12C,

+  EfiProcessorFamilyMediaGx       = 0x12D,

+  EfiProcessorFamilyMii           = 0x12E,

+  EfiProcessorFamilyWinChip       = 0x140,

+  EfiProcessorFamilyDsp           = 0x15E,

+  EfiProcessorFamilyVideo         = 0x1F4

+} EFI_PROCESSOR_FAMILY2_DATA;  

 

 typedef EFI_EXP_BASE10_DATA EFI_PROCESSOR_VOLTAGE_DATA;

 

@@ -282,7 +310,10 @@ typedef enum {
   EfiProcessorSocket939 = 0x12,

   EfiProcessorSocketmPGA604 = 0x13,

   EfiProcessorSocketLGA771 = 0x14,

-  EfiProcessorSocketLGA775 = 0x15

+  EfiProcessorSocketLGA775 = 0x15,

+  EfiProcessorSocketS1 = 0x16,

+  EfiProcessorSocketAm2 = 0x17,

+  EfiProcessorSocketF   = 0x18

 } EFI_PROCESSOR_SOCKET_TYPE_DATA;

 

 typedef STRING_REF EFI_PROCESSOR_SOCKET_NAME_DATA;

@@ -297,8 +328,19 @@ typedef enum {
 

 typedef UINTN   EFI_PROCESSOR_PACKAGE_NUMBER_DATA;

 

+typedef UINT8   EFI_PROCESSOR_CORE_COUNT_DATA;

+typedef UINT8   EFI_PROCESSOR_ENABLED_CORE_COUNT_DATA;

+typedef UINT8   EFI_PROCESSOR_THREAD_COUNT_DATA;

+

 typedef EFI_EXP_BASE10_DATA   EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;

 

+typedef struct {

+  UINT16  Reserved              :1;

+  UINT16  Unknown               :1;

+  UINT16  Capable64Bit          :1;

+  UINT16  Reserved2             :13;

+} EFI_PROCESSOR_CHARACTERISTICS_DATA;

+

 typedef enum {

   ProcessorCoreFrequencyRecordType = 1,

   ProcessorFsbFrequencyRecordType = 2,

@@ -323,7 +365,12 @@ typedef enum {
   ProcessorPackageNumberRecordType = 21,

   ProcessorCoreFrequencyListRecordType = 22,

   ProcessorFsbFrequencyListRecordType  = 23,

-  ProcessorHealthStatusRecordType  = 24

+  ProcessorHealthStatusRecordType  = 24,

+  ProcessorCoreCountRecordType = 25,

+  ProcessorEnabledCoreCountRecordType = 26,

+  ProcessorThreadCountRecordType = 27,

+  ProcessorCharacteristicsRecordType = 28,

+  ProcessorFamily2RecordType = 29

 } EFI_CPU_VARIABLE_RECORD_TYPE;

 

 typedef union {

@@ -350,6 +397,11 @@ typedef union {
   EFI_PROCESSOR_ASSET_TAG_DATA            ProcessorAssetTag;

   EFI_PROCESSOR_HEALTH_STATUS             ProcessorHealthStatus;

   EFI_PROCESSOR_PACKAGE_NUMBER_DATA       ProcessorPackageNumber;

+  EFI_PROCESSOR_CORE_COUNT_DATA           ProcessorCoreCount;

+  EFI_PROCESSOR_ENABLED_CORE_COUNT_DATA   ProcessorEnabledCoreCount;

+  EFI_PROCESSOR_THREAD_COUNT_DATA         ProcessorThreadCount;

+  EFI_PROCESSOR_CHARACTERISTICS_DATA      ProcessorCharacteristics;

+  EFI_PROCESSOR_FAMILY2_DATA              ProcessorFamily2;

 } EFI_CPU_VARIABLE_RECORD;

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/StatusCodeDataTypeId/StatusCodeDataTypeId.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/StatusCodeDataTypeId/StatusCodeDataTypeId.h
index bc26539ac0..beb4620850 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Guid/StatusCodeDataTypeId/StatusCodeDataTypeId.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/StatusCodeDataTypeId/StatusCodeDataTypeId.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -25,7 +25,11 @@ Abstract:
 

 #include "EfiStatusCode.h"

 #include EFI_PROTOCOL_DEFINITION (DebugSupport)

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)

+#include EFI_PROTOCOL_DEFINITION (HiiDatabase)

+#else

 #include EFI_PROTOCOL_DEFINITION (Hii)

+#endif

 //

 // The size of string

 //

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Include/EfiBootScript.h b/EdkCompatibilityPkg/Foundation/Framework/Include/EfiBootScript.h
index 0daa738110..55f5e5ea9c 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Include/EfiBootScript.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Include/EfiBootScript.h
@@ -40,10 +40,14 @@ typedef const UINT16  EFI_BOOT_SCRIPT_OPCODE;
 #define EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE          0x06

 #define EFI_BOOT_SCRIPT_STALL_OPCODE                  0x07

 #define EFI_BOOT_SCRIPT_DISPATCH_OPCODE               0x08

-#define EFI_BOOT_SCRIPT_INFORMATION_OPCODE            0x0A

 

-#define EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE       0x0B

-#define EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE  0x0C

+//

+// Extensions to boot script definitions

+//

+#define EFI_BOOT_SCRIPT_MEM_POLL_OPCODE               0x09

+#define EFI_BOOT_SCRIPT_INFORMATION_OPCODE            0x0A

+#define EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE      0x0B

+#define EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE 0x0C

 

 #define EFI_BOOT_SCRIPT_TABLE_OPCODE                  0xAA

 #define EFI_BOOT_SCRIPT_TERMINATE_OPCODE              0xFF

@@ -174,6 +178,17 @@ typedef struct {
 } EFI_BOOT_SCRIPT_DISPATCH;

 

 typedef struct {

+  UINT16  OpCode;

+  UINT8   Length;

+  UINT32  Width;

+  UINT64  Address;

+  UINT64  BitMask;

+  UINT64  BitValue;

+  UINT64  Duration;

+  UINT64  LoopTimes;

+} EFI_BOOT_SCRIPT_MEM_POLL;

+

+typedef struct {

   UINT16                OpCode;

   UINT8                 Length;

   UINT32                InformationLength;  

@@ -199,6 +214,7 @@ typedef union {
   EFI_BOOT_SCRIPT_SMBUS_EXECUTE         *SmbusExecute;

   EFI_BOOT_SCRIPT_STALL                 *Stall;

   EFI_BOOT_SCRIPT_DISPATCH              *Dispatch;

+  EFI_BOOT_SCRIPT_MEM_POLL              *MemPoll;

   EFI_BOOT_SCRIPT_INFORMATION           *Information;  

   EFI_BOOT_SCRIPT_TERMINATE             *Terminate;

   EFI_BOOT_SCRIPT_COMMON_HEADER         *CommonHeader;

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
index b616a2ef71..2cf554b308 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -44,15 +44,13 @@ EFI_FORWARD_DECLARATION (EFI_ACPI_S3_SAVE_PROTOCOL);
 //

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_ACPI_S3_SAVE) (

   IN EFI_ACPI_S3_SAVE_PROTOCOL      * This,

   IN VOID                           * LegacyMemoryAddress 

   );

 

 typedef 

-EFI_STATUS 

-EFI_BOOTSERVICE 

+EFI_STATUS  

 (EFIAPI *EFI_ACPI_GET_LEGACY_MEMORY_SIZE) (

   IN  EFI_ACPI_S3_SAVE_PROTOCOL     * This,

   OUT UINTN                         * Size

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
index b99a15b495..b0ae333593 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 1999 - 2005, Intel Corporation

+Copyright (c) 1999 - 2007, Intel Corporation

 All rights reserved. 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

@@ -82,7 +82,6 @@ extern EFI_GUID gEfiAcpiSupportGuid;
 //

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_ACPI_GET_ACPI_TABLE) (

   IN EFI_ACPI_SUPPORT_PROTOCOL            * This,

   IN INTN                                 Index,

@@ -96,7 +95,6 @@ EFI_BOOTSERVICE
 //

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_ACPI_SET_ACPI_TABLE) (

   IN EFI_ACPI_SUPPORT_PROTOCOL            * This,

   IN VOID                                 *Table OPTIONAL,

@@ -110,7 +108,6 @@ EFI_BOOTSERVICE
 //

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_ACPI_PUBLISH_TABLES) (

   IN EFI_ACPI_SUPPORT_PROTOCOL            * This,

   IN EFI_ACPI_TABLE_VERSION               Version

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
index 2d0348bbd4..09c62217d0 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 1999 - 2006, Intel Corporation                                                         

+Copyright (c) 1999 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -45,7 +45,6 @@ EFI_FORWARD_DECLARATION (EFI_BOOT_SCRIPT_SAVE_PROTOCOL);
 //

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_BOOT_SCRIPT_WRITE) (

   IN EFI_BOOT_SCRIPT_SAVE_PROTOCOL            * This,

   IN UINT16                                   TableName,

@@ -55,7 +54,6 @@ EFI_BOOTSERVICE
 

 typedef

 EFI_STATUS

-EFI_BOOTSERVICE

 (EFIAPI *EFI_BOOT_SCRIPT_CLOSE_TABLE) (

   IN EFI_BOOT_SCRIPT_SAVE_PROTOCOL            * This,

   IN UINT16                                   TableName,

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
index 11b1c24c05..9ce922144c 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation                                                         

+Copyright (c) 2004 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -208,6 +208,19 @@ typedef struct {
   UINT8   LastPciBus;

 

 } EFI_COMPATIBILITY16_TABLE;

+

+typedef enum {

+  Compatibility16InitializeYourself     = 0x0000,

+  Compatibility16UpdateBbs              = 0x0001,

+  Compatibility16PrepareToBoot          = 0x0002,

+  Compatibility16Boot                   = 0x0003,

+  Compatibility16RetrieveLastBootDevice = 0x0004,

+  Compatibility16DispatchOprom          = 0x0005,

+  Compatibility16GetTableAddress        = 0x0006,

+  Compatibility16SetKeyboardLeds        = 0x0007,

+  Compatibility16InstallPciHandler      = 0x0008,

+} EFI_COMPATIBILITY_FUNCTIONS;

+

 //

 // define maximum number of HDD system supports

 //