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

diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index 6edd36676be8d60f0a6bb8b14900c844600b0829..027c0caad50e1bd9d53c0fb2f7e22d701105e90d 100644 (file)
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -32,8 +32,6 @@
 //\r
 // The extern global protocol poionters.\r
 //\r
-extern        EFI_SHELL_PROTOCOL                *gEfiShellProtocol;\r
-extern        EFI_SHELL_PARAMETERS_PROTOCOL     *gEfiShellParametersProtocol;\r
 extern        EFI_UNICODE_COLLATION_PROTOCOL    *gUnicodeCollation;\r
 extern        EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *gDevPathToText;\r
 extern        CONST CHAR16*                     SupportLevel[];\r

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index 12cae5afebf5b77c32db8492d64259089aeb493d..905a9d39efb4881bb7d5f3aa5c096bb9df25b43e 100644 (file)
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -27,8 +27,8 @@
 // (20 * (6+5+2))+1) unicode characters from EFI FAT spec (doubled for bytes)\r
 #define MAX_FILE_NAME_LEN 512\r
 \r
-extern EFI_SHELL_PARAMETERS_PROTOCOL *mEfiShellParametersProtocol;\r
-extern EFI_SHELL_PROTOCOL            *mEfiShellProtocol;\r
+extern EFI_SHELL_PARAMETERS_PROTOCOL *gEfiShellParametersProtocol;\r
+extern EFI_SHELL_PROTOCOL            *gEfiShellProtocol;\r
 \r
 /**\r
   This function will retrieve the information about the file for the handle\r

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index b91ba27af04d9375356bb7c6f9a392ea49490113..82a9e78ed58024bf00bfe4e03ab003af5ad24b09 100644 (file)
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -34,8 +34,6 @@ STATIC UINTN                              mBlkMaxCount = 0;
 STATIC BUFFER_LIST                        mFileHandleList;\r
 \r
 // global variables required by library class.\r
-EFI_SHELL_PROTOCOL                *gEfiShellProtocol            = NULL;\r
-EFI_SHELL_PARAMETERS_PROTOCOL     *gEfiShellParametersProtocol  = NULL;\r
 EFI_UNICODE_COLLATION_PROTOCOL    *gUnicodeCollation            = NULL;\r
 EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *gDevPathToText               = NULL;\r
 SHELL_MAP_LIST                    gShellMapList;\r
@@ -59,24 +57,6 @@ CommandInit(
   )\r
 {\r
   EFI_STATUS Status;\r
-  if (gEfiShellParametersProtocol == NULL) {\r
-    Status = gBS->OpenProtocol(gImageHandle,\r
-                               &gEfiShellParametersProtocolGuid,\r
-                               (VOID **)&gEfiShellParametersProtocol,\r
-                               gImageHandle,\r
-                               NULL,\r
-                               EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                              );\r
-    if (EFI_ERROR(Status)) {\r
-      return (EFI_DEVICE_ERROR);\r
-    }\r
-  }\r
-  if (gEfiShellProtocol == NULL) {\r
-    Status = gBS->LocateProtocol(&gEfiShellProtocolGuid, NULL, (VOID**)&gEfiShellProtocol);\r
-    if (EFI_ERROR(Status)) {\r
-      return (EFI_DEVICE_ERROR);\r
-    }\r
-  }\r
   if (gUnicodeCollation == NULL) {\r
     Status = gBS->LocateProtocol(&gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID**)&gUnicodeCollation);\r
     if (EFI_ERROR(Status)) {\r
@@ -207,8 +187,6 @@ ShellCommandLibDestructor (
     FreePool(mProfileList);\r
   }\r
 \r
-  gEfiShellProtocol            = NULL;\r
-  gEfiShellParametersProtocol  = NULL;\r
   gUnicodeCollation            = NULL;\r
   gDevPathToText               = NULL;\r
   gShellCurDir                 = NULL;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index c2b14d7ee757295c9a09ccb19585856fa33bef90..24926a8e9a9578f5357870fc8f482891daf9f651 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -287,7 +287,7 @@ BcfgAddDebug1(
         //\r
         // get the device path\r
         //\r
-        DevicePath = mEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
+        DevicePath = gEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
         if (DevicePath == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_DP), gShellDebug1HiiHandle, Arg->FullName);\r
           ShellStatus = SHELL_UNSUPPORTED;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
index 580f4adc292b9e8a9ea90f9beea4d2c28df5c967..1c86f1df217b230c666cf8f07e280ea87e1f7c93 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
@@ -179,16 +179,16 @@ ShellCommandRunDblk (
         //\r
         // do the work if we have a valid block identifier\r
         //\r
-        if (mEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r
+        if (gEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, BlockName);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
-          DevPath = (EFI_DEVICE_PATH_PROTOCOL*)mEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
+          DevPath = (EFI_DEVICE_PATH_PROTOCOL*)gEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
           if (gBS->LocateDevicePath(&gEfiBlockIoProtocolGuid, &DevPath, NULL) == EFI_NOT_FOUND) {\r
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MAP_PROTOCOL), gShellDebug1HiiHandle, BlockName, L"BlockIo");\r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
-            ShellStatus = DisplayTheBlocks(mEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r
+            ShellStatus = DisplayTheBlocks(gEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r
           }\r
         }\r
       }\r

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
index f7126e32b7736557d023f7a1c8e7023155c09386..78a4bd23d354efca3dc48b51c4976deb51b303ea 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
@@ -287,7 +287,7 @@ BcfgAddInstall1(
         //\r
         // get the device path\r
         //\r
-        DevicePath = mEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
+        DevicePath = gEfiShellProtocol->GetDevicePathFromFilePath(Arg->FullName);\r
         if (DevicePath == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_FILE_DP), gShellInstall1HiiHandle, Arg->FullName);\r
           ShellStatus = SHELL_UNSUPPORTED;\r

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index ecc3f83c63d27572302f00c76f4c70d6b9491848..fa86d72ce4b056cad775bf4edf5828f75ee3642c 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -30,8 +30,8 @@ SHELL_PARAM_ITEM SfoParamList[] = {
   };\r
 EFI_SHELL_ENVIRONMENT2        *mEfiShellEnvironment2;\r
 EFI_SHELL_INTERFACE           *mEfiShellInterface;\r
-EFI_SHELL_PROTOCOL            *mEfiShellProtocol;\r
-EFI_SHELL_PARAMETERS_PROTOCOL *mEfiShellParametersProtocol;\r
+EFI_SHELL_PROTOCOL            *gEfiShellProtocol;\r
+EFI_SHELL_PARAMETERS_PROTOCOL *gEfiShellParametersProtocol;\r
 EFI_HANDLE                    mEfiShellEnvironment2Handle;\r
 FILE_HANDLE_FUNCTION_MAP      FileFunctionMap;\r
 \r
@@ -182,7 +182,7 @@ ShellLibConstructorWorker (
   Status = gBS->OpenProtocol(\r
     ImageHandle,\r
     &gEfiShellProtocolGuid,\r
-    (VOID **)&mEfiShellProtocol,\r
+    (VOID **)&gEfiShellProtocol,\r
     ImageHandle,\r
     NULL,\r
     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -194,25 +194,25 @@ ShellLibConstructorWorker (
     Status = gBS->LocateProtocol(\r
       &gEfiShellProtocolGuid,\r
       NULL,\r
-      (VOID **)&mEfiShellProtocol\r
+      (VOID **)&gEfiShellProtocol\r
      );\r
     if (EFI_ERROR(Status)) {\r
-      mEfiShellProtocol = NULL;\r
+      gEfiShellProtocol = NULL;\r
     }\r
   }\r
   Status = gBS->OpenProtocol(\r
     ImageHandle,\r
     &gEfiShellParametersProtocolGuid,\r
-    (VOID **)&mEfiShellParametersProtocol,\r
+    (VOID **)&gEfiShellParametersProtocol,\r
     ImageHandle,\r
     NULL,\r
     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
    );\r
   if (EFI_ERROR(Status)) {\r
-    mEfiShellParametersProtocol = NULL;\r
+    gEfiShellParametersProtocol = NULL;\r
   }\r
 \r
-  if (mEfiShellParametersProtocol == NULL || mEfiShellProtocol == NULL) {\r
+  if (gEfiShellParametersProtocol == NULL || gEfiShellProtocol == NULL) {\r
     //\r
     // Moved to seperate function due to complexity\r
     //\r
@@ -238,18 +238,18 @@ ShellLibConstructorWorker (
   // only success getting 2 of either the old or new, but no 1/2 and 1/2\r
   //\r
   if ((mEfiShellEnvironment2 != NULL && mEfiShellInterface          != NULL) ||\r
-      (mEfiShellProtocol     != NULL && mEfiShellParametersProtocol != NULL)   ) {\r
-    if (mEfiShellProtocol != NULL) {\r
-      FileFunctionMap.GetFileInfo     = mEfiShellProtocol->GetFileInfo;\r
-      FileFunctionMap.SetFileInfo     = mEfiShellProtocol->SetFileInfo;\r
-      FileFunctionMap.ReadFile        = mEfiShellProtocol->ReadFile;\r
-      FileFunctionMap.WriteFile       = mEfiShellProtocol->WriteFile;\r
-      FileFunctionMap.CloseFile       = mEfiShellProtocol->CloseFile;\r
-      FileFunctionMap.DeleteFile      = mEfiShellProtocol->DeleteFile;\r
-      FileFunctionMap.GetFilePosition = mEfiShellProtocol->GetFilePosition;\r
-      FileFunctionMap.SetFilePosition = mEfiShellProtocol->SetFilePosition;\r
-      FileFunctionMap.FlushFile       = mEfiShellProtocol->FlushFile;\r
-      FileFunctionMap.GetFileSize     = mEfiShellProtocol->GetFileSize;\r
+      (gEfiShellProtocol     != NULL && gEfiShellParametersProtocol != NULL)   ) {\r
+    if (gEfiShellProtocol != NULL) {\r
+      FileFunctionMap.GetFileInfo     = gEfiShellProtocol->GetFileInfo;\r
+      FileFunctionMap.SetFileInfo     = gEfiShellProtocol->SetFileInfo;\r
+      FileFunctionMap.ReadFile        = gEfiShellProtocol->ReadFile;\r
+      FileFunctionMap.WriteFile       = gEfiShellProtocol->WriteFile;\r
+      FileFunctionMap.CloseFile       = gEfiShellProtocol->CloseFile;\r
+      FileFunctionMap.DeleteFile      = gEfiShellProtocol->DeleteFile;\r
+      FileFunctionMap.GetFilePosition = gEfiShellProtocol->GetFilePosition;\r
+      FileFunctionMap.SetFilePosition = gEfiShellProtocol->SetFilePosition;\r
+      FileFunctionMap.FlushFile       = gEfiShellProtocol->FlushFile;\r
+      FileFunctionMap.GetFileSize     = gEfiShellProtocol->GetFileSize;\r
     } else {\r
       FileFunctionMap.GetFileInfo     = (EFI_SHELL_GET_FILE_INFO)FileHandleGetInfo;\r
       FileFunctionMap.SetFileInfo     = (EFI_SHELL_SET_FILE_INFO)FileHandleSetInfo;\r
@@ -285,8 +285,8 @@ ShellLibConstructor (
   )\r
 {\r
   mEfiShellEnvironment2       = NULL;\r
-  mEfiShellProtocol           = NULL;\r
-  mEfiShellParametersProtocol = NULL;\r
+  gEfiShellProtocol           = NULL;\r
+  gEfiShellParametersProtocol = NULL;\r
   mEfiShellInterface          = NULL;\r
   mEfiShellEnvironment2Handle = NULL;\r
 \r
@@ -330,19 +330,19 @@ ShellLibDestructor (
                        NULL);\r
     mEfiShellInterface = NULL;\r
   }\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellProtocolGuid,\r
                        ImageHandle,\r
                        NULL);\r
-    mEfiShellProtocol = NULL;\r
+    gEfiShellProtocol = NULL;\r
   }\r
-  if (mEfiShellParametersProtocol != NULL) {\r
+  if (gEfiShellParametersProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellParametersProtocolGuid,\r
                        ImageHandle,\r
                        NULL);\r
-    mEfiShellParametersProtocol = NULL;\r
+    gEfiShellParametersProtocol = NULL;\r
   }\r
   mEfiShellEnvironment2Handle = NULL;\r
 \r
@@ -490,11 +490,11 @@ ShellOpenFileByDevicePath(
   //\r
   // which shell interface should we use\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     //\r
     // use UEFI Shell 2.0 method.\r
     //\r
-    FileName = mEfiShellProtocol->GetFilePathFromDevicePath(*FilePath);\r
+    FileName = gEfiShellProtocol->GetFilePathFromDevicePath(*FilePath);\r
     if (FileName == NULL) {\r
       return (EFI_INVALID_PARAMETER);\r
     }\r
@@ -646,14 +646,14 @@ ShellOpenFileByName(
     return (EFI_INVALID_PARAMETER);\r
   }\r
 \r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     if ((OpenMode & EFI_FILE_MODE_CREATE) == EFI_FILE_MODE_CREATE && (Attributes & EFI_FILE_DIRECTORY) == EFI_FILE_DIRECTORY) {\r
       return ShellCreateDirectory(FileName, FileHandle);\r
     }\r
     //\r
     // Use UEFI Shell 2.0 method\r
     //\r
-    Status = mEfiShellProtocol->OpenFileByName(FileName,\r
+    Status = gEfiShellProtocol->OpenFileByName(FileName,\r
                                                FileHandle,\r
                                                OpenMode);\r
     if (StrCmp(FileName, L"NUL") != 0 && !EFI_ERROR(Status) && ((OpenMode & EFI_FILE_MODE_CREATE) != 0)){\r
@@ -716,11 +716,11 @@ ShellCreateDirectory(
   OUT SHELL_FILE_HANDLE                  *FileHandle\r
   )\r
 {\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     //\r
     // Use UEFI Shell 2.0 method\r
     //\r
-    return (mEfiShellProtocol->CreateFile(DirectoryName,\r
+    return (gEfiShellProtocol->CreateFile(DirectoryName,\r
                           EFI_FILE_DIRECTORY,\r
                           FileHandle\r
                          ));\r
@@ -1031,12 +1031,12 @@ ShellGetExecutionBreakFlag(
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
 \r
     //\r
     // We are using UEFI Shell 2.0; see if the event has been triggered\r
     //\r
-    if (gBS->CheckEvent(mEfiShellProtocol->ExecutionBreak) != EFI_SUCCESS) {\r
+    if (gBS->CheckEvent(gEfiShellProtocol->ExecutionBreak) != EFI_SUCCESS) {\r
       return (FALSE);\r
     }\r
     return (TRUE);\r
@@ -1071,8 +1071,8 @@ ShellGetEnvironmentVariable (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
-    return (mEfiShellProtocol->GetEnv(EnvKey));\r
+  if (gEfiShellProtocol != NULL) {\r
+    return (gEfiShellProtocol->GetEnv(EnvKey));\r
   }\r
 \r
   //\r
@@ -1115,8 +1115,8 @@ ShellSetEnvironmentVariable (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
-    return (mEfiShellProtocol->SetEnv(EnvKey, EnvVal, Volatile));\r
+  if (gEfiShellProtocol != NULL) {\r
+    return (gEfiShellProtocol->SetEnv(EnvKey, EnvVal, Volatile));\r
   }\r
 \r
   //\r
@@ -1168,11 +1168,11 @@ ShellExecute (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     //\r
     // Call UEFI Shell 2.0 version (not using Output parameter)\r
     //\r
-    return (mEfiShellProtocol->Execute(ParentHandle,\r
+    return (gEfiShellProtocol->Execute(ParentHandle,\r
                                       CommandLine,\r
                                       EnvironmentVariables,\r
                                       Status));\r
@@ -1214,8 +1214,8 @@ ShellGetCurrentDir (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
-    return (mEfiShellProtocol->GetCurDir(DeviceName));\r
+  if (gEfiShellProtocol != NULL) {\r
+    return (gEfiShellProtocol->GetCurDir(DeviceName));\r
   }\r
 \r
   //\r
@@ -1248,11 +1248,11 @@ ShellSetPageBreakMode (
     //\r
     // check for UEFI Shell 2.0\r
     //\r
-    if (mEfiShellProtocol != NULL) {\r
+    if (gEfiShellProtocol != NULL) {\r
       //\r
       // Enable with UEFI 2.0 Shell\r
       //\r
-      mEfiShellProtocol->EnablePageBreak();\r
+      gEfiShellProtocol->EnablePageBreak();\r
       return;\r
     } else {\r
       //\r
@@ -1270,11 +1270,11 @@ ShellSetPageBreakMode (
     //\r
     // check for UEFI Shell 2.0\r
     //\r
-    if (mEfiShellProtocol != NULL) {\r
+    if (gEfiShellProtocol != NULL) {\r
       //\r
       // Disable with UEFI 2.0 Shell\r
       //\r
-      mEfiShellProtocol->DisablePageBreak();\r
+      gEfiShellProtocol->DisablePageBreak();\r
       return;\r
     } else {\r
       //\r
@@ -1445,7 +1445,7 @@ ShellOpenFileMetaArg (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
+  if (gEfiShellProtocol != NULL) {\r
     if (*ListHead == NULL) {\r
       *ListHead = (EFI_SHELL_FILE_INFO*)AllocateZeroPool(sizeof(EFI_SHELL_FILE_INFO));\r
       if (*ListHead == NULL) {\r
@@ -1453,13 +1453,13 @@ ShellOpenFileMetaArg (
       }\r
       InitializeListHead(&((*ListHead)->Link));\r
     }\r
-    Status = mEfiShellProtocol->OpenFileList(Arg,\r
+    Status = gEfiShellProtocol->OpenFileList(Arg,\r
                                            OpenMode,\r
                                            ListHead);\r
     if (EFI_ERROR(Status)) {\r
-      mEfiShellProtocol->RemoveDupInFileList(ListHead);\r
+      gEfiShellProtocol->RemoveDupInFileList(ListHead);\r
     } else {\r
-      Status = mEfiShellProtocol->RemoveDupInFileList(ListHead);\r
+      Status = gEfiShellProtocol->RemoveDupInFileList(ListHead);\r
     }\r
     if (*ListHead != NULL && IsListEmpty(&(*ListHead)->Link)) {\r
       FreePool(*ListHead);\r
@@ -1540,8 +1540,8 @@ ShellCloseFileMetaArg (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellProtocol != NULL) {\r
-    return (mEfiShellProtocol->FreeFileList(ListHead));\r
+  if (gEfiShellProtocol != NULL) {\r
+    return (gEfiShellProtocol->FreeFileList(ListHead));\r
   } else if (mEfiShellEnvironment2 != NULL) {\r
     //\r
     // Since this is EFI Shell version we need to free our internally made copy\r
@@ -2099,13 +2099,13 @@ ShellCommandLineParseEx (
   //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
-  if (mEfiShellParametersProtocol != NULL) {\r
+  if (gEfiShellParametersProtocol != NULL) {\r
     return (InternalCommandLineParse(CheckList,\r
                                      CheckPackage,\r
                                      ProblemParam,\r
                                      AutoPageBreak,\r
-                                     (CONST CHAR16**) mEfiShellParametersProtocol->Argv,\r
-                                     mEfiShellParametersProtocol->Argc,\r
+                                     (CONST CHAR16**) gEfiShellParametersProtocol->Argv,\r
+                                     gEfiShellParametersProtocol->Argc,\r
                                      AlwaysAllowNumbers));\r
   }\r
 \r
@@ -2557,8 +2557,8 @@ InternalPrintTo (
   if (Size == 0) {\r
     return (EFI_SUCCESS);\r
   }\r
-  if (mEfiShellParametersProtocol != NULL) {\r
-    return (mEfiShellProtocol->WriteFile(mEfiShellParametersProtocol->StdOut, &Size, (VOID*)String));\r
+  if (gEfiShellParametersProtocol != NULL) {\r
+    return (gEfiShellProtocol->WriteFile(gEfiShellParametersProtocol->StdOut, &Size, (VOID*)String));\r
   }\r
   if (mEfiShellInterface          != NULL) {\r
     //\r
@@ -2859,13 +2859,13 @@ ShellIsDirectory(
     //\r
     // try good logic first.\r
     //\r
-    if (mEfiShellProtocol != NULL) {\r
+    if (gEfiShellProtocol != NULL) {\r
       TempLocation  = StrnCatGrow(&TempLocation, NULL, DirName, 0);\r
       TempLocation2 = StrStr(TempLocation, L":");\r
       if (TempLocation2 != NULL && StrLen(StrStr(TempLocation, L":")) == 2) {\r
         *(TempLocation2+1) = CHAR_NULL;\r
       }\r
-      if (mEfiShellProtocol->GetDevicePathFromMap(TempLocation) != NULL) {\r
+      if (gEfiShellProtocol->GetDevicePathFromMap(TempLocation) != NULL) {\r
         FreePool(TempLocation);\r
         return (EFI_SUCCESS);\r
       }\r