Roll back check in r15180 which caused the shell always returns EFI_ABORTED no matter...

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

diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index f78e55966586e4eda1db48f5ec0cd4758fd95a3c..c20ee3a803bf3c871aceee4132caaab8da202b6d 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.h
+++ b/ShellPkg/Application/Shell/Shell.h
@@ -1,6 +1,7 @@
 /** @file\r
   function definitions for internal to shell functions.\r
 \r
+  (C) Copyright 2014, Hewlett-Packard Development Company, L.P.\r
   Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -96,7 +97,7 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_SHELL_PARAMETERS_PROTOCOL *NewShellParametersProtocol;\r
-  EFI_SHELL_PROTOCOL21          *NewEfiShellProtocol;\r
+  EFI_SHELL_PROTOCOL            *NewEfiShellProtocol;\r
   BOOLEAN                       PageBreakEnabled;\r
   BOOLEAN                       RootShellInstance;\r
   SHELL_INIT_SETTINGS           ShellInitSettings;\r
@@ -230,17 +231,14 @@ ProcessCommandLine(
 \r
   @param[in] ImagePath          The path to the image for shell.  The first place to look for the startup script.\r
   @param[in] FilePath           The path to the file for shell.  The second place to look for the startup script.\r
-  @param[out] ExitStatus        The exit code of the script. Ignored if NULL.\r
-                                Invalid when this function returns an error.\r
 \r
   @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
-  OUT SHELL_STATUS             *ExitStatus\r
+  IN EFI_DEVICE_PATH_PROTOCOL *ImagePath,\r
+  IN EFI_DEVICE_PATH_PROTOCOL *FilePath\r
   );\r
 \r
 /**\r
@@ -285,8 +283,7 @@ AddLineToCommandHistory(
 \r
   This will determine if the command line represents an internal shell command or dispatch an external application.\r
 \r
-  @param[in]  CmdLine     the command line to parse\r
-  @param[out] ExitStatus  The exit status of the command. Ignored if NULL.\r
+  @param[in] CmdLine  the command line to parse\r
 \r
   @retval EFI_SUCCESS     the command was completed\r
   @retval EFI_ABORTED     the command's operation was aborted\r
@@ -294,8 +291,7 @@ AddLineToCommandHistory(
 EFI_STATUS\r
 EFIAPI\r
 RunCommand(\r
-  IN  CONST CHAR16         *CmdLine,\r
-  OUT       SHELL_STATUS   *ExitStatus\r
+  IN CONST CHAR16   *CmdLine\r
   );\r
 \r
 /**\r
@@ -319,17 +315,13 @@ IsValidCommandName(
   @param[in] Handle             The handle to the already opened file.\r
   @param[in] Name               The name of the script file.\r
 \r
-  @param[out] ExitStatus      The exit code of the script. Ignored if NULL.\r
-                              Invalid when this function returns an error.\r
-\r
   @retval EFI_SUCCESS           the script completed sucessfully\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 RunScriptFileHandle (\r
-  IN  SHELL_FILE_HANDLE  Handle,\r
-  IN  CONST CHAR16       *Name,\r
-  OUT SHELL_STATUS       *ExitStatus\r
+  IN SHELL_FILE_HANDLE  Handle,\r
+  IN CONST CHAR16       *Name\r
   );\r
 \r
 /**\r
@@ -340,20 +332,17 @@ RunScriptFileHandle (
   @param[in] CmdLine            the command line to run.\r
   @param[in] ParamProtocol      the shell parameters protocol pointer\r
 \r
-  @param[out] ExitStatus      The exit code of the script. Ignored if NULL.\r
-                              Invalid when this function returns an error.\r
-\r
   @retval EFI_SUCCESS           the script completed sucessfully\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 RunScriptFile (\r
-  IN  CONST CHAR16                   *ScriptPath,\r
-  IN  SHELL_FILE_HANDLE              Handle OPTIONAL,\r
-  IN  CONST CHAR16                   *CmdLine,\r
-  IN  EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol,\r
-  OUT SHELL_STATUS                   *ExitStatus\r
+  IN CONST CHAR16                   *ScriptPath,\r
+  IN SHELL_FILE_HANDLE              Handle OPTIONAL,\r
+  IN CONST CHAR16                   *CmdLine,\r
+  IN EFI_SHELL_PARAMETERS_PROTOCOL  *ParamProtocol\r
   );\r
 \r
+\r
 #endif //_SHELL_INTERNAL_HEADER_\r
 \r