ShellPkg: Update Guid/Protocol usages in INF files.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Shumin Qiu <shumin.qiu@intel.com>

diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
index 9e1448582ffd219ad5ad3eabfe6081f0a2227e18..a1b6a24e874bfa0b937a4e7079ca3ab6e3c3ca73 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -73,9 +73,9 @@
   UefiHiiServicesLib\r
 \r
 [Guids]\r
-  gShellVariableGuid                                      ## CONSUMES ## GUID\r
-  gShellMapGuid                                           ## CONSUMES ## GUID\r
-  gShellAliasGuid                                         ## CONSUMES ## GUID\r
+  gShellVariableGuid                                      ## SOMETIMES_CONSUMES ## GUID\r
+  gShellAliasGuid                                         ## SOMETIMES_CONSUMES ## GUID\r
+  gShellAliasGuid                                         ## SOMETIMES_PRODUCES ## GUID\r
 \r
 [Protocols]\r
   gEfiShellProtocolGuid                                   ## PRODUCES\r
@@ -89,9 +89,9 @@
   gEfiSimpleTextInputExProtocolGuid                       ## CONSUMES\r
   gEfiSimpleTextInProtocolGuid                            ## CONSUMES\r
   gEfiSimpleTextOutProtocolGuid                           ## CONSUMES\r
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES\r
   gEfiLoadedImageProtocolGuid                             ## CONSUMES\r
-  gEfiComponentName2ProtocolGuid                          ## CONSUMES\r
+  gEfiComponentName2ProtocolGuid                          ## SOMETIMES_CONSUMES\r
   gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES\r
   gEfiDevicePathProtocolGuid                              ## CONSUMES\r
   gEfiHiiPackageListProtocolGuid                          ## SOMETIMES_PRODUCES\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 52eed8604ebbc44a39730d8f820537aaf8d5361f..3bd4dbe4231fa9f36bb4119cbd5b98bdf162736e 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -52,7 +52,7 @@
   SortLib\r
 \r
 [Protocols]\r
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES\r
 \r
   # shell 2.0\r
   gEfiShellProtocolGuid                                   ## SOMETIMES_CONSUMES\r
@@ -62,18 +62,18 @@
   gEfiShellEnvironment2Guid                               ## SOMETIMES_CONSUMES\r
   gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES\r
 \r
-  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES\r
-  gEfiDevicePathToTextProtocolGuid                        ## CONSUMES\r
-  gEfiBusSpecificDriverOverrideProtocolGuid               ## CONSUMES\r
-  gEfiDevicePathUtilitiesProtocolGuid                     ## CONSUMES\r
-  gEfiDevicePathFromTextProtocolGuid                      ## CONSUMES\r
-  gEfiPlatformDriverOverrideProtocolGuid                  ## CONSUMES\r
-  gEfiSimpleTextInProtocolGuid                            ## CONSUMES\r
-  gEfiPlatformToDriverConfigurationProtocolGuid           ## CONSUMES\r
-  gEfiDriverSupportedEfiVersionProtocolGuid               ## CONSUMES\r
+  gEfiUnicodeCollation2ProtocolGuid                       ## UNDEFINED\r
+  gEfiDevicePathToTextProtocolGuid                        ## UNDEFINED\r
+  gEfiBusSpecificDriverOverrideProtocolGuid               ## UNDEFINED\r
+  gEfiDevicePathUtilitiesProtocolGuid                     ## UNDEFINED\r
+  gEfiDevicePathFromTextProtocolGuid                      ## UNDEFINED\r
+  gEfiPlatformDriverOverrideProtocolGuid                  ## UNDEFINED\r
+  gEfiSimpleTextInProtocolGuid                            ## UNDEFINED\r
+  gEfiPlatformToDriverConfigurationProtocolGuid           ## UNDEFINED\r
+  gEfiDriverSupportedEfiVersionProtocolGuid               ## UNDEFINED\r
   gEfiLoadedImageProtocolGuid                             ## CONSUMES\r
   gEfiDevicePathProtocolGuid                              ## CONSUMES\r
-  gEfiLoadedImageDevicePathProtocolGuid                   ## CONSUMES\r
+  gEfiLoadedImageDevicePathProtocolGuid                   ## UNDEFINED\r
   gEfiSimpleTextOutProtocolGuid                           ## UNDEFINED\r
   gEfiSimplePointerProtocolGuid                           ## UNDEFINED\r
   gEfiAbsolutePointerProtocolGuid                         ## UNDEFINED\r
@@ -293,7 +293,7 @@
   gEfiRestProtocolGuid                                    ## UNDEFINED\r
 \r
 [Guids]\r
-  gEfiFileInfoGuid                                        ## CONSUMES ## GUID\r
+  gEfiFileInfoGuid                                        ## UNDEFINED\r
   gEfiShellEnvironment2ExtGuid                            ## CONSUMES ## GUID\r
   gEfiPcAnsiGuid                                          ## UNDEFINED\r
   gEfiVT100Guid                                           ## UNDEFINED\r

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
index e111e8d56f46a1b4978814f6ab1a7361ff0a7642..b73b5c0e0611ce93036d424bdecf139c4fd2dc7c 100644 (file)
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -56,7 +56,7 @@
   gEfiUsbIoProtocolGuid                                   ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
-  gEfiSasDevicePathGuid                                   ## CONSUMES ## GUID\r
+  gEfiSasDevicePathGuid                                   ## SOMETIMES_CONSUMES ## GUID\r
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index 8104b9a1d5dc834f281d4231cbd0f68362710c79..6b837b5faab3d567d8beac7cc8e9919d9eff234c 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -123,10 +123,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength      ## CONSUMES\r
 \r
 [Protocols]\r
-  gEfiPciRootBridgeIoProtocolGuid             ## CONSUMES\r
-  gEfiBlockIoProtocolGuid                     ## CONSUMES\r
-  gEfiSimplePointerProtocolGuid               ## CONSUMES\r
-  gEfiCpuIo2ProtocolGuid                      ## CONSUMES\r
+  gEfiPciRootBridgeIoProtocolGuid             ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid                     ## SOMETIMES_CONSUMES\r
+  gEfiSimplePointerProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiCpuIo2ProtocolGuid                      ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
   gEfiGlobalVariableGuid          ## SOMETIMES_CONSUMES ## GUID\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index f2a2e4c581b0f14a744d5304f32fa2efde43beba..0682350891257f98f1d8c9865658834c7c76fefe 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -61,13 +61,13 @@
   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask  ## CONSUMES\r
 \r
 [Protocols]\r
-  gEfiDriverHealthProtocolGuid                    ## CONSUMES\r
-  gEfiDriverFamilyOverrideProtocolGuid            ## CONSUMES\r
-  gEfiHiiConfigAccessProtocolGuid                 ## CONSUMES\r
+  gEfiDriverHealthProtocolGuid                    ## UNDEFINED\r
+  gEfiDriverFamilyOverrideProtocolGuid            ## UNDEFINED\r
+  gEfiHiiConfigAccessProtocolGuid                 ## SOMETIMES_CONSUMES\r
   gEfiHiiDatabaseProtocolGuid                     ## CONSUMES\r
 \r
 [Guids]\r
-  gEfiGlobalVariableGuid                          ## CONSUMES ## GUID\r
+  gEfiGlobalVariableGuid                          ## SOMETIMES_CONSUMES ## GUID\r
   gEfiConsoleInDeviceGuid                         ## CONSUMES ## GUID\r
   gEfiConsoleOutDeviceGuid                        ## CONSUMES ## GUID\r
   gShellDriver1HiiGuid                            ## PRODUCES ## HII\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 76540fb3a3645282e838c1e89ccde513e0c094f6..16faad2d2db4740156927277bf73c4c5a03bbabd 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -72,13 +72,13 @@
   gEfiShellParametersProtocolGuid                         ## CONSUMES\r
   gEfiDevicePathProtocolGuid                              ## CONSUMES\r
   gEfiLoadedImageProtocolGuid                             ## CONSUMES\r
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES\r
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES\r
   gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize    ## CONSUMES\r
 \r
 [Guids]\r
-  gEfiFileSystemInfoGuid                                  ## CONSUMES ## GUID\r
+  gEfiFileSystemInfoGuid                                  ## SOMETIMES_CONSUMES ## GUID\r
   gEfiFileInfoGuid                                        ## UNDEFINED\r
   gShellLevel2HiiGuid                                     ## SOMETIMES_CONSUMES ## HII\r

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index d44ce02bb38ec1069d56579fb5bc7e9cbd68205d..782649a7a034ac08753c50037982f8ee63ccaeb4 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -50,7 +50,7 @@
   SortLib\r
 \r
 [Protocols]\r
-  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
 \r
   # shell 2.0\r
   gEfiShellProtocolGuid                         ## SOMETIMES_CONSUMES\r
@@ -61,8 +61,8 @@
   gEfiShellInterfaceGuid                        ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID\r
-  gEfiShellEnvironment2ExtGuid                  ## CONSUMES ## GUID\r
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES ## GUID\r
+  gEfiShellEnvironment2ExtGuid                  ## SOMETIMES_CONSUMES ## GUID\r
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     ## CONSUMES\r