MdeModulePkg: Update Ppi/Protocol/Guid usage in INF files

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 30d5984f7c1fe900625dc13322f02bb1856ce8bd..e29d6c83ae583b3939e376c912fe843e74ab9b26 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -107,7 +107,7 @@
   ## CONSUMES   ## Event\r
   ## PRODUCES   ## Event\r
   gEfiEventExitBootServicesGuid\r
-  gEfiHobMemoryAllocModuleGuid                  ## CONSUMES             ## HOB\r
+  gEfiHobMemoryAllocModuleGuid                  ## SOMETIMES_CONSUMES   ## HOB\r
   gEfiFirmwareFileSystem2Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format\r
   gEfiFirmwareFileSystem3Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format\r
   gAprioriGuid                                  ## SOMETIMES_CONSUMES   ## File\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index 95e34bd6837e1bc1633871524c1c44c4954a03b5..49ae6fbb57d13f109e5c582305cd19ec953b2124 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -109,7 +109,7 @@
   gEdkiiMemoryProfileGuid\r
   ## SOMETIMES_PRODUCES   ## GUID # Install protocol\r
   gEdkiiSmmMemoryProfileGuid\r
-  gEdkiiPiSmmMemoryAttributesTableGuid          ## SOMETIMES_PRODUCES   ## SystemTable\r
+  gEdkiiPiSmmMemoryAttributesTableGuid          ## PRODUCES   ## SystemTable\r
   ## SOMETIMES_CONSUMES   ## SystemTable\r
   gLoadFixedAddressConfigurationTableGuid\r
   ## SOMETIMES_PRODUCES   ## GUID # Install protocol\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
index 1c0c0e1aa19c9e95074db43edfbb1cb1253f61ad..def923b977d71003aaa93f9235e56f1b48d440bc 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
@@ -79,9 +79,7 @@
                                                 ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)\r
                                                 ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)\r
                                                 ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)\r
-  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES ## GUID (Indicate the information type is volume)\r
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID (Indicate the information type is file)\r
-  gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended IFR Guid Opcode)\r
+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID\r
   gEfiIfrBootMaintenanceGuid                    ## CONSUMES ## GUID\r
  \r

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
index a6cf54cb6b4ad35088e1c2b9df6c33b3a1ecc415..a7c36993c4f5f015545ed615c9bc619f62ceae9a 100644 (file)
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
@@ -66,15 +66,17 @@
 \r
 [Protocols]\r
   gEsrtManagementProtocolGuid             ## CONSUMES\r
-  gEfiFirmwareManagementProtocolGuid      ## SOMETIMES_CONSUMES\r
+  gEfiFirmwareManagementProtocolGuid      ## CONSUMES\r
   gEdkiiVariableLockProtocolGuid          ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
   gEfiFmpCapsuleGuid                      ## SOMETIMES_CONSUMES ## GUID\r
   gWindowsUxCapsuleGuid                   ## SOMETIMES_CONSUMES ## GUID\r
   gEfiSystemResourceTableGuid             ## SOMETIMES_CONSUMES ## GUID\r
-  gEfiCapsuleReportGuid                   ## CONSUMES ## Variable\r
-  gEfiCapsuleVendorGuid                   ## CONSUMES ## Variable\r
+  ## SOMETIMES_CONSUMES ## Variable:L"CapsuleMax"\r
+  ## SOMETIMES_PRODUCES ## Variable:L"CapsuleMax"\r
+  gEfiCapsuleReportGuid\r
+  gEfiCapsuleVendorGuid                   ## SOMETIMES_CONSUMES ## Variable:L"CapsuleUpdateData"\r
   gEfiEndOfDxeEventGroupGuid              ## CONSUMES ## Event\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
index 25b7d51f57fa98ffa5fd821371fdf9a87cf2372d..41916755daea533fef4322759083c8f9da3af227 100644 (file)
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
@@ -69,15 +69,17 @@
 \r
 [Protocols]\r
   gEsrtManagementProtocolGuid             ## CONSUMES\r
-  gEfiFirmwareManagementProtocolGuid      ## SOMETIMES_CONSUMES\r
+  gEfiFirmwareManagementProtocolGuid      ## CONSUMES\r
   gEdkiiVariableLockProtocolGuid          ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
   gEfiFmpCapsuleGuid                      ## SOMETIMES_CONSUMES ## GUID\r
   gWindowsUxCapsuleGuid                   ## SOMETIMES_CONSUMES ## GUID\r
   gEfiSystemResourceTableGuid             ## SOMETIMES_CONSUMES ## GUID\r
-  gEfiCapsuleReportGuid                   ## CONSUMES ## Variable\r
-  gEfiCapsuleVendorGuid                   ## CONSUMES ## Variable\r
+  ## SOMETIMES_CONSUMES ## Variable:L"CapsuleMax"\r
+  ## SOMETIMES_PRODUCES ## Variable:L"CapsuleMax"\r
+  gEfiCapsuleReportGuid\r
+  gEfiCapsuleVendorGuid                   ## SOMETIMES_CONSUMES ## Variable:L"CapsuleUpdateData"\r
   gEfiEndOfDxeEventGroupGuid              ## CONSUMES ## Event\r
   gEfiEventVirtualAddressChangeGuid       ## CONSUMES ## Event\r
 \r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf b/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
index c292aa2e491f3a59ac9bfb242c6e8046573f2c89..75071d9541fed78b05c23759d6e9ccca88e7bbb9 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
@@ -50,14 +50,14 @@
   UefiHiiServicesLib\r
 \r
 [Guids]\r
-  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES ## GUID (Indicate the information type is volume)\r
-  gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended IFR Guid Opcode)\r
+  gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES ## GUID (Indicate the information type is volume)\r
+  gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r
  \r
 [Protocols]\r
-  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES\r
-  gEfiHiiConfigAccessProtocolGuid               ## CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
-  gEfiDevicePathToTextProtocolGuid              ## CONSUMES\r
+  gEfiDevicePathToTextProtocolGuid              ## PRODUCES\r
 \r
 [Depex.common.DXE_DRIVER]\r
   gEfiFormBrowser2ProtocolGuid AND gEfiHiiDatabaseProtocolGuid
\ No newline at end of file

diff --git a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf b/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
index 32c02b012f108fa5849bbb243c2a5342ed60bf95..4c3d5e05456738c28f1da3e5cbc0f9e2e2a8765a 100644 (file)
--- a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
@@ -42,6 +42,6 @@
   DevicePathLib\r
 \r
 [Protocols]\r
-  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES\r
+  gEfiUnicodeCollation2ProtocolGuid                       ## SOMETIMES_CONSUMES\r
   gEfiDevicePathProtocolGuid                              ## CONSUMES\r
 \r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
index 2c66f15399289257610c00562feeb69089060834..06b3a08e786a98671dc1232dd03b1eda836869f9 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
@@ -58,7 +58,7 @@
 [Protocols]\r
   gEfiFirmwareManagementProtocolGuid      ## SOMETIMES_CONSUMES\r
   gEsrtManagementProtocolGuid             ## PRODUCES\r
-  gEdkiiVariableLockProtocolGuid          ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid          ## SOMETIMES_CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxFmpEsrtCacheNum                  ## CONSUMES\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
index 7f8f6cbb6274c6f08b1afe6664b81706caf23f5f..c5553a38e0b14ff1377738e88b551642de6250c5 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This driver produces security2 and security architectural protocol based on SecurityManagementLib.\r
 #\r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
@@ -51,7 +51,7 @@
   gEfiSecurityArchProtocolGuid                  ## PRODUCES\r
   gEfiSecurity2ArchProtocolGuid                 ## PRODUCES\r
   gEfiDeferredImageLoadProtocolGuid             ## PRODUCES\r
-  gEfiDxeSmmReadyToLockProtocolGuid             ## CONSUMES\r
+  gEfiDxeSmmReadyToLockProtocolGuid             ## NOTIFY\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index fefaefe59c8ddc84795f290850299862fcd4d0c9..f7b53ea1d2ce507a0f342a3fbc2f9ce800f98128 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -77,7 +77,7 @@
   ## NOTIFY\r
   gEdkiiFormDisplayEngineProtocolGuid\r
   gEdkiiFormBrowserExProtocolGuid               ## PRODUCES\r
-  gEfiRegularExpressionProtocolGuid             ## CONSUMES\r
+  gEfiRegularExpressionProtocolGuid             ## SOMETIMES_CONSUMES\r
 \r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES\r