Clarify that the shared variables of the shell protocols are properly named.

This removes the non-shared gEfiShellProtocol and gEfiShellParametersProtocol and renames the shared version to those names.

This removes the m-versions of those protocol pointers.

signed-off-by: jcarsey
reviewed-by: darylm503

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11900 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 0 insertions, 22 deletions

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index b91ba27..82a9e78 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -34,8 +34,6 @@ STATIC UINTN                              mBlkMaxCount = 0;
 STATIC BUFFER_LIST                        mFileHandleList;

 

 // global variables required by library class.

-EFI_SHELL_PROTOCOL                *gEfiShellProtocol            = NULL;

-EFI_SHELL_PARAMETERS_PROTOCOL     *gEfiShellParametersProtocol  = NULL;

 EFI_UNICODE_COLLATION_PROTOCOL    *gUnicodeCollation            = NULL;

 EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *gDevPathToText               = NULL;

 SHELL_MAP_LIST                    gShellMapList;

@@ -59,24 +57,6 @@ CommandInit(
   )

 {

   EFI_STATUS Status;

-  if (gEfiShellParametersProtocol == NULL) {

-    Status = gBS->OpenProtocol(gImageHandle,

-                               &gEfiShellParametersProtocolGuid,

-                               (VOID **)&gEfiShellParametersProtocol,

-                               gImageHandle,

-                               NULL,

-                               EFI_OPEN_PROTOCOL_GET_PROTOCOL

-                              );

-    if (EFI_ERROR(Status)) {

-      return (EFI_DEVICE_ERROR);

-    }

-  }

-  if (gEfiShellProtocol == NULL) {

-    Status = gBS->LocateProtocol(&gEfiShellProtocolGuid, NULL, (VOID**)&gEfiShellProtocol);

-    if (EFI_ERROR(Status)) {

-      return (EFI_DEVICE_ERROR);

-    }

-  }

   if (gUnicodeCollation == NULL) {

     Status = gBS->LocateProtocol(&gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID**)&gUnicodeCollation);

     if (EFI_ERROR(Status)) {

@@ -207,8 +187,6 @@ ShellCommandLibDestructor (
     FreePool(mProfileList);

   }

 

-  gEfiShellProtocol            = NULL;

-  gEfiShellParametersProtocol  = NULL;

   gUnicodeCollation            = NULL;

   gDevPathToText               = NULL;

   gShellCurDir                 = NULL;