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

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
index 9e51bd37f3038a75531410ec95722d2018139ea5..4229b11dbaea821ca1dc97204971853e4ed96c94 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
@@ -55,9 +55,9 @@
   PcdLib\r
 \r
 [Protocols]\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiDatabaseProtocolGuid\r
-  gEfiHiiStringProtocolGuid\r
+  gEfiHiiDatabaseProtocolGuid        ## CONSUMES\r
+  gEfiHiiStringProtocolGuid          ## CONSUMES\r
 \r
-[Pcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
+[Depex]\r
+  gEfiHiiDatabaseProtocolGuid AND\r
+  gEfiHiiStringProtocolGuid\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
index 365fef52ea27004a6fcd6b5e0add6144433add51..8c8a2f2c4aa3ad9d87502d615034da2e9aadba43 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+++ b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
@@ -53,15 +53,15 @@
   UefiRuntimeServicesTableLib\r
 \r
 [Protocols]\r
-  gEfiHiiDatabaseProtocolGuid  # ALWAYS_CONSUMED\r
-  gEfiHiiStringProtocolGuid    # ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid  \r
+  gEfiHiiDatabaseProtocolGuid  ## CONSUMES\r
+  gEfiHiiStringProtocolGuid    ## CONSUMES\r
+  gEfiDevicePathProtocolGuid   ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
 \r
 [Guids]  \r
-  gEfiGlobalVariableGuid \r
+  gEfiGlobalVariableGuid        ## SOMETIMES_CONSUMES ## Variable:L"PlatformLang"\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND\r

diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf
index 6bc8f06733286f6490ce32799c8e8e080c9b4a32..88d1c42759cff54a36b9bfbb44126f687ca432d9 100644 (file)
--- a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf
+++ b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf
@@ -52,6 +52,7 @@
   DebugLib\r
 \r
 [Protocols]\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigRoutingProtocolGuid\r
-  gEfiFormBrowser2ProtocolGuid   \r
+  gEfiDevicePathProtocolGuid                    ## CONSUMES\r
+  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
+  gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
+  \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index e1faee48a2936fa5f9768c3c14c9b3070cdb44e0..d1da67da0401c65b1074d299d9772e12a6e4940b 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -57,11 +57,11 @@
   ExtendedIfrSupportLib\r
 \r
 [Protocols]\r
-  gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiFormBrowser2ProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiHiiStringProtocolGuid                     ## CONSUMES\r
+  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
+  gEfiHiiConfigAccessProtocolGuid               ## CONSUMES\r
+  gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
+  gEfiHiiDatabaseProtocolGuid                   ## CONSUMES\r
 \r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index a34260e2d06c90d1d11e9ee3722d70cfaa26ed44..a0d34a31b91cabc6ec79e397790492af828223ae 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -59,14 +59,14 @@
   UefiRuntimeServicesTableLib\r
 \r
 [Protocols]\r
-  gEfiConsoleControlProtocolGuid                \r
-  gEfiDevicePathProtocolGuid                    \r
-  gEfiHiiStringProtocolGuid\r
-  gEfiHiiImageProtocolGuid\r
-  gEfiHiiConfigRoutingProtocolGuid\r
-  gEfiHiiDatabaseProtocolGuid\r
-  gEfiHiiFontProtocolGuid\r
-  gEfiHiiConfigAccessProtocolGuid\r
+  gEfiConsoleControlProtocolGuid                                        ## CONSUMES\r
+  gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES\r
+  gEfiHiiStringProtocolGuid                                             ## PRODUCES\r
+  gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol                  ## PRODUCES\r
+  gEfiHiiConfigRoutingProtocolGuid |PcdSupportFullConfigRoutingProtocol ## PRODUCES\r
+  gEfiHiiDatabaseProtocolGuid                                           ## PRODUCES\r
+  gEfiHiiFontProtocolGuid                                               ## PRODUCES\r
+  gEfiHiiConfigAccessProtocolGuid                                       ## CONSUMES\r
 \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol\r
@@ -76,7 +76,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
 \r
 [Guids]  \r
-  gEfiGlobalVariableGuid \r
+  gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## Variable:"PlatformLang"\r
   \r
 [Depex]\r
   TRUE\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index ffb303e669a63c385f1384df75fbf2f386d4c163..962847e3f98c3623fba7fb5575c212937eb6471d 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -64,15 +64,15 @@
   ExtendedHiiLib\r
 \r
 [Protocols]\r
-  gEfiPrintProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiPrint2ProtocolGuid\r
-  gEfiHiiConfigAccessProtocolGuid\r
-  gEfiHiiStringProtocolGuid\r
-  gEfiFormBrowser2ProtocolGuid\r
-  gEfiHiiConfigRoutingProtocolGuid\r
-  gEfiHiiDatabaseProtocolGuid\r
-  gEfiUnicodeCollation2ProtocolGuid\r
-  gEfiConsoleControlProtocolGuid\r
+  gEfiPrintProtocolGuid                         ## PRODUCES\r
+  gEfiPrint2ProtocolGuid                        ## PRODUCES\r
+  gEfiHiiConfigAccessProtocolGuid               ## CONSUMES\r
+  gEfiHiiStringProtocolGuid                     ## CONSUMES\r
+  gEfiFormBrowser2ProtocolGuid                  ## PRODUCES\r
+  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
+  gEfiHiiDatabaseProtocolGuid                   ## CONSUMES\r
+  gEfiUnicodeCollation2ProtocolGuid             ## CONSUMES\r
+  gEfiConsoleControlProtocolGuid                ## CONSUMES\r
 \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index 7031c3973b23e8f6a3806f2dd3e789f0f0a65003..6842fe9d7a4fceca72a146b8fa9187c097ea3f68 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -741,6 +741,8 @@ CompareHiiValue (
 /**\r
   Evaluate the result of a HII expression\r
 \r
+  If Expression is NULL, then ASSERT.\r
+\r
   @param  FormSet                FormSet associated with this expression.\r
   @param  Form                   Form associated with this expression.\r
   @param  Expression             Expression to be evaluated.\r