Remove CommonHeader.h from VFR files.

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

diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
index 5d3facb94664b0b34e2e46d241959db97230fab5..2234acd8604d0650714c27e2c6b00994e1b2242e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@@ -23,7 +23,7 @@
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r

-#include <Protocol/FormCallback.h>\r
+#include <Protocol/FormCallbackFramework.h>\r

 #include <Guid/FileSystemVolumeLabelInfo.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Guid/BootState.h>\r
 #include <Guid/FileSystemVolumeLabelInfo.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Guid/BootState.h>\r


@@ -32,7 +32,7 @@
 #include <Guid/FileInfo.h>\r
 #include <Protocol/Bds.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Guid/FileInfo.h>\r
 #include <Protocol/Bds.h>\r
 #include <Protocol/DataHub.h>\r

-#include <Protocol/FormBrowser.h>\r
+#include <Protocol/FormBrowserFramework.h>\r

 #include <Guid/Bmp.h>\r
 #include <Protocol/UgaDraw.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Guid/Bmp.h>\r
 #include <Protocol/UgaDraw.h>\r
 #include <Protocol/BlockIo.h>\r


@@ -41,7 +41,7 @@
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/SimpleFileSystem.h>\r
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/SimpleFileSystem.h>\r

-#include <Protocol/Hii.h>\r
+#include <Protocol/HiiFramework.h>\r

 #include <Guid/GenericPlatformVariable.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Guid/GenericPlatformVariable.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Protocol/SerialIo.h>\r


@@ -53,7 +53,7 @@
 #include <Library/UefiLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/BaseLib.h>\r

-#include <Library/EdkGraphicsLib.h>\r
+#include <Library/GraphicsLib.h>\r

 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/PerformanceLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/PerformanceLib.h>\r
 #include <Library/PrintLib.h>\r


@@ -66,7 +66,7 @@
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r

-#include <Library/HiiLib.h>\r
+#include <Library/HiiLibFramework.h>\r

 #include <Library/PeCoffLib.h>\r
 \r
 #endif\r
 #include <Library/PeCoffLib.h>\r
 \r
 #endif\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
index 0b2f4a5ea83cf3471445696aee13d1bb1cfb98f2..998a4a68f5f3eb3c69d4c70644c296fdcd3761ac 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FE.vfr
@@ -1,8 +1,3 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r
 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
index f9a36a0217160aa737121fc4ff9a8e6fa5583b74..e907e18d6cec3fa862f5dbb4f36713eaa04f7f29 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/bm.vfr
@@ -1,8 +1,3 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r
 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
index 6e863e90fa0980d890ef0146f0302dc21ef909b8..7fb193ac1bbac7925f0cd0b67cb238cc3a055343 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManagerVfr.Vfr
@@ -1,8 +1,3 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r
 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
index 20bce22e9889a7b0fc567e3b4464e30aa9cec0aa..8b73751f4c552e3b4feff335aeae35de9c57b1cb 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManagerVfr.Vfr
@@ -1,8 +1,3 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r
 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r


@@ -26,7 +21,6 @@
 // \r
 // --*/\r
 \r
 // \r
 // --*/\r
 \r

-#include "BdsStrDefs.h"\r

 \r
 #define FORMSET_GUID  { 0x3ebfa8e6, 0x511d, 0x4b5b, { 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 } }\r
 \r
 \r
 #define FORMSET_GUID  { 0x3ebfa8e6, 0x511d, 0x4b5b, { 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 } }\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
index 71116b2c36f5860f3334e4068c3748842b39ec5c..03fd8a1888164ad7606b8bb8032e38ffb072eb4c 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPageVfr.Vfr
@@ -1,8 +1,3 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r
 // *++\r
 //\r
 // Copyright (c) 2006, Intel Corporation                                                         \r


@@ -26,7 +21,6 @@
 // \r
 // --*/\r
 \r
 // \r
 // --*/\r
 \r

-#include "BdsStrDefs.h"\r

 \r
 #define FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, { 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe } }\r
 \r
 \r
 #define FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, { 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe } }\r
 \r