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@4623 6f19259b-4bc3-4df7-8a09-765794883524
2008-01-24 07:10:05 +00:00
parent 2c40a813fc
commit c7f33ca424
448 changed files with 18656 additions and 5615 deletions
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.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        
@@ -23,7 +23,11 @@ Abstract:
 #ifndef __EDKII_GLUE_DEFINITION_CHANGES_BASE_H__
 #define __EDKII_GLUE_DEFINITION_CHANGES_BASE_H__

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
+#include "TianoHii.h"
+#else
 #include "EfiInternalFormRepresentation.h"
+#endif
 #include "EfiPxe.h"


@@ -47,7 +51,7 @@ Abstract:
 // ----------------------------------------------------------------------------------
 // InternalFormRepresentation.h:
 // ----------------------------------------------------------------------------------
-
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)
 typedef struct {
  EFI_IFR_OP_HEADER Header;
  UINT16            QuestionId; // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name
@@ -66,6 +70,7 @@ typedef struct {
 typedef struct {
  EFI_IFR_OP_HEADER Header;
 } EFI_IFR_END_EXPR;
+#endif

 // ------------------------
 // define GUID as EFI_GUID
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.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        
@@ -23,7 +23,11 @@ Abstract:
 #ifndef __EDKII_GLUE_DEFINITION_CHANGES_DXE_H__
 #define __EDKII_GLUE_DEFINITION_CHANGES_DXE_H__

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
+#include "TianoHii.h"
+#else
 #include "EfiInternalFormRepresentation.h"
+#endif

 #include "EdkIIGlueDefinitionChangesBase.h"

@@ -59,8 +63,10 @@ typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION         EFI_MISC_SMBIOS_STRUCT_ENCA
 // -------------------
 #define gEfiAcpiSupportProtocolGuid                   gEfiAcpiSupportGuid
 #define gEfiLoadPeImageProtocolGuid                   gEfiLoadPeImageGuid
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)
 #define EFI_GLYPH_NON_SPACING                         GLYPH_NON_SPACING
 #define EFI_GLYPH_WIDE                                GLYPH_NON_BREAKING
+#endif
 #define BOOT_OBJECT_AUTHORIZATION_PARMSET_GUID        BOOT_OBJECT_AUTHORIZATION_PARMSET_GUIDVALUE
 #define EFI_EBC_PROTOCOL_GUID                         EFI_EBC_INTERPRETER_PROTOCOL_GUID
 #define EFI_FILE_SYSTEM_VOLUME_LABEL_ID               EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID
@@ -78,7 +84,9 @@ typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION         EFI_MISC_SMBIOS_STRUCT_ENCA
 //
 typedef EFI_VOLUME_OPEN                              EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME;
 typedef EFI_TEXT_OUTPUT_STRING                       EFI_TEXT_STRING;
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)
 typedef SCREEN_DESCRIPTOR                            EFI_SCREEN_DESCRIPTOR;
+#endif
 typedef EFI_SIMPLE_TEXT_IN_PROTOCOL                  EFI_SIMPLE_TEXT_INPUT_PROTOCOL;
 typedef EFI_SIMPLE_TEXT_OUT_PROTOCOL                 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
 //typedef EFI_TO_LEGACY16_INIT_TABLE                   EFI_TO_COMPATIBILITY16_INIT_TABLE;
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesPeim.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesPeim.h
@@ -23,9 +23,14 @@ Abstract:
 #ifndef __EDKII_GLUE_DEFINITION_CHANGES_PEIM_H__
 #define __EDKII_GLUE_DEFINITION_CHANGES_PEIM_H__

+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
+#include "TianoHii.h"
+#else
 #include "EfiInternalFormRepresentation.h"
+#endif

 #include "EdkIIGlueDefinitionChangesBase.h"
+
 #include "EfiPciCfg.h"

 //
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
@@ -61,6 +61,45 @@ Abstract:
  #endif
 #endif

+//
+//  DxePerformanceLib
+//
+#ifdef __EDKII_GLUE_DXE_PERFORMANCE_LIB__
+  #ifndef __EDKII_GLUE_BASE_LIB__
+  #define __EDKII_GLUE_BASE_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_BASE_MEMORY_LIB__
+  #define __EDKII_GLUE_BASE_MEMORY_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_DXE_MEMORY_ALLOCATION_LIB__
+  #define __EDKII_GLUE_DXE_MEMORY_ALLOCATION_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_DXE_HOB_LIB__
+  #define __EDKII_GLUE_DXE_HOB_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__
+  #define __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_UEFI_LIB__
+  #define __EDKII_GLUE_UEFI_LIB__
+  #endif
+#endif
+
+//
+//  PeiPerformanceLib
+//
+#ifdef __EDKII_GLUE_PEI_PERFORMANCE_LIB__
+  #ifndef __EDKII_GLUE_BASE_LIB__
+  #define __EDKII_GLUE_BASE_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_BASE_MEMORY_LIB__
+  #define __EDKII_GLUE_BASE_MEMORY_LIB__
+  #endif
+  #ifndef __EDKII_GLUE_PEI_SERVICES_LIB__
+  #define __EDKII_GLUE_PEI_SERVICES_LIB__
+  #endif
+#endif
+
 //
 // EdkDxeRuntimeDriverLib
 //
@@ -554,6 +593,14 @@ Abstract:
  //
 #endif

+//
+//  Whether _gDriverExitBootServicesEvent[] contains effective handler
+//
+#if defined(__EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__) || defined(__EDKII_GLUE_EXIT_BOOT_SERVICES_EVENT_HANDLER__)
+  #define __EDKII_GLUE_HAVE_DRIVER_EXIT_BOOT_SERVICES_EVENT__ 1
+#else  
+  #define __EDKII_GLUE_HAVE_DRIVER_EXIT_BOOT_SERVICES_EVENT__ 0
+#endif

 //
 // Check against multiple instances of same library class being used
@@ -654,6 +701,7 @@ Abstract:

 #ifdef __EDKII_GLUE_UEFI_BOOT_SERVICES_TABLE_LIB__
 EFI_STATUS
+EFIAPI
 UefiBootServicesTableLibConstructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -671,6 +719,7 @@ IoLibConstructor (

 #ifdef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB__
 EFI_STATUS
+EFIAPI
 UefiRuntimeServicesTableLibConstructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -679,6 +728,7 @@ UefiRuntimeServicesTableLibConstructor (

 #ifdef __EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__
 EFI_STATUS
+EFIAPI
 RuntimeDriverLibConstruct (
  IN EFI_HANDLE           ImageHandle,
  IN EFI_SYSTEM_TABLE     *SystemTable
@@ -687,6 +737,7 @@ RuntimeDriverLibConstruct (

 #ifdef __EDKII_GLUE_DXE_HOB_LIB__
 EFI_STATUS
+EFIAPI
 HobLibConstructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -695,6 +746,7 @@ HobLibConstructor (

 #ifdef __EDKII_GLUE_UEFI_DRIVER_MODEL_LIB__
 EFI_STATUS
+EFIAPI
 UefiDriverModelLibConstructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -703,6 +755,7 @@ UefiDriverModelLibConstructor (

 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB__
 EFI_STATUS
+EFIAPI
 PeiServicesTablePointerLibConstructor (
  IN EFI_FFS_FILE_HEADER  *FfsHeader,
  IN EFI_PEI_SERVICES     **PeiServices
@@ -711,6 +764,7 @@ PeiServicesTablePointerLibConstructor (

 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_MM7__
 EFI_STATUS
+EFIAPI
 PeiServicesTablePointerLibConstructor (
  IN EFI_FFS_FILE_HEADER  *FfsHeader,
  IN EFI_PEI_SERVICES     **PeiServices
@@ -719,6 +773,7 @@ PeiServicesTablePointerLibConstructor (

 #ifdef __EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_KR1__
 EFI_STATUS
+EFIAPI
 PeiServicesTablePointerLibConstructor (
  IN EFI_FFS_FILE_HEADER  *FfsHeader,
  IN EFI_PEI_SERVICES     **PeiServices
@@ -736,6 +791,7 @@ SmbusLibConstructor (

 #ifdef __EDKII_GLUE_DXE_SERVICES_TABLE_LIB__
 EFI_STATUS
+EFIAPI
 DxeServicesTableLibConstructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -760,6 +816,7 @@ DxeSalLibConstructor (
 //
 #ifdef __EDKII_GLUE_UEFI_DRIVER_MODEL_LIB__
 EFI_STATUS
+EFIAPI
 UefiDriverModelLibDestructor (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable
@@ -768,6 +825,7 @@ UefiDriverModelLibDestructor (

 #ifdef __EDKII_GLUE_EDK_DXE_RUNTIME_DRIVER_LIB__
 EFI_STATUS
+EFIAPI
 RuntimeDriverLibDeconstruct (
  IN EFI_HANDLE        ImageHandle,
  IN EFI_SYSTEM_TABLE  *SystemTable