From 8e5b17b25e91ffa293c1cbcb30e1c6997c6bdecd Mon Sep 17 00:00:00 2001 From: klu2 Date: Mon, 22 Oct 2007 09:36:00 +0000 Subject: [PATCH 1/1] Update following library class/Protocol for puting 'Framework' as prefix FrameworkHii FrameworkFormBrowser FrameworkFormCallback FrameworkIfrSupportLib git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4196 6f19259b-4bc3-4df7-8a09-765794883524 --- .../IntelFrameworkModulePkg.dsc | 8 ++++---- .../Library/GraphicsLib/Graphics.c | 2 +- .../Universal/DriverSampleDxe/DriverSample.h | 8 ++++---- .../Universal/DriverSampleDxe/DriverSampleDxe.inf | 4 ++-- .../Universal/HiiDataBaseDxe/HiiDatabase.h | 6 +++--- .../Universal/HiiDataBaseDxe/HiiDatabase.inf | 2 +- .../Universal/SetupBrowserDxe/Setup.h | 8 ++++---- .../Universal/SetupBrowserDxe/SetupBrowser.inf | 2 +- .../{HiiLibFramework.h => FrameworkHiiLib.h} | 2 +- ...portLibFramework.h => FrameworkIfrSupportLib.h} | 0 ...rmBrowserFramework.h => FrameworkFormBrowser.h} | 2 +- ...CallbackFramework.h => FrameworkFormCallback.h} | 6 +++--- .../Protocol/{HiiFramework.h => FrameworkHii.h} | 2 +- IntelFrameworkPkg/IntelFrameworkPkg.dec | 4 ++-- IntelFrameworkPkg/IntelFrameworkPkg.dsc | 6 +++--- .../{HiiLibFramework => FrameworkHiiLib}/HiiLib.c | 2 +- .../HiiLib.inf | 4 ++-- .../HiiLib.msa | 0 .../IfrCommon.c | 0 .../IfrOnTheFly.c | 0 .../IfrOpCodeCreation.c | 0 .../IfrSupportLib.inf | 4 ++-- .../IfrSupportLib.msa | 0 .../IfrSupportLibInternal.h | 4 ++-- .../IfrVariable.c | 0 .../Console.c | 2 +- .../FrameworkUefiLib.h} | 4 ++-- .../FrameworkUefiLib.inf} | 2 +- .../FrameworkUefiLib.msa} | 0 .../UefiDriverModel.c | 2 +- .../UefiLib.c | 2 +- .../UefiLibPrint.c | 2 +- .../UefiNotTiano.c | 2 +- MdeModulePkg/MdeModulePkg.dsc | 2 +- .../Console/GraphicsConsoleDxe/GraphicsConsole.h | 4 ++-- .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 2 +- Nt32Pkg/CpuRuntimeDxe/CpuDriver.h | 4 ++-- Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf | 2 +- Nt32Pkg/Include/Library/EdkGenericBdsLib.h | 2 +- .../EdkGenericBdsLib/EdkGenericBdsLibInternal.h | 2 +- .../MiscSubClassPlatformDxe.inf | 2 +- .../MiscSubClassPlatformDxe/MiscSubclassDriver.h | 2 +- Nt32Pkg/Nt32Pkg.dsc | 14 +++++++------- Nt32Pkg/PlatformBdsDxe/Generic/Bds.h | 10 +++++----- Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf | 4 ++-- 45 files changed, 71 insertions(+), 71 deletions(-) rename IntelFrameworkPkg/Include/Library/{HiiLibFramework.h => FrameworkHiiLib.h} (94%) rename IntelFrameworkPkg/Include/Library/{IfrSupportLibFramework.h => FrameworkIfrSupportLib.h} (100%) rename IntelFrameworkPkg/Include/Protocol/{FormBrowserFramework.h => FrameworkFormBrowser.h} (97%) rename IntelFrameworkPkg/Include/Protocol/{FormCallbackFramework.h => FrameworkFormCallback.h} (96%) rename IntelFrameworkPkg/Include/Protocol/{HiiFramework.h => FrameworkHii.h} (97%) rename IntelFrameworkPkg/Library/{HiiLibFramework => FrameworkHiiLib}/HiiLib.c (94%) rename IntelFrameworkPkg/Library/{HiiLibFramework => FrameworkHiiLib}/HiiLib.inf (89%) rename IntelFrameworkPkg/Library/{HiiLibFramework => FrameworkHiiLib}/HiiLib.msa (100%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrCommon.c (100%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrOnTheFly.c (100%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrOpCodeCreation.c (100%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrSupportLib.inf (90%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrSupportLib.msa (100%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrSupportLibInternal.h (90%) rename IntelFrameworkPkg/Library/{IfrSupportLibFramework => FrameworkIfrSupportLib}/IfrVariable.c (100%) rename IntelFrameworkPkg/Library/{UefiLibFramework => FrameworkUefiLib}/Console.c (96%) rename IntelFrameworkPkg/Library/{UefiLibFramework/UefiLibFramework.h => FrameworkUefiLib/FrameworkUefiLib.h} (92%) rename IntelFrameworkPkg/Library/{UefiLibFramework/UefiLibFramework.inf => FrameworkUefiLib/FrameworkUefiLib.inf} (95%) rename IntelFrameworkPkg/Library/{UefiLibFramework/UefiLibFramework.msa => FrameworkUefiLib/FrameworkUefiLib.msa} (100%) rename IntelFrameworkPkg/Library/{UefiLibFramework => FrameworkUefiLib}/UefiDriverModel.c (97%) rename IntelFrameworkPkg/Library/{UefiLibFramework => FrameworkUefiLib}/UefiLib.c (96%) rename IntelFrameworkPkg/Library/{UefiLibFramework => FrameworkUefiLib}/UefiLibPrint.c (96%) rename IntelFrameworkPkg/Library/{UefiLibFramework => FrameworkUefiLib}/UefiNotTiano.c (96%) diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 7f98ec5d2f..af1486b2c6 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -80,8 +80,8 @@ UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf - IfrSupportLibFramework|IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf + FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf @@ -98,8 +98,8 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf - IfrSupportLibFramework|IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf + FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf ################################################################################ diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c index 50eb1f56bc..5ab779a6a3 100644 --- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c +++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c @@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h index e32927d7a7..fbf93ece95 100644 --- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h +++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h @@ -20,8 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include -#include -#include +#include +#include #include #include @@ -29,10 +29,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include #include -#include +#include #include "NVDataStruc.h" diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf index 2a552838b0..aff2ae4695 100644 --- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf +++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf @@ -46,10 +46,10 @@ [LibraryClasses] - HiiLibFramework + FrameworkHiiLib MemoryAllocationLib BaseMemoryLib - IfrSupportLibFramework + FrameworkIfrSupportLib PrintLib BaseLib UefiDriverEntryPoint diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h index 077a0cccdc..1498f3cc9e 100644 --- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h +++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h @@ -21,8 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include -#include +#include +#include #include #include @@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include // // HII Database Global data diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf index a106feb14e..3e8c6d57f0 100644 --- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf +++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf @@ -46,7 +46,7 @@ IntelFrameworkPkg/IntelFrameworkPkg.dec [LibraryClasses] - IfrSupportLibFramework + FrameworkIfrSupportLib UefiRuntimeServicesTableLib UefiBootServicesTableLib BaseMemoryLib diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h index bc26a5905d..098077776f 100644 --- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -18,9 +18,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include -#include -#include -#include +#include +#include +#include #include #include @@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf index 2b811953e1..f01b83d757 100644 --- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf +++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf @@ -54,7 +54,7 @@ [LibraryClasses] GraphicsLib - HiiLibFramework + FrameworkHiiLib UefiRuntimeServicesTableLib UefiBootServicesTableLib PrintLib diff --git a/IntelFrameworkPkg/Include/Library/HiiLibFramework.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h similarity index 94% rename from IntelFrameworkPkg/Include/Library/HiiLibFramework.h rename to IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h index 91453e99ea..d2d74336a0 100644 --- a/IntelFrameworkPkg/Include/Library/HiiLibFramework.h +++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h @@ -17,7 +17,7 @@ #ifndef __HII_LIB_H__ #define __HII_LIB_H__ -#include +#include /** This function allocates pool for an EFI_HII_PACKAGES structure diff --git a/IntelFrameworkPkg/Include/Library/IfrSupportLibFramework.h b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h similarity index 100% rename from IntelFrameworkPkg/Include/Library/IfrSupportLibFramework.h rename to IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h diff --git a/IntelFrameworkPkg/Include/Protocol/FormBrowserFramework.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h similarity index 97% rename from IntelFrameworkPkg/Include/Protocol/FormBrowserFramework.h rename to IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h index 74b9b4b5ae..867a5b79bd 100644 --- a/IntelFrameworkPkg/Include/Protocol/FormBrowserFramework.h +++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h @@ -24,7 +24,7 @@ #ifndef __FRAMEWORK_FORM_BROWSER_H__ #define __FRAMEWORK_FORM_BROWSER_H__ -#include +#include #define EFI_FORM_BROWSER_PROTOCOL_GUID \ diff --git a/IntelFrameworkPkg/Include/Protocol/FormCallbackFramework.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h similarity index 96% rename from IntelFrameworkPkg/Include/Protocol/FormCallbackFramework.h rename to IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h index 708eabcb10..12aed7dc90 100644 --- a/IntelFrameworkPkg/Include/Protocol/FormCallbackFramework.h +++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h @@ -14,7 +14,7 @@ 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: FormCallbackFramework.h + Module Name: FrameworkFormCallback.h @par Revision Reference: This protocol is defined in HII spec 0.92. @@ -26,8 +26,8 @@ #include -#include -#include +#include +#include #define EFI_FORM_CALLBACK_PROTOCOL_GUID \ { \ diff --git a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h similarity index 97% rename from IntelFrameworkPkg/Include/Protocol/HiiFramework.h rename to IntelFrameworkPkg/Include/Protocol/FrameworkHii.h index d138ad8a95..32e66ed45d 100644 --- a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h +++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h @@ -12,7 +12,7 @@ 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: HiiFramework.h + Module Name: FrameworkHii.h @par Revision Reference: This protocol is defined in HII spec 0.92. diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec index 1a3a5b2076..e3e823108c 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.dec +++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec @@ -24,8 +24,8 @@ Include # Root include for the package [LibraryClasses.common] - HiiLibFramework|Include/Library/HiiLibFramework.h - IfrSupportLibFramework|Include/Library/IfrSupportLibFramework.h + FrameworkHiiLib|Include/Library/FrameworkHiiLib.h + FrameworkIfrSupportLib|Include/Library/FrameworkIfrSupportLib.h SmmLib|Include/Library/SmmLib.h [Guids.common] diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dsc b/IntelFrameworkPkg/IntelFrameworkPkg.dsc index fa20b026f0..be7a5bce1a 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.dsc +++ b/IntelFrameworkPkg/IntelFrameworkPkg.dsc @@ -58,8 +58,8 @@ ################################################################################ [Components.common] IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf - IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.inf + IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf - IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf - IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf + IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf + IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf diff --git a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c similarity index 94% rename from IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c index 354215af0f..913b471c5a 100644 --- a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf similarity index 89% rename from IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf index 6a96b50859..98ee9f9ae2 100644 --- a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf @@ -16,11 +16,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = HiiLibFramework + BASE_NAME = FrameworkHiiLib FILE_GUID = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = HiiLibFramework|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = FrameworkHiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 diff --git a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.msa b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa similarity index 100% rename from IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.msa rename to IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c similarity index 100% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c similarity index 100% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c similarity index 100% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf similarity index 90% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf index 8b21d4327a..fa0069897c 100644 --- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf +++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf @@ -17,11 +17,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = IfrSupportLibFramework + BASE_NAME = FrameworkIfrSupportLib FILE_GUID = ea55bada-d488-427b-9d2d-227e0aaa3707 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = IfrSupportLibFramework|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = FrameworkIfrSupportLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.msa b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.msa similarity index 100% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.msa rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.msa diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLibInternal.h b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h similarity index 90% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLibInternal.h rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h index ed7cfd91b4..033b3969da 100644 --- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLibInternal.h +++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h @@ -20,9 +20,9 @@ #include #include -#include +#include -#include +#include #include #include #include diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c similarity index 100% rename from IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c rename to IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/Console.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c similarity index 96% rename from IntelFrameworkPkg/Library/UefiLibFramework/Console.c rename to IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c index 6260555e9e..8baacaf8d4 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/Console.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c @@ -14,7 +14,7 @@ **/ -#include "UefiLibFramework.h" +#include "FrameworkUefiLib.h" typedef struct { CHAR16 WChar; diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h similarity index 92% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h rename to IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h index 913b653335..89d4633a48 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.h +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h @@ -1,6 +1,6 @@ /** @file Header file to include header files common to all source files in - UefiLibFramework. + FrameworkUefiLib. Copyright (c) 2007, Intel Corporation
All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ 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: UefiLibFramework.h + Module Name: FrameworkUefiLib.h **/ diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.inf b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf similarity index 95% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.inf rename to IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf index c5f227eada..a7a29bbd4b 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.inf +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf @@ -19,7 +19,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = UefiLibFramework + BASE_NAME = FrameworkUefiLib FILE_GUID = B2F0D71A-A39F-4094-854B-0C6BA6910CCE MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.msa b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.msa similarity index 100% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiLibFramework.msa rename to IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.msa diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiDriverModel.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c similarity index 97% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiDriverModel.c rename to IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c index f6919a6a78..c26599a37f 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiDriverModel.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c @@ -13,7 +13,7 @@ **/ -#include "UefiLibFramework.h" +#include "FrameworkUefiLib.h" /** Intialize a driver by installing the Driver Binding Protocol onto the driver's diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c similarity index 96% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c rename to IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c index 65c7641b74..af88f6353d 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c @@ -14,7 +14,7 @@ **/ -#include "UefiLibFramework.h" +#include "FrameworkUefiLib.h" /** Compare whether two names of languages are identical. diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibPrint.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c similarity index 96% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiLibPrint.c rename to IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c index 9a7592e9e6..7bc5f8a92a 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLibPrint.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c @@ -13,7 +13,7 @@ **/ -#include "UefiLibFramework.h" +#include "FrameworkUefiLib.h" /** Internal function which prints a formatted Unicode string to the console output device diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c similarity index 96% rename from IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c rename to IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c index b920db01e1..f08b1ee754 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c @@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "UefiLibFramework.h" +#include "FrameworkUefiLib.h" /** An empty function to pass error checking of CreateEventEx (). diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 5f3be975fc..6e62654fee 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -116,7 +116,7 @@ FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index 115d237415..98780f704a 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -24,7 +24,7 @@ Revision History #define _GRAPHICS_CONSOLE_H #include -#include +#include #include #include #include @@ -32,7 +32,7 @@ Revision History #include #include #include -#include +#include #include #include #include diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf index 768e8cbcfa..013bc18389 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -52,7 +52,7 @@ UefiLib UefiDriverEntryPoint DebugLib - HiiLibFramework + FrameworkHiiLib [Protocols] gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h index b539928607..54ab820a56 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h +++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h @@ -26,14 +26,14 @@ Abstract: #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf index e16c9af829..ee76efa60b 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf +++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf @@ -48,7 +48,7 @@ MemoryAllocationLib BaseMemoryLib UefiDriverEntryPoint - HiiLibFramework + FrameworkHiiLib DebugLib [Guids] diff --git a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h index 360407b9f4..351e4cd74c 100644 --- a/Nt32Pkg/Include/Library/EdkGenericBdsLib.h +++ b/Nt32Pkg/Include/Library/EdkGenericBdsLib.h @@ -23,7 +23,7 @@ Abstract: #define _BDS_LIB_H_ #include -#include +#include extern EFI_HANDLE mBdsImageHandle; diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h index f94809d2b2..830e715e70 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h +++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf index b0ccb41642..92a2ea4381 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf @@ -69,7 +69,7 @@ BaseMemoryLib UefiDriverEntryPoint UefiLib - HiiLibFramework + FrameworkHiiLib DebugLib BaseLib PcdLib diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h index 779d33063e..dcc52c211a 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h @@ -30,7 +30,7 @@ Abstract: #include #include #include -#include +#include #include #include #include diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index c0aed8cf20..940e6f24a1 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -59,12 +59,12 @@ PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf - IfrSupportLibFramework|IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf + FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf @@ -99,7 +99,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -153,7 +153,7 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf @@ -171,7 +171,7 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf @@ -188,7 +188,7 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf @@ -203,7 +203,7 @@ [LibraryClasses.common.UEFI_APPLICATION] DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf + FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h index 15f9c5f095..36e05cdb14 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h @@ -26,19 +26,19 @@ Revision History #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ Revision History #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ Revision History #include #include #include -#include +#include #include #include diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf index 70e0559606..9d2b0b0cb5 100644 --- a/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf +++ b/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf @@ -82,7 +82,7 @@ [LibraryClasses] PeCoffLib - HiiLibFramework + FrameworkHiiLib DevicePathLib UefiRuntimeServicesTableLib UefiBootServicesTableLib @@ -91,7 +91,7 @@ EdkGenericBdsLib HobLib ReportStatusCodeLib - IfrSupportLibFramework + FrameworkIfrSupportLib PrintLib PerformanceLib DxeServicesTableLib -- 2.39.2