Rename Protocol/FrameworkHii.h to Protocol/HiiFramework.h to follow the naming conven...

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

diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
index 36f536009b45147491b932b010b5edf0c25fc94d..3d47474599d7caa2ee4c890f7c9bbaf006fb7f0e 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
@@ -26,7 +26,7 @@
 //\r
 #include <Protocol/Cpu.h>\r
 #include <Protocol/DataHub.h>\r
-#include <Protocol/FrameworkHii.h>\r
+#include <Protocol/HiiFramework.h>\r
 #include <Common/DataHubRecords.h>\r
 #include <Guid/DataHubRecords.h>\r
 #include <Protocol/CpuIo.h>\r

diff --git a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
index 5ef183850ee6206487e74d929cf0597bd51b1d89..77bdf32f7494b1e90e92ec22ca60240508df7cc4 100644 (file)
--- a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -22,6 +22,9 @@ Abstract:
 #ifndef _BDS_LIB_H_\r
 #define _BDS_LIB_H_\r
 \r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Protocol/HiiFramework.h>\r
+\r
 extern EFI_HANDLE mBdsImageHandle;\r
 \r
 //\r
@@ -162,7 +165,7 @@ BdsLibGetVariableAndSize (
 \r
 EFI_STATUS\r
 BdsLibOutputStrings (\r
-  IN EFI_SIMPLE_TEXT_OUT_PROTOCOL   *ConOut,\r
+  IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID   *ConOut,\r
   ...\r
   );\r
 \r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h b/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
index 8dbbba84845f8609cf87f83b8401d86264e37bdf..d2ac661f70d811e9327740ef4479eaf3b819c58b 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/CommonHeader.h
@@ -19,8 +19,7 @@
 //\r
 // The package level header files this module uses\r
 //\r
-#include <Dxe.h>\r
-#include <EdkDxe.h>\r
+#include <PiDxe.h>\r
 #include <WinNtDxe.h>\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index e84bc1794d4217841e037e667751f48332957729..ba2e38b9c3256b815423d40f1d4c931025831db7 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -65,6 +65,8 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
index 23823627729ddd5e4b603ac0dfe89d0e49d55d52..5d3facb94664b0b34e2e46d241959db97230fab5 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@@ -19,10 +19,7 @@
 //\r
 // The package level header files this module uses\r
 //\r
-#include <Dxe.h>\r
 #include <PiDxe.h>\r
-#include <EdkDxe.h>\r
-#include <WinNtDxe.h>\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r