ShellPkg: stop using EFI_HANDLE in place of EFI_HII_HANDLE

[mirror_edk2.git] / ShellPkg / Include / Library / ShellCommandLib.h

diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index 5c5e241f1525e03b0a8713cd0dc5a9a83508b15c..63fcac82a2de2a387acdeee92db5188ccff6d056 100644 (file)
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -2,18 +2,12 @@
   Provides interface to shell internal functions for shell commands.\r
 \r
   This library is for use ONLY by shell commands linked into the shell application.\r
-  This library will not funciton if it is used for UEFI Shell 2.0 Applications.\r
+  This library will not function if it is used for UEFI Shell 2.0 Applications.\r
 \r
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -21,10 +15,9 @@
 #define _SHELL_COMMAND_LIB_\r
 \r
 #include <Uefi.h>\r
-#include <ShellBase.h>\r
 \r
-#include <Protocol/EfiShell.h>\r
-#include <Protocol/EfiShellParameters.h>\r
+#include <Protocol/Shell.h>\r
+#include <Protocol/ShellParameters.h>\r
 #include <Protocol/UnicodeCollation.h>\r
 #include <Protocol/SimpleFileSystem.h>\r
 \r
@@ -49,7 +42,7 @@ typedef struct {
 /// List of Mappings - DeviceName and Drive Letter(ism).\r
 extern        SHELL_MAP_LIST                      gShellMapList;\r
 /// Pointer to node of current directory in the mMapList.\r
-extern        SHELL_MAP_LIST                      *gShellCurDir;\r
+extern        SHELL_MAP_LIST                      *gShellCurMapping;\r
 \r
 /**\r
   Returns the help MAN fileName for a given shell command.\r
@@ -143,7 +136,7 @@ ShellCommandRegisterCommandName (
   IN        UINT32                      ShellMinSupportLevel,\r
   IN CONST  CHAR16                      *ProfileName,\r
   IN CONST  BOOLEAN                     CanAffectLE,\r
-  IN CONST  EFI_HANDLE                  HiiHandle,\r
+  IN CONST  EFI_HII_HANDLE              HiiHandle,\r
   IN CONST  EFI_STRING_ID               ManFormatHelp\r
   );\r
 \r
@@ -508,10 +501,10 @@ ShellCommandConsistMappingUnInitialize (
   );\r
 \r
 /**\r
-  Create a consistent mapped name for the device specified by DevicePath \r
+  Create a consistent mapped name for the device specified by DevicePath\r
   based on the Table.\r
 \r
-  This must be called after ShellCommandConsistMappingInitialize() and \r
+  This must be called after ShellCommandConsistMappingInitialize() and\r
   before ShellCommandConsistMappingUnInitialize() is called.\r
 \r
   @param[in] DevicePath   The pointer to the dev path for the device.\r
@@ -695,6 +688,7 @@ FreeBufferList (
   @param[in] UserData     Pointer to some data.\r
 **/\r
 VOID\r
+EFIAPI\r
 DumpHex (\r
   IN UINTN        Indent,\r
   IN UINTN        Offset,\r
@@ -712,6 +706,7 @@ DumpHex (
   @param[in] UserData   The data to print out.\r
 **/\r
 CHAR16*\r
+EFIAPI\r
 CatSDumpHex (\r
   IN CHAR16  *Buffer,\r
   IN UINTN   Indent,\r
@@ -719,49 +714,4 @@ CatSDumpHex (
   IN UINTN   DataSize,\r
   IN VOID    *UserData\r
   );\r
-\r
-/**\r
-  Return the pointer to the first occurrence of any character from a list of characters.\r
-\r
-  @param[in] String                 The string to parse\r
-  @param[in] CharacterList          The list of character to look for\r
-  @param[in] IgnoreEscapedCharacter TRUE to ignore escaped characters\r
-\r
-  @return The location of the first character in the String.\r
-  @return Pointer to the ending NULL character of the String.\r
-**/\r
-CONST CHAR16*\r
-EFIAPI\r
-ShellFindFirstCharacter (\r
-  IN CONST CHAR16  *String,\r
-  IN CONST CHAR16  *CharacterList,\r
-  IN CONST BOOLEAN IgnoreEscapedCharacter\r
-  );\r
-\r
-/**\r
-  return the next parameter from a command line string;\r
-\r
-  This function moves the next parameter from Walker into NextParameter and moves\r
-  Walker up past that parameter for recursive calling.  When the final parameter\r
-  is moved *Walker will be set to NULL;\r
-\r
-  @param[in, out] Walker          pointer to string of command line.  Adjusted to\r
-                                  reminaing command line on return\r
-  @param[in, out] NextParameter   string of command line item extracted.\r
-  @param[in]      Length          Length of TempParameter in bytes\r
-  @param[in]      StripQuotation  if TRUE then strip the quotation marks surrounding\r
-                                  the parameters.\r
-\r
-  @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.\r
-  @return   EFI_NOT_FOUND         A closing " could not be found on the specified string\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ShellGetNextParameter(\r
-  IN OUT CHAR16   **Walker,\r
-  IN OUT CHAR16   *NextParameter,\r
-  IN CONST UINTN  Length,\r
-  IN BOOLEAN      StripQuotation\r
-  );\r
-\r
 #endif //_SHELL_COMMAND_LIB_\r