From 7c6d55db881ab57c8e1398a66619ae561581c17d Mon Sep 17 00:00:00 2001 From: qwang12 Date: Wed, 27 Jun 2007 07:13:29 +0000 Subject: [PATCH] Update IntelFrameworkPkg git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2786 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Include/Library/{HiiLib.h => FrameworkHiiLib.h} | 2 ++ .../Include/Protocol/{Hii.h => FrameworkHii.h} | 12 +++++++++--- IntelFrameworkPkg/IntelFrameworkPkg.dec | 6 +++--- IntelFrameworkPkg/IntelFrameworkPkg.nspd | 5 +++++ .../{HiiLib => FrameworkHiiLib}/CommonHeader.h | 2 +- .../Library/{HiiLib => FrameworkHiiLib}/HiiLib.c | 0 .../Library/{HiiLib => FrameworkHiiLib}/HiiLib.inf | 13 ++++++++++++- .../Library/{HiiLib => FrameworkHiiLib}/HiiLib.msa | 6 +++--- 8 files changed, 35 insertions(+), 11 deletions(-) rename IntelFrameworkPkg/Include/Library/{HiiLib.h => FrameworkHiiLib.h} (94%) rename IntelFrameworkPkg/Include/Protocol/{Hii.h => FrameworkHii.h} (96%) rename IntelFrameworkPkg/Library/{HiiLib => FrameworkHiiLib}/CommonHeader.h (93%) rename IntelFrameworkPkg/Library/{HiiLib => FrameworkHiiLib}/HiiLib.c (100%) rename IntelFrameworkPkg/Library/{HiiLib => FrameworkHiiLib}/HiiLib.inf (82%) rename IntelFrameworkPkg/Library/{HiiLib => FrameworkHiiLib}/HiiLib.msa (90%) diff --git a/IntelFrameworkPkg/Include/Library/HiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h similarity index 94% rename from IntelFrameworkPkg/Include/Library/HiiLib.h rename to IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h index 51fde1460d..d2d74336a0 100644 --- a/IntelFrameworkPkg/Include/Library/HiiLib.h +++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h @@ -17,6 +17,8 @@ #ifndef __HII_LIB_H__ #define __HII_LIB_H__ +#include + /** This function allocates pool for an EFI_HII_PACKAGES structure with enough space for the variable argument list of package pointers. diff --git a/IntelFrameworkPkg/Include/Protocol/Hii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h similarity index 96% rename from IntelFrameworkPkg/Include/Protocol/Hii.h rename to IntelFrameworkPkg/Include/Protocol/FrameworkHii.h index fbecbef8ae..0cb71eb59b 100644 --- a/IntelFrameworkPkg/Include/Protocol/Hii.h +++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h @@ -12,15 +12,21 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Module Name: Hii.h + Module Name: FrameworkHii.h @par Revision Reference: This protocol is defined in HII spec 0.92. **/ -#ifndef _HII_H_ -#define _HII_H_ +#ifndef _FRAMEWORK_HII_H_ +#define _FRAMEWORK_HII_H_ + +// +// To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL, +// is defined in MdePkg/Protocol/GraphicsOutput.h +// +#include #define EFI_HII_PROTOCOL_GUID \ { \ diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec index fb7f623d44..98a7bc00f1 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.dec +++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec @@ -37,11 +37,10 @@ # BASE PEIM DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER # ################################################################################ -[Include.common] +[Includes.common] Include # BASE - ################################################################################ # # Library Class Header section - list of Library Class header files that are @@ -49,7 +48,7 @@ # ################################################################################ [LibraryClass.common] - HiiLib|Include/Library/HiiLib.h + FrameworkHiiLib|Include/Library/FrameworkHiiLib.h @@ -115,6 +114,7 @@ gEfiSmmSwDispatchProtocolGuid = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }} gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }} gEfiSmmSxDispatchProtocolGuid = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }} + gEfiDataHubProtocolGuid = { 0xae80d021, 0x618e, 0x11d4, {0xbc, 0xd7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 }} diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.nspd b/IntelFrameworkPkg/IntelFrameworkPkg.nspd index 284a8ebff6..5fe1597e4d 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.nspd +++ b/IntelFrameworkPkg/IntelFrameworkPkg.nspd @@ -96,6 +96,11 @@ + + gEfiDataHubProtocolGuid + AE80D021-618E-11D4-BCD7-0080C73C8881 + Data Hub Protocol Guid + gEfiSmmSxDispatchProtocolGuid 14fc52be-01dc-426c-91ae-a23c3e220ae8 diff --git a/IntelFrameworkPkg/Library/HiiLib/CommonHeader.h b/IntelFrameworkPkg/Library/FrameworkHiiLib/CommonHeader.h similarity index 93% rename from IntelFrameworkPkg/Library/HiiLib/CommonHeader.h rename to IntelFrameworkPkg/Library/FrameworkHiiLib/CommonHeader.h index 7b3891c82a..1121e95c52 100644 --- a/IntelFrameworkPkg/Library/HiiLib/CommonHeader.h +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/CommonHeader.h @@ -26,7 +26,7 @@ // // The Library classes this module consumes // -#include +#include #include #include diff --git a/IntelFrameworkPkg/Library/HiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c similarity index 100% rename from IntelFrameworkPkg/Library/HiiLib/HiiLib.c rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c diff --git a/IntelFrameworkPkg/Library/HiiLib/HiiLib.inf b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf similarity index 82% rename from IntelFrameworkPkg/Library/HiiLib/HiiLib.inf rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf index 80ec9fff58..b16a40c50f 100644 --- a/IntelFrameworkPkg/Library/HiiLib/HiiLib.inf +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf @@ -21,7 +21,7 @@ ################################################################################ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = HiiLib + BASE_NAME = FrameworkHiiLib FILE_GUID = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 @@ -56,6 +56,17 @@ [Includes] $(WORKSPACE)/MdePkg/Include/Library + +################################################################################ +# +# Package Dependency Section - list of Package files that are required for +# this module. +# +################################################################################ + +[Packages] + MdePkg/MdePkg.dec + IntelFrameworkPkg/IntelFrameworkPkg.dec ################################################################################ # diff --git a/IntelFrameworkPkg/Library/HiiLib/HiiLib.msa b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa similarity index 90% rename from IntelFrameworkPkg/Library/HiiLib/HiiLib.msa rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa index d3eac8fb35..2d0ad1e1dd 100644 --- a/IntelFrameworkPkg/Library/HiiLib/HiiLib.msa +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa @@ -1,7 +1,7 @@ - + - HiiLib + FrameworkHiiLib DXE_DRIVER 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c 1.0 @@ -19,7 +19,7 @@ IA32 X64 IPF EBC false - HiiLib + FrameworkHiiLib -- 2.39.2