From af162ac5f99064feb8fba3190a7429a71eae7076 Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 2 Jul 2007 08:18:26 +0000
Subject: [PATCH] Rename Protocol/FrameworkHii.h to Protocol/HiiFramework.h to
 follow the naming convention.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2941 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/CpuRuntimeDxe/CommonHeader.h                  | 2 +-
 Nt32Pkg/Include/Library/EdkGenericBdsLib.h            | 5 ++++-
 Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h       | 3 +--
 Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf | 2 ++
 Nt32Pkg/PlatformBdsDxe/CommonHeader.h                 | 3 ---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
index 36f536009b..3d47474599 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
@@ -26,7 +26,7 @@
 //
 #include <Protocol/Cpu.h>
 #include <Protocol/DataHub.h>
-#include <Protocol/FrameworkHii.h>
+#include <Protocol/HiiFramework.h>
 #include <Common/DataHubRecords.h>
 #include <Guid/DataHubRecords.h>
 #include <Protocol/CpuIo.h>
diff --git a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
index 5ef183850e..77bdf32f74 100644
--- a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -22,6 +22,9 @@ Abstract:
 #ifndef _BDS_LIB_H_
 #define _BDS_LIB_H_
 
+#include <Protocol/SimpleTextOut.h>
+#include <Protocol/HiiFramework.h>
+
 extern EFI_HANDLE mBdsImageHandle;
 
 //
@@ -162,7 +165,7 @@ BdsLibGetVariableAndSize (
 
 EFI_STATUS
 BdsLibOutputStrings (
-  IN EFI_SIMPLE_TEXT_OUT_PROTOCOL   *ConOut,
+  IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID   *ConOut,
   ...
   );
 
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h b/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
index 8dbbba8484..d2ac661f70 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
@@ -19,8 +19,7 @@
 //
 // The package level header files this module uses
 //
-#include <Dxe.h>
-#include <EdkDxe.h>
+#include <PiDxe.h>
 #include <WinNtDxe.h>
 //
 // The protocols, PPI and GUID defintions for this module
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index e84bc1794d..ba2e38b9c3 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -65,6 +65,8 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  IntelFrameworkPkg/IntelFrameworkPkg.dec
   Nt32Pkg/Nt32Pkg.dec
 
 
diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
index 2382362772..5d3facb946 100644
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@@ -19,10 +19,7 @@
 //
 // The package level header files this module uses
 //
-#include <Dxe.h>
 #include <PiDxe.h>
-#include <EdkDxe.h>
-#include <WinNtDxe.h>
 //
 // The protocols, PPI and GUID defintions for this module
 //
-- 
2.39.2