MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option

[mirror_edk2.git] / ShellPkg / Application / Shell / Shell.h

diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index 29b36b003a52ff1281c80ee1e8b25c574f689143..25ac114da71d3f398d5e4b6feb3438eb00cfab93 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.h
+++ b/ShellPkg/Application/Shell/Shell.h
@@ -17,17 +17,16 @@
 #define _SHELL_INTERNAL_HEADER_\r
 \r
 #include <Uefi.h>\r
-#include <ShellBase.h>\r
 \r
 #include <Guid/ShellVariableGuid.h>\r
 #include <Guid/ShellAliasGuid.h>\r
 \r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/SimpleTextOut.h>\r
-#include <Protocol/EfiShell.h>\r
+#include <Protocol/Shell.h>\r
 #include <Protocol/EfiShellInterface.h>\r
 #include <Protocol/EfiShellEnvironment2.h>\r
-#include <Protocol/EfiShellParameters.h>\r
+#include <Protocol/ShellParameters.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/HiiPackageList.h>\r
 \r
@@ -151,7 +150,6 @@ extern SHELL_INFO ShellInfoObject;
   @return                       some other error occurred\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLineToFinal(\r
   IN OUT CHAR16 **CmdLine\r
   );\r
@@ -162,7 +160,6 @@ ProcessCommandLineToFinal(
   @param[in] ErrorCode      the error code to put into lasterror\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetLastError(\r
   IN CONST SHELL_STATUS   ErrorCode\r
   );\r
@@ -173,7 +170,6 @@ SetLastError(
   @retval EFI_SUCCESS           all init commands were run successfully.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 SetBuiltInAlias(\r
   VOID\r
   );\r
@@ -193,7 +189,6 @@ SetBuiltInAlias(
   @sa HandleProtocol\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetDevicePathsForImageAndFile (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **DevPath,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath\r
@@ -227,7 +222,6 @@ GetDevicePathsForImageAndFile (
   @retval EFI_SUCCESS           the variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ProcessCommandLine(\r
   VOID\r
   );\r
@@ -243,7 +237,6 @@ ProcessCommandLine(
   @retval EFI_SUCCESS           The variable is initialized.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoStartupScript(\r
   IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,\r
   IN EFI_DEVICE_PATH_PROTOCOL *FilePath\r
@@ -258,7 +251,6 @@ DoStartupScript(
   @retval RETURN_ABORTED\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 DoShellPrompt (\r
   VOID\r
   );\r
@@ -270,7 +262,6 @@ DoShellPrompt (
   @param Buffer   Something to pass to FreePool when the shell is exiting.\r
 **/\r
 VOID*\r
-EFIAPI\r
 AddBufferToFreeList(\r
   VOID *Buffer\r
   );\r
@@ -281,7 +272,6 @@ AddBufferToFreeList(
   @param Buffer[in]     The line buffer to add.\r
 **/\r
 VOID\r
-EFIAPI\r
 AddLineToCommandHistory(\r
   IN CONST CHAR16 *Buffer\r
   );\r
@@ -297,7 +287,6 @@ AddLineToCommandHistory(
   @retval EFI_ABORTED     the command's operation was aborted\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunCommand(\r
   IN CONST CHAR16   *CmdLine\r
   );\r
@@ -315,7 +304,6 @@ RunCommand(
   @retval EFI_ABORTED     The command's operation was aborted.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunShellCommand(\r
   IN CONST CHAR16   *CmdLine,\r
   OUT EFI_STATUS    *CommandStatus\r
@@ -331,7 +319,6 @@ RunShellCommand(
   @retval FALSE             CommandName could not be a valid command name\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidCommandName(\r
   IN CONST CHAR16     *CommandName\r
   );\r
@@ -345,7 +332,6 @@ IsValidCommandName(
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFileHandle (\r
   IN SHELL_FILE_HANDLE  Handle,\r
   IN CONST CHAR16       *Name\r
@@ -362,7 +348,6 @@ RunScriptFileHandle (
   @retval EFI_SUCCESS           the script completed successfully\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 RunScriptFile (\r
   IN CONST CHAR16                   *ScriptPath,\r
   IN SHELL_FILE_HANDLE              Handle OPTIONAL,\r
@@ -381,7 +366,6 @@ RunScriptFile (
   @retval CHAR_NULL no instance of any character in CharacterList was found in String\r
 **/\r
 CONST CHAR16*\r
-EFIAPI\r
 FindFirstCharacter(\r
   IN CONST CHAR16 *String,\r
   IN CONST CHAR16 *CharacterList,\r
@@ -394,7 +378,6 @@ FindFirstCharacter(
   @param[in] String pointer to the string to trim them off.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 TrimSpaces(\r
   IN CHAR16 **String\r
   );\r