diff options
| -rw-r--r-- | IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h (renamed from IntelFrameworkPkg/Include/Library/HiiLib.h) | 2 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Include/Protocol/FrameworkHii.h (renamed from IntelFrameworkPkg/Include/Protocol/Hii.h) | 12 | ||||
| -rw-r--r-- | IntelFrameworkPkg/IntelFrameworkPkg.dec | 6 | ||||
| -rw-r--r-- | IntelFrameworkPkg/IntelFrameworkPkg.nspd | 5 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Library/FrameworkHiiLib/CommonHeader.h (renamed from IntelFrameworkPkg/Library/HiiLib/CommonHeader.h) | 2 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c (renamed from IntelFrameworkPkg/Library/HiiLib/HiiLib.c) | 0 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf (renamed from IntelFrameworkPkg/Library/HiiLib/HiiLib.inf) | 13 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa (renamed from IntelFrameworkPkg/Library/HiiLib/HiiLib.msa) | 6 |
8 files changed, 35 insertions, 11 deletions
diff --git a/IntelFrameworkPkg/Include/Library/HiiLib.h b/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 <Protocol/FrameworkHii.h>
+
/**
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 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 <Protocol/GraphicsOutput.h>
#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 @@ </Entry>
</GuidDeclarations>
<ProtocolDeclarations>
+ <Entry Name="DataHub">
+ <C_Name>gEfiDataHubProtocolGuid</C_Name>
+ <GuidValue>AE80D021-618E-11D4-BCD7-0080C73C8881</GuidValue>
+ <HelpText>Data Hub Protocol Guid</HelpText>
+ </Entry>
<Entry Name="SmmSxDispatch">
<C_Name>gEfiSmmSxDispatchProtocolGuid</C_Name>
<GuidValue>14fc52be-01dc-426c-91ae-a23c3e220ae8</GuidValue>
diff --git a/IntelFrameworkPkg/Library/HiiLib/CommonHeader.h b/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 <Library/HiiLib.h>
+#include <Library/FrameworkHiiLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
diff --git a/IntelFrameworkPkg/Library/HiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c index 3b0876cc3b..3b0876cc3b 100644 --- a/IntelFrameworkPkg/Library/HiiLib/HiiLib.c +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c diff --git a/IntelFrameworkPkg/Library/HiiLib/HiiLib.inf b/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 index d3eac8fb35..2d0ad1e1dd 100644 --- a/IntelFrameworkPkg/Library/HiiLib/HiiLib.msa +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<MsaHeader>
- <ModuleName>HiiLib</ModuleName>
+ <ModuleName>FrameworkHiiLib</ModuleName>
<ModuleType>DXE_DRIVER</ModuleType>
<GuidValue>1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c</GuidValue>
<Version>1.0</Version>
@@ -19,7 +19,7 @@ <ModuleDefinitions>
<SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
<BinaryModule>false</BinaryModule>
- <OutputFileBasename>HiiLib</OutputFileBasename>
+ <OutputFileBasename>FrameworkHiiLib</OutputFileBasename>
</ModuleDefinitions>
<LibraryClassDefinitions>
<LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
|