Reviewed-by: Qiu Shumin <shumin....@intel.com>

-----Original Message-----
From: Gao, Liming 
Sent: Thursday, April 07, 2016 2:54 PM
To: edk2-devel@lists.01.org
Cc: Carsey, Jaben; Qiu, Shumin
Subject: [Patch 2/3] ShellPkg: Update Guid/Protocol usages in INF files.

Cc: Jaben Carsey <jaben.car...@intel.com>
Cc: Shumin Qiu <shumin....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
 ShellPkg/Application/Shell/Shell.inf               | 10 ++++-----
 .../UefiHandleParsingLib/UefiHandleParsingLib.inf  | 24 +++++++++++-----------
 .../UefiShellCommandLib/UefiShellCommandLib.inf    |  2 +-
 .../UefiShellDebug1CommandsLib.inf                 |  8 ++++----
 .../UefiShellDriver1CommandsLib.inf                |  8 ++++----
 .../UefiShellLevel2CommandsLib.inf                 |  4 ++--
 ShellPkg/Library/UefiShellLib/UefiShellLib.inf     |  6 +++---
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ShellPkg/Application/Shell/Shell.inf 
b/ShellPkg/Application/Shell/Shell.inf
index 9e14485..a1b6a24 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -73,9 +73,9 @@
   UefiHiiServicesLib
 
 [Guids]
-  gShellVariableGuid                                      ## CONSUMES ## GUID
-  gShellMapGuid                                           ## CONSUMES ## GUID
-  gShellAliasGuid                                         ## CONSUMES ## GUID
+  gShellVariableGuid                                      ## 
SOMETIMES_CONSUMES ## GUID
+  gShellAliasGuid                                         ## 
SOMETIMES_CONSUMES ## GUID
+  gShellAliasGuid                                         ## 
SOMETIMES_PRODUCES ## GUID
 
 [Protocols]
   gEfiShellProtocolGuid                                   ## PRODUCES
@@ -89,9 +89,9 @@
   gEfiSimpleTextInputExProtocolGuid                       ## CONSUMES
   gEfiSimpleTextInProtocolGuid                            ## CONSUMES
   gEfiSimpleTextOutProtocolGuid                           ## CONSUMES
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES
   gEfiLoadedImageProtocolGuid                             ## CONSUMES
-  gEfiComponentName2ProtocolGuid                          ## CONSUMES
+  gEfiComponentName2ProtocolGuid                          ## SOMETIMES_CONSUMES
   gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES
   gEfiDevicePathProtocolGuid                              ## CONSUMES
   gEfiHiiPackageListProtocolGuid                          ## SOMETIMES_PRODUCES
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf 
b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 52eed86..3bd4dbe 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -52,7 +52,7 @@
   SortLib
 
 [Protocols]
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES
 
   # shell 2.0
   gEfiShellProtocolGuid                                   ## SOMETIMES_CONSUMES
@@ -62,18 +62,18 @@
   gEfiShellEnvironment2Guid                               ## SOMETIMES_CONSUMES
   gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES
 
-  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES
-  gEfiDevicePathToTextProtocolGuid                        ## CONSUMES
-  gEfiBusSpecificDriverOverrideProtocolGuid               ## CONSUMES
-  gEfiDevicePathUtilitiesProtocolGuid                     ## CONSUMES
-  gEfiDevicePathFromTextProtocolGuid                      ## CONSUMES
-  gEfiPlatformDriverOverrideProtocolGuid                  ## CONSUMES
-  gEfiSimpleTextInProtocolGuid                            ## CONSUMES
-  gEfiPlatformToDriverConfigurationProtocolGuid           ## CONSUMES
-  gEfiDriverSupportedEfiVersionProtocolGuid               ## CONSUMES
+  gEfiUnicodeCollation2ProtocolGuid                       ## UNDEFINED
+  gEfiDevicePathToTextProtocolGuid                        ## UNDEFINED
+  gEfiBusSpecificDriverOverrideProtocolGuid               ## UNDEFINED
+  gEfiDevicePathUtilitiesProtocolGuid                     ## UNDEFINED
+  gEfiDevicePathFromTextProtocolGuid                      ## UNDEFINED
+  gEfiPlatformDriverOverrideProtocolGuid                  ## UNDEFINED
+  gEfiSimpleTextInProtocolGuid                            ## UNDEFINED
+  gEfiPlatformToDriverConfigurationProtocolGuid           ## UNDEFINED
+  gEfiDriverSupportedEfiVersionProtocolGuid               ## UNDEFINED
   gEfiLoadedImageProtocolGuid                             ## CONSUMES
   gEfiDevicePathProtocolGuid                              ## CONSUMES
-  gEfiLoadedImageDevicePathProtocolGuid                   ## CONSUMES
+  gEfiLoadedImageDevicePathProtocolGuid                   ## UNDEFINED
   gEfiSimpleTextOutProtocolGuid                           ## UNDEFINED
   gEfiSimplePointerProtocolGuid                           ## UNDEFINED
   gEfiAbsolutePointerProtocolGuid                         ## UNDEFINED
@@ -293,7 +293,7 @@
   gEfiRestProtocolGuid                                    ## UNDEFINED
 
 [Guids]
-  gEfiFileInfoGuid                                        ## CONSUMES ## GUID
+  gEfiFileInfoGuid                                        ## UNDEFINED
   gEfiShellEnvironment2ExtGuid                            ## CONSUMES ## GUID
   gEfiPcAnsiGuid                                          ## UNDEFINED
   gEfiVT100Guid                                           ## UNDEFINED
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf 
b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
index e111e8d..b73b5c0 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -56,7 +56,7 @@
   gEfiUsbIoProtocolGuid                                   ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEfiSasDevicePathGuid                                   ## CONSUMES ## GUID
+  gEfiSasDevicePathGuid                                   ## 
SOMETIMES_CONSUMES ## GUID
 
 [Pcd.common]
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES
diff --git 
a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index 8104b9a..6b837b5 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -123,10 +123,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength      ## CONSUMES
 
 [Protocols]
-  gEfiPciRootBridgeIoProtocolGuid             ## CONSUMES
-  gEfiBlockIoProtocolGuid                     ## CONSUMES
-  gEfiSimplePointerProtocolGuid               ## CONSUMES
-  gEfiCpuIo2ProtocolGuid                      ## CONSUMES
+  gEfiPciRootBridgeIoProtocolGuid             ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid                     ## SOMETIMES_CONSUMES
+  gEfiSimplePointerProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiCpuIo2ProtocolGuid                      ## SOMETIMES_CONSUMES
 
 [Guids]
   gEfiGlobalVariableGuid          ## SOMETIMES_CONSUMES ## GUID
diff --git 
a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf 
b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index f2a2e4c..0682350 100644
--- 
a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ 
b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -61,13 +61,13 @@
   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask  ## CONSUMES
 
 [Protocols]
-  gEfiDriverHealthProtocolGuid                    ## CONSUMES
-  gEfiDriverFamilyOverrideProtocolGuid            ## CONSUMES
-  gEfiHiiConfigAccessProtocolGuid                 ## CONSUMES
+  gEfiDriverHealthProtocolGuid                    ## UNDEFINED
+  gEfiDriverFamilyOverrideProtocolGuid            ## UNDEFINED
+  gEfiHiiConfigAccessProtocolGuid                 ## SOMETIMES_CONSUMES
   gEfiHiiDatabaseProtocolGuid                     ## CONSUMES
 
 [Guids]
-  gEfiGlobalVariableGuid                          ## CONSUMES ## GUID
+  gEfiGlobalVariableGuid                          ## SOMETIMES_CONSUMES ## GUID
   gEfiConsoleInDeviceGuid                         ## CONSUMES ## GUID
   gEfiConsoleOutDeviceGuid                        ## CONSUMES ## GUID
   gShellDriver1HiiGuid                            ## PRODUCES ## HII
diff --git 
a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf 
b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 76540fb..16faad2 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -72,13 +72,13 @@
   gEfiShellParametersProtocolGuid                         ## CONSUMES
   gEfiDevicePathProtocolGuid                              ## CONSUMES
   gEfiLoadedImageProtocolGuid                             ## CONSUMES
-  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid                        ## SOMETIMES_CONSUMES
 
 [Pcd.common]
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize    ## CONSUMES
 
 [Guids]
-  gEfiFileSystemInfoGuid                                  ## CONSUMES ## GUID
+  gEfiFileSystemInfoGuid                                  ## 
SOMETIMES_CONSUMES ## GUID
   gEfiFileInfoGuid                                        ## UNDEFINED
   gShellLevel2HiiGuid                                     ## 
SOMETIMES_CONSUMES ## HII
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf 
b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index d44ce02..782649a 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -50,7 +50,7 @@
   SortLib
 
 [Protocols]
-  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
 
   # shell 2.0
   gEfiShellProtocolGuid                         ## SOMETIMES_CONSUMES
@@ -61,8 +61,8 @@
   gEfiShellInterfaceGuid                        ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID
-  gEfiShellEnvironment2ExtGuid                  ## CONSUMES ## GUID
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES ## GUID
+  gEfiShellEnvironment2ExtGuid                  ## SOMETIMES_CONSUMES ## GUID
 
 [Pcd.common]
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     ## CONSUMES
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to