ShellPkg: Use the new library for "bcfg" command

[mirror_edk2.git] / ShellPkg / Library / UefiShellInstall1CommandsLib / UefiShellInstall1CommandsLib.c

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
index b7f0878b739c570183dbe1cf5fb44e4481e4a431..e26a86283e86fc266ff691ef5d7f44507dfb3b59 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
@@ -12,24 +12,7 @@
 \r
 **/\r
 \r
-#include "UefiShellInstall1CommandsLib.h"\r
-\r
-STATIC CONST CHAR16 mFileName[] = L"ShellCommands";\r
-EFI_HANDLE gShellInstall1HiiHandle = NULL;\r
-\r
-/**\r
-  Function to get the filename with help context if HII will not be used.\r
-\r
-  @return   The filename with help text in it.\r
-**/\r
-CONST CHAR16*\r
-EFIAPI\r
-ShellCommandGetManFileNameInstall1 (\r
-  VOID\r
-  )\r
-{\r
-  return (mFileName);\r
-}\r
+#include <Library/BcfgCommandLib.h>\r
 \r
 /**\r
   Constructor for the Shell Level 1 Commands library.\r
@@ -56,17 +39,7 @@ ShellInstall1CommandsLibConstructor (
     return (EFI_SUCCESS);\r
   }\r
 \r
-  gShellInstall1HiiHandle = HiiAddPackages (&gShellInstall1HiiGuid, gImageHandle, UefiShellInstall1CommandsLibStrings, NULL);\r
-  if (gShellInstall1HiiHandle == NULL) {\r
-    return (EFI_DEVICE_ERROR);\r
-  }\r
-\r
-  //\r
-  // install our shell command handlers that are always installed\r
-  //\r
-  ShellCommandRegisterCommandName(L"bcfg", ShellCommandRunBcfgInstall , ShellCommandGetManFileNameInstall1, 0, L"Install", FALSE, gShellInstall1HiiHandle, STRING_TOKEN(STR_GET_HELP_BCFG));\r
-\r
-  return (EFI_SUCCESS);\r
+  return (BcfgLibraryRegisterBcfgCommand(ImageHandle, SystemTable, L"Install1"));\r
 }\r
 \r
 /**\r
@@ -82,8 +55,5 @@ ShellInstall1CommandsLibDestructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  if (gShellInstall1HiiHandle != NULL) {\r
-    HiiRemovePackages(gShellInstall1HiiHandle);\r
-  }\r
-  return (EFI_SUCCESS);\r
+  return (BcfgLibraryUnregisterBcfgCommand(ImageHandle, SystemTable));\r
 }\r