From 3018ca2d36dc4b785379b1a0fa63c437367510be Mon Sep 17 00:00:00 2001 From: qwang12 Date: Tue, 3 Feb 2009 02:23:03 +0000 Subject: [PATCH] 1) Clean up the INF and add in comment to describe the surface area of modules 2) Minor comment fix. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7413 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ExtendedIfrSupportLib.inf | 10 +++++----- MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf | 8 ++++---- .../UefiIfrSupportLib/UefiIfrSupportLib.inf | 7 ++++--- .../DriverSampleDxe/DriverSampleDxe.inf | 10 +++++----- .../HiiDatabaseDxe/HiiDatabaseDxe.inf | 18 +++++++++--------- .../SetupBrowserDxe/SetupBrowserDxe.inf | 18 +++++++++--------- MdeModulePkg/Universal/SetupBrowserDxe/Ui.h | 2 ++ 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf index 9e51bd37f3..4229b11dba 100644 --- a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf +++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf @@ -55,9 +55,9 @@ PcdLib [Protocols] - gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiHiiDatabaseProtocolGuid - gEfiHiiStringProtocolGuid + gEfiHiiDatabaseProtocolGuid ## CONSUMES + gEfiHiiStringProtocolGuid ## CONSUMES -[Pcd] - gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang +[Depex] + gEfiHiiDatabaseProtocolGuid AND + gEfiHiiStringProtocolGuid diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf index 365fef52ea..8c8a2f2c4a 100644 --- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf +++ b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf @@ -53,15 +53,15 @@ UefiRuntimeServicesTableLib [Protocols] - gEfiHiiDatabaseProtocolGuid # ALWAYS_CONSUMED - gEfiHiiStringProtocolGuid # ALWAYS_CONSUMED - gEfiDevicePathProtocolGuid + gEfiHiiDatabaseProtocolGuid ## CONSUMES + gEfiHiiStringProtocolGuid ## CONSUMES + gEfiDevicePathProtocolGuid ## CONSUMES [Pcd] gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang [Guids] - gEfiGlobalVariableGuid + gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## Variable:L"PlatformLang" [Depex] gEfiHiiDatabaseProtocolGuid AND diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf index 6bc8f06733..88d1c42759 100644 --- a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf +++ b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf @@ -52,6 +52,7 @@ DebugLib [Protocols] - gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiHiiConfigRoutingProtocolGuid - gEfiFormBrowser2ProtocolGuid + gEfiDevicePathProtocolGuid ## CONSUMES + gEfiHiiConfigRoutingProtocolGuid ## CONSUMES + gEfiFormBrowser2ProtocolGuid ## CONSUMES + diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf index e1faee48a2..d1da67da04 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf @@ -57,11 +57,11 @@ ExtendedIfrSupportLib [Protocols] - gEfiHiiStringProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiHiiConfigRoutingProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiHiiConfigAccessProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiFormBrowser2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiHiiDatabaseProtocolGuid # PROTOCOL ALWAYS_CONSUMED + gEfiHiiStringProtocolGuid ## CONSUMES + gEfiHiiConfigRoutingProtocolGuid ## CONSUMES + gEfiHiiConfigAccessProtocolGuid ## CONSUMES + gEfiFormBrowser2ProtocolGuid ## CONSUMES + gEfiHiiDatabaseProtocolGuid ## CONSUMES [Depex] diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf index a34260e2d0..a0d34a31b9 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf @@ -59,14 +59,14 @@ UefiRuntimeServicesTableLib [Protocols] - gEfiConsoleControlProtocolGuid - gEfiDevicePathProtocolGuid - gEfiHiiStringProtocolGuid - gEfiHiiImageProtocolGuid - gEfiHiiConfigRoutingProtocolGuid - gEfiHiiDatabaseProtocolGuid - gEfiHiiFontProtocolGuid - gEfiHiiConfigAccessProtocolGuid + gEfiConsoleControlProtocolGuid ## CONSUMES + gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES + gEfiHiiStringProtocolGuid ## PRODUCES + gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol ## PRODUCES + gEfiHiiConfigRoutingProtocolGuid |PcdSupportFullConfigRoutingProtocol ## PRODUCES + gEfiHiiDatabaseProtocolGuid ## PRODUCES + gEfiHiiFontProtocolGuid ## PRODUCES + gEfiHiiConfigAccessProtocolGuid ## CONSUMES [FeaturePcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol @@ -76,7 +76,7 @@ gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang [Guids] - gEfiGlobalVariableGuid + gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## Variable:"PlatformLang" [Depex] TRUE diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index ffb303e669..962847e3f9 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -64,15 +64,15 @@ ExtendedHiiLib [Protocols] - gEfiPrintProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiPrint2ProtocolGuid - gEfiHiiConfigAccessProtocolGuid - gEfiHiiStringProtocolGuid - gEfiFormBrowser2ProtocolGuid - gEfiHiiConfigRoutingProtocolGuid - gEfiHiiDatabaseProtocolGuid - gEfiUnicodeCollation2ProtocolGuid - gEfiConsoleControlProtocolGuid + gEfiPrintProtocolGuid ## PRODUCES + gEfiPrint2ProtocolGuid ## PRODUCES + gEfiHiiConfigAccessProtocolGuid ## CONSUMES + gEfiHiiStringProtocolGuid ## CONSUMES + gEfiFormBrowser2ProtocolGuid ## PRODUCES + gEfiHiiConfigRoutingProtocolGuid ## CONSUMES + gEfiHiiDatabaseProtocolGuid ## CONSUMES + gEfiUnicodeCollation2ProtocolGuid ## CONSUMES + gEfiConsoleControlProtocolGuid ## CONSUMES [FeaturePcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h index 7031c3973b..6842fe9d7a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h @@ -741,6 +741,8 @@ CompareHiiValue ( /** Evaluate the result of a HII expression + If Expression is NULL, then ASSERT. + @param FormSet FormSet associated with this expression. @param Form Form associated with this expression. @param Expression Expression to be evaluated. -- 2.39.2