fixed license header / copyright date on all files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9810 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c
index f7bc8ccc859e07f1fd05d1ee9488578fbf3fd101..0a057742d9ba34292f8aabe736d7a6d0c0833ef3 100644 (file)
--- a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This is a test application that demonstrates how to use the C-style entry point \r
+  This is a test application that demonstrates how to use the C-style entry point\r

   for a shell application.\r
 \r
   for a shell application.\r
 \r

-  Copyright (c) 2009, Intel Corporation                                                         \r
-  All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -32,10 +32,10 @@
   @retval  Other           An error occurred.\r
 \r
 **/\r
   @retval  Other           An error occurred.\r
 \r
 **/\r

-INTN \r
-EFIAPI \r
+INTN\r
+EFIAPI\r

 ShellAppMain (\r
 ShellAppMain (\r

-  IN UINTN Argc, \r
+  IN UINTN Argc,\r

   IN CHAR16 **Argv\r
   )\r
 {\r
   IN CHAR16 **Argv\r
   )\r
 {\r

diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
index 9175a376c7b4afa9561f3623efa5b4bd4e210982..5907a516e9a481377fbbdbe538bb05ab130f24a3 100644 (file)
--- a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 #  This is the shell application\r
 #\r
 #/** @file\r
 #  This is the shell application\r
 #\r

-#  Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -33,11 +33,11 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   ShellCEntryLib\r
   UefiLib\r
 [LibraryClasses]\r
   ShellCEntryLib\r
   UefiLib\r

-  \r
+\r

 [Guids]\r
 \r
 [Protocols]\r
 [Guids]\r
 \r
 [Protocols]\r

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.c b/ShellPkg/Application/ShellExecTestApp/SA.c
index 43fec9a20492a2bc8f4000830ff5a0ede277f5f0..d210a014de542dfabbb87324c3270eb8be6946a6 100644 (file)
--- a/ShellPkg/Application/ShellExecTestApp/SA.c
+++ b/ShellPkg/Application/ShellExecTestApp/SA.c
@@ -1,14 +1,14 @@
 /** @file\r
   This is a simple shell application\r
 \r
 /** @file\r
   This is a simple shell application\r
 \r

-  Copyright (c) 2008, Intel Corporation                                                         \r
-  All rights reserved. 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
+  Copyright (c) 2008-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -19,9 +19,9 @@
 /**\r
   as the real entry point for the application.\r
 \r
 /**\r
   as the real entry point for the application.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r


@@ -33,6 +33,6 @@ UefiMain (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r

-  Print(L"ShellExecute - Pass"); \r
+  Print(L"ShellExecute - Pass");\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index b2d19a2826488913f9d9c1ba27bad83d8cebbd4c..5a676b0e3a786217ff4166213cf4676cba945223 100644 (file)
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -3,9 +3,9 @@
 #\r
 #  This is a simple shell application\r
 #\r
 #\r
 #  This is a simple shell application\r
 #\r

-#  Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009-2010, Intel Corporation.  All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -34,11 +34,11 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   UefiApplicationEntryPoint\r
   UefiLib\r
 [LibraryClasses]\r
   UefiApplicationEntryPoint\r
   UefiLib\r

-  \r
+\r

 [Guids]\r
 \r
 [Ppis]\r
 [Guids]\r
 \r
 [Ppis]\r

diff --git a/ShellPkg/Application/ShellLibTestApp/SA3.inf b/ShellPkg/Application/ShellLibTestApp/SA3.inf
index 6ed4b00b7416f2f959ca3e3e37525bc079503a12..46cef22e523bf553735f31bbf864aa1a22b9623b 100644 (file)
--- a/ShellPkg/Application/ShellLibTestApp/SA3.inf
+++ b/ShellPkg/Application/ShellLibTestApp/SA3.inf
@@ -3,9 +3,9 @@
 #\r
 #  This is a simple shell application\r
 #\r
 #\r
 #  This is a simple shell application\r
 #\r

-#  Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -35,14 +35,14 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   UefiApplicationEntryPoint\r
   UefiLib\r
   ShellLib\r
   MemoryAllocationLib\r
   DebugLib\r
 [LibraryClasses]\r
   UefiApplicationEntryPoint\r
   UefiLib\r
   ShellLib\r
   MemoryAllocationLib\r
   DebugLib\r

-  \r
+\r

 [Guids]\r
 \r
 [Ppis]\r
 [Guids]\r
 \r
 [Ppis]\r

diff --git a/ShellPkg/Application/ShellLibTestApp/sa3.c b/ShellPkg/Application/ShellLibTestApp/sa3.c
index bc7986a97ae85a3a8e32ab3bfaed6ed7d656abb8..9c235732a18cdc5a8fcc25eb6fcd2983853b195e 100644 (file)
--- a/ShellPkg/Application/ShellLibTestApp/sa3.c
+++ b/ShellPkg/Application/ShellLibTestApp/sa3.c
@@ -3,14 +3,14 @@
 \r
   This should be executed with "/Param2 Val1" and "/Param1" as the 2 command line options!\r
 \r
 \r
   This should be executed with "/Param2 Val1" and "/Param1" as the 2 command line options!\r
 \r

-  Copyright (c) 2008-2009, Intel Corporation                                                         \r
-  All rights reserved. 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
+  Copyright (c) 2008-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -38,9 +38,9 @@ SHELL_PARAM_ITEM ParamList[] = {
 /**\r
   as the real entry point for the application.\r
 \r
 /**\r
   as the real entry point for the application.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r


@@ -64,7 +64,7 @@ UefiMain (
   EFI_SHELL_FILE_INFO *pShellFileInfo;\r
   LIST_ENTRY          *List;\r
   // CONST CHAR16              *Tester;\r
   EFI_SHELL_FILE_INFO *pShellFileInfo;\r
   LIST_ENTRY          *List;\r
   // CONST CHAR16              *Tester;\r

-  \r
+\r

   FileHandle = NULL;\r
   StrCpy(FileName, L"testfile.txt");\r
 //  Position = 0;\r
   FileHandle = NULL;\r
   StrCpy(FileName, L"testfile.txt");\r
 //  Position = 0;\r


@@ -100,9 +100,9 @@ UefiMain (
 \r
   ShellSetPageBreakMode(TRUE);\r
 \r
 \r
   ShellSetPageBreakMode(TRUE);\r
 \r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r


@@ -130,9 +130,9 @@ UefiMain (
   ASSERT_EFI_ERROR(Status);\r
   Print(L"read, write, create, getinfo - pass\r\n");\r
 \r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"read, write, create, getinfo - pass\r\n");\r
 \r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r


@@ -141,7 +141,7 @@ UefiMain (
   pFileInfo->FileSize = 0x20;\r
   Status = ShellSetFileInfo(FileHandle, pFileInfo);\r
   FreePool(pFileInfo);\r
   pFileInfo->FileSize = 0x20;\r
   Status = ShellSetFileInfo(FileHandle, pFileInfo);\r
   FreePool(pFileInfo);\r

-  pFileInfo = NULL; \r
+  pFileInfo = NULL;\r

   ASSERT_EFI_ERROR(Status);\r
   pFileInfo = ShellGetFileInfo(FileHandle);\r
   ASSERT(pFileInfo != NULL);\r
   ASSERT_EFI_ERROR(Status);\r
   pFileInfo = ShellGetFileInfo(FileHandle);\r
   ASSERT(pFileInfo != NULL);\r


@@ -156,10 +156,10 @@ UefiMain (
   Status = ShellCloseFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"setinfo and change size, getsize - pass\r\n");\r
   Status = ShellCloseFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"setinfo and change size, getsize - pass\r\n");\r

-  \r
-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+\r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r


@@ -171,14 +171,14 @@ UefiMain (
   ASSERT(pFileInfo->FileSize == 0x20);\r
   ASSERT((pFileInfo->Attribute&EFI_FILE_DIRECTORY)==0);\r
   FreePool(pFileInfo);\r
   ASSERT(pFileInfo->FileSize == 0x20);\r
   ASSERT((pFileInfo->Attribute&EFI_FILE_DIRECTORY)==0);\r
   FreePool(pFileInfo);\r

-  pFileInfo = NULL;   \r
+  pFileInfo = NULL;\r

   Status = ShellDeleteFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"reopen file - pass\r\n");\r
 \r
   Status = ShellDeleteFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"reopen file - pass\r\n");\r
 \r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r


@@ -193,9 +193,9 @@ UefiMain (
   ASSERT_EFI_ERROR(Status);\r
   Print(L"size of empty - pass\r\n");\r
 \r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"size of empty - pass\r\n");\r
 \r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT(Status == EFI_NOT_FOUND);\r
                                0\r
                                );\r
   ASSERT(Status == EFI_NOT_FOUND);\r


@@ -211,23 +211,23 @@ UefiMain (
   Status = ShellDeleteFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"Directory create - pass\r\n");\r
   Status = ShellDeleteFile(&FileHandle);\r
   ASSERT_EFI_ERROR(Status);\r
   Print(L"Directory create - pass\r\n");\r

-  \r
+\r

   // FindFirst and FindNext\r
   StrCpy(FileName, L"testDir");\r
   Status = ShellCreateDirectory(FileName, &FileHandle);\r
   Status = ShellCloseFile(&FileHandle);\r
   StrCat(FileName, L"\\File.txt");\r
   // FindFirst and FindNext\r
   StrCpy(FileName, L"testDir");\r
   Status = ShellCreateDirectory(FileName, &FileHandle);\r
   Status = ShellCloseFile(&FileHandle);\r
   StrCat(FileName, L"\\File.txt");\r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
   Status = ShellCloseFile(&FileHandle);\r
   StrCpy(FileName, L"testDir");\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
   Status = ShellCloseFile(&FileHandle);\r
   StrCpy(FileName, L"testDir");\r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r


@@ -264,18 +264,18 @@ UefiMain (
 \r
   // now delete that file and that directory\r
   StrCat(FileName, L"\\File.txt");\r
 \r
   // now delete that file and that directory\r
   StrCat(FileName, L"\\File.txt");\r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
   Status = ShellDeleteFile(&FileHandle);\r
   StrCpy(FileName, L"testDir");\r
   ASSERT_EFI_ERROR(Status);\r
                                0\r
                                );\r
   ASSERT_EFI_ERROR(Status);\r
   Status = ShellDeleteFile(&FileHandle);\r
   StrCpy(FileName, L"testDir");\r
   ASSERT_EFI_ERROR(Status);\r

-  Status = ShellOpenFileByName(FileName, \r
-                               &FileHandle, \r
-                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, \r
+  Status = ShellOpenFileByName(FileName,\r
+                               &FileHandle,\r
+                               EFI_FILE_MODE_CREATE|EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE,\r

                                0\r
                                );\r
   Status = ShellDeleteFile(&FileHandle);\r
                                0\r
                                );\r
   Status = ShellDeleteFile(&FileHandle);\r

diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
index e19967ef62559885f7c3acc2716e464d9ac04dee..c2b24d67ac2035f493623b381bb706e953eb544a 100644 (file)
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
@@ -1,14 +1,14 @@
 /** @file\r
   This is a test application that demonstrates how to use the sorting functions.\r
 \r
 /** @file\r
   This is a test application that demonstrates how to use the sorting functions.\r
 \r

-  Copyright (c) 2009, Intel Corporation                                                         \r
-  All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -43,10 +43,10 @@ INTN Test(CONST VOID*b1, CONST VOID*b2)
   @retval  Other           An error occurred.\r
 \r
 **/\r
   @retval  Other           An error occurred.\r
 \r
 **/\r

-INTN \r
-EFIAPI \r
+INTN\r
+EFIAPI\r

 ShellAppMain (\r
 ShellAppMain (\r

-  IN UINTN Argc, \r
+  IN UINTN Argc,\r

   IN CHAR16 **Argv\r
   )\r
 {\r
   IN CHAR16 **Argv\r
   )\r
 {\r

diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
index 87b87983b8dff4575fa72203ba2e398dc9b8d9b6..1fcc6c5471d653bf20573066bc37749c8ede3081 100644 (file)
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 #  This is the shell sorting testing application\r
 #\r
 #/** @file\r
 #  This is the shell sorting testing application\r
 #\r

-#  Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -33,12 +33,12 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ShellPkg/ShellPkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   ShellCEntryLib\r
   UefiLib\r
   SortLib\r
 [LibraryClasses]\r
   ShellCEntryLib\r
   UefiLib\r
   SortLib\r

-  \r
+\r

 [Guids]\r
 \r
 [Protocols]\r
 [Guids]\r
 \r
 [Protocols]\r

diff --git a/ShellPkg/Include/Guid/ShellEnvironment2Ext.h b/ShellPkg/Include/Guid/ShellEnvironment2Ext.h
index bfe9f165a578a261b3887fe701978bdf3dbd3c6e..e6faad58f803fcab8edf09e3bd1480a04ed22cc8 100644 (file)
--- a/ShellPkg/Include/Guid/ShellEnvironment2Ext.h
+++ b/ShellPkg/Include/Guid/ShellEnvironment2Ext.h
@@ -1,8 +1,8 @@
 /** @file\r
   GUID for EFI shell Environment2 Extension\r
 \r
 /** @file\r
   GUID for EFI shell Environment2 Extension\r
 \r

-  Copyright (c) 2009, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2009-2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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

diff --git a/ShellPkg/Include/Guid/ShellPkgTokenSpace.h b/ShellPkg/Include/Guid/ShellPkgTokenSpace.h
index 89c9cc29f587fd0a82f01fc41343706bc8046d3e..1fa26f3f36a840dadd9f758ce16b8b18b59a8272 100644 (file)
--- a/ShellPkg/Include/Guid/ShellPkgTokenSpace.h
+++ b/ShellPkg/Include/Guid/ShellPkgTokenSpace.h
@@ -1,8 +1,8 @@
 /** @file\r
   GUID for ShellPkg PCD Token Space.\r
 \r
 /** @file\r
   GUID for ShellPkg PCD Token Space.\r
 \r

-  Copyright (c) 2009, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2009-2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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

diff --git a/ShellPkg/Include/Library/FileHandleLib.h b/ShellPkg/Include/Library/FileHandleLib.h
index b265d85bb9bf790b06135753c8e08bb18c34466b..1a942a1ccfdbd26b3bdefbbf2d22d36ce4a25a80 100644 (file)
--- a/ShellPkg/Include/Library/FileHandleLib.h
+++ b/ShellPkg/Include/Library/FileHandleLib.h
@@ -1,8 +1,8 @@
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\r
 \r
 /** @file\r
   Provides interface to EFI_FILE_HANDLE functionality.\r
 \r

-  Copyright (c) 2009, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2009-2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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


@@ -22,13 +22,13 @@ enum {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  This function will retrieve the information about the file for the handle \r
+  This function will retrieve the information about the file for the handle\r

   specified and store it in allocated pool memory.\r
 \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file's information. It is the \r
+  This function allocates a buffer to store the file's information. It is the\r

   caller's responsibility to free the buffer.\r
 \r
   caller's responsibility to free the buffer.\r
 \r

-  @param  FileHandle  The file handle of the file for which information is \r
+  @param  FileHandle  The file handle of the file for which information is\r

                       being requested.\r
 \r
   @retval NULL        information could not be retrieved.\r
                       being requested.\r
 \r
   @retval NULL        information could not be retrieved.\r


@@ -42,15 +42,16 @@ FileHandleGetInfo (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function will set the information about the file for the opened handle \r
+  This function will set the information about the file for the opened handle\r

   specified.\r
 \r
   specified.\r
 \r

-  @param  FileHandle            The file handle of the file for which information \r
+  @param  FileHandle            The file handle of the file for which information\r

                                 is being set.\r
 \r
   @param  FileInfo              The information to set.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
                                 is being set.\r
 \r
   @param  FileInfo              The information to set.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r

+  @retval EFI_INVALID_PARAMETER A Parameter was out of range or invalid.\r

   @retval EFI_UNSUPPORTED       The FileHandle does not support FileInfo.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_UNSUPPORTED       The FileHandle does not support FileInfo.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r


@@ -69,21 +70,21 @@ FileHandleSetInfo (
 /**\r
   This function reads information from an opened file.\r
 \r
 /**\r
   This function reads information from an opened file.\r
 \r

-  If FileHandle is not a directory, the function reads the requested number of \r
-  bytes from the file at the file's current position and returns them in Buffer. \r
+  If FileHandle is not a directory, the function reads the requested number of\r
+  bytes from the file at the file's current position and returns them in Buffer.\r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file's current position is increased by the number of bytes \r
-  returned.  If FileHandle is a directory, the function reads the directory entry \r
-  at the file's current position and returns the entry in Buffer. If the Buffer \r
-  is not large enough to hold the current directory entry, then \r
-  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
-  BufferSize is set to be the size of the buffer needed to read the entry. On \r
-  success, the current position is updated to the next directory entry. If there \r
-  are no more directory entries, the read returns a zero-length buffer. \r
+  end of the file. The file's current position is increased by the number of bytes\r
+  returned.  If FileHandle is a directory, the function reads the directory entry\r
+  at the file's current position and returns the entry in Buffer. If the Buffer\r
+  is not large enough to hold the current directory entry, then\r
+  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated.\r
+  BufferSize is set to be the size of the buffer needed to read the entry. On\r
+  success, the current position is updated to the next directory entry. If there\r
+  are no more directory entries, the read returns a zero-length buffer.\r

   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param FileHandle             The opened file handle.\r
   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param FileHandle             The opened file handle.\r

-  @param BufferSize             On input the size of buffer in bytes.  On return \r
+  @param BufferSize             On input the size of buffer in bytes.  On return\r

                                 the number of bytes written.\r
   @param Buffer                 The buffer to put read data into.\r
 \r
                                 the number of bytes written.\r
   @param Buffer                 The buffer to put read data into.\r
 \r


@@ -91,7 +92,7 @@ FileHandleSetInfo (
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r

-  @retval EFI_BUFFER_TO_SMALL    Buffer is too small. ReadSize contains required \r
+  @retval EFI_BUFFER_TO_SMALL    Buffer is too small. ReadSize contains required\r

                                 size.\r
 \r
 **/\r
                                 size.\r
 \r
 **/\r


@@ -106,11 +107,11 @@ FileHandleRead(
 /**\r
   Write data to a file.\r
 \r
 /**\r
   Write data to a file.\r
 \r

-  This function writes the specified number of bytes to the file at the current \r
-  file position. The current file position is advanced the actual number of bytes \r
-  written, which is returned in BufferSize. Partial writes only occur when there \r
-  has been a data error during the write attempt (such as "volume space full"). \r
-  The file is automatically grown to hold the data if required. Direct writes to \r
+  This function writes the specified number of bytes to the file at the current\r
+  file position. The current file position is advanced the actual number of bytes\r
+  written, which is returned in BufferSize. Partial writes only occur when there\r
+  has been a data error during the write attempt (such as "volume space full").\r
+  The file is automatically grown to hold the data if required. Direct writes to\r

   opened directories are not supported.\r
 \r
   @param FileHandle             The opened file for writing\r
   opened directories are not supported.\r
 \r
   @param FileHandle             The opened file for writing\r


@@ -135,11 +136,11 @@ FileHandleWrite(
   IN VOID                       *Buffer\r
   );\r
 \r
   IN VOID                       *Buffer\r
   );\r
 \r

-/** \r
+/**\r

   Close an open file handle.\r
 \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All "dirty" cached file data is \r
-  flushed to the device, and the file is closed. In all cases the handle is \r
+  This function closes a specified file handle. All "dirty" cached file data is\r
+  flushed to the device, and the file is closed. In all cases the handle is\r

   closed.\r
 \r
   @param FileHandle               The file handle to close.\r
   closed.\r
 \r
   @param FileHandle               The file handle to close.\r


@@ -156,13 +157,13 @@ FileHandleClose (
   Delete a file and close the handle.\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r
   Delete a file and close the handle.\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r

-  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is \r
+  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is\r

   returned, but the handle is still closed.\r
 \r
   @param FileHandle             The file handle to delete.\r
 \r
   @retval EFI_SUCCESS               The file was closed sucessfully.\r
   returned, but the handle is still closed.\r
 \r
   @param FileHandle             The file handle to delete.\r
 \r
   @retval EFI_SUCCESS               The file was closed sucessfully.\r

-  @retval EFI_WARN_DELETE_FAILURE   the handle was closed, but the file was not \r
+  @retval EFI_WARN_DELETE_FAILURE   the handle was closed, but the file was not\r

                                     deleted\r
   @retval INVALID_PARAMETER                One of the parameters has an invalid value.\r
 **/\r
                                     deleted\r
   @retval INVALID_PARAMETER                One of the parameters has an invalid value.\r
 **/\r


@@ -175,19 +176,19 @@ FileHandleDelete (
 /**\r
   Set the current position in a file.\r
 \r
 /**\r
   Set the current position in a file.\r
 \r

-  This function sets the current file position for the handle to the position \r
+  This function sets the current file position for the handle to the position\r

   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r
   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r

-  absolute positioning is supported, and seeking past the end of the file is \r
-  allowed (a subsequent write would grow the file). Seeking to position \r
+  absolute positioning is supported, and seeking past the end of the file is\r
+  allowed (a subsequent write would grow the file). Seeking to position\r

   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r
   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r

-  If FileHandle is a directory, the only position that may be set is zero. This \r
+  If FileHandle is a directory, the only position that may be set is zero. This\r

   has the effect of starting the read process of the directory entries over.\r
 \r
   @param FileHandle             The file handle on which the position is being set\r
   @param Position               Byte position from begining of file\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r
   has the effect of starting the read process of the directory entries over.\r
 \r
   @param FileHandle             The file handle on which the position is being set\r
   @param Position               Byte position from begining of file\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r

-  @retval EFI_UNSUPPORTED       the seek request for non-zero is not valid on \r
+  @retval EFI_UNSUPPORTED       the seek request for non-zero is not valid on\r

                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r
                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r


@@ -198,11 +199,11 @@ FileHandleSetPosition (
   IN UINT64            Position\r
   );\r
 \r
   IN UINT64            Position\r
   );\r
 \r

-/** \r
+/**\r

   Gets a file's current position.\r
 \r
   Gets a file's current position.\r
 \r

-  This function retrieves the current file position for the file handle. For \r
-  directories, the current file position has no meaning outside of the file \r
+  This function retrieves the current file position for the file handle. For\r
+  directories, the current file position has no meaning outside of the file\r

   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r
   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r


@@ -221,7 +222,7 @@ FileHandleGetPosition (
   );\r
 /**\r
   Flushes data on a file.\r
   );\r
 /**\r
   Flushes data on a file.\r

-  \r
+\r

   This function flushes all modified data associated with a file to a device.\r
 \r
   @param FileHandle             The file handle on which to flush data.\r
   This function flushes all modified data associated with a file to a device.\r
 \r
   @param FileHandle             The file handle on which to flush data.\r


@@ -262,8 +263,8 @@ FileHandleIsDirectory (
 /**\r
   Retrieves the first file from a directory.\r
 \r
 /**\r
   Retrieves the first file from a directory.\r
 \r

-  This function opens a directory and gets the first file's info in the \r
-  directory. Caller can use FileHandleFindNextFile() to get other files.  When \r
+  This function opens a directory and gets the first file's info in the\r
+  directory. Caller can use FileHandleFindNextFile() to get other files.  When\r

   complete the caller is responsible for calling FreePool() on *Buffer.\r
 \r
   @param DirHandle              The file handle of the directory to search\r
   complete the caller is responsible for calling FreePool() on *Buffer.\r
 \r
   @param DirHandle              The file handle of the directory to search\r


@@ -286,12 +287,12 @@ FileHandleFindFirstFile (
 /**\r
   Retrieves the next file in a directory.\r
 \r
 /**\r
   Retrieves the next file in a directory.\r
 \r

-  To use this function, caller must call the FileHandleFindFirstFile() to get the \r
-  first file, and then use this function get other files. This function can be \r
-  called for several times to get each file's information in the directory. If \r
-  the call of FileHandleFindNextFile() got the last file in the directory, the next \r
-  call of this function has no file to get. *NoFile will be set to TRUE and the \r
-  Buffer memory will be automatically freed. \r
+  To use this function, caller must call the FileHandleFindFirstFile() to get the\r
+  first file, and then use this function get other files. This function can be\r
+  called for several times to get each file's information in the directory. If\r
+  the call of FileHandleFindNextFile() got the last file in the directory, the next\r
+  call of this function has no file to get. *NoFile will be set to TRUE and the\r
+  Buffer memory will be automatically freed.\r

 \r
   @param DirHandle              the file handle of the directory\r
   @param Buffer                                    pointer to buffer for file's information\r
 \r
   @param DirHandle              the file handle of the directory\r
   @param Buffer                                    pointer to buffer for file's information\r


@@ -316,7 +317,7 @@ FileHandleFindNextFile(
   If FileHandle is NULL then ASSERT()\r
   If Size is NULL then ASSERT()\r
 \r
   If FileHandle is NULL then ASSERT()\r
   If Size is NULL then ASSERT()\r
 \r

-  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO\r

   data.\r
 \r
   @param FileHandle             The file handle from which size is retrieved.\r
   data.\r
 \r
   @param FileHandle             The file handle from which size is retrieved.\r


@@ -333,11 +334,11 @@ FileHandleGetSize (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the \r
+  Function to get a full filename given a EFI_FILE_HANDLE somewhere lower on the\r

   directory 'stack'.\r
 \r
   @param[in] Handle             Handle to the Directory or File to create path to.\r
   directory 'stack'.\r
 \r
   @param[in] Handle             Handle to the Directory or File to create path to.\r

-  @param[out] FullFileName      Pointer to pointer to generated full file name.  It \r
+  @param[out] FullFileName      Pointer to pointer to generated full file name.  It\r

                                 is the responsibility of the caller to free this memory\r
                                 with a call to FreePool().\r
   @retval EFI_SUCCESS           the operation was sucessful and the FullFileName is valid.\r
                                 is the responsibility of the caller to free this memory\r
                                 with a call to FreePool().\r
   @retval EFI_SUCCESS           the operation was sucessful and the FullFileName is valid.\r


@@ -355,23 +356,23 @@ FileHandleGetFileName (
 /**\r
   Function to read a single line (up to but not including the \n) from a file.\r
 \r
 /**\r
   Function to read a single line (up to but not including the \n) from a file.\r
 \r

-  If the position upon start is 0, then the Ascii Boolean will be set.  This should be \r
+  If the position upon start is 0, then the Ascii Boolean will be set.  This should be\r

   maintained and not changed for all operations with the same file.\r
 \r
   @param[in]      Handle        FileHandle to read from\r
   @param[in,out]  Buffer        pointer to buffer to read into\r
   @param[in,out]  Size          pointer to number of bytes in buffer\r
   @param[in]      Truncate      if TRUE then allows for truncation of the line to fit.\r
   maintained and not changed for all operations with the same file.\r
 \r
   @param[in]      Handle        FileHandle to read from\r
   @param[in,out]  Buffer        pointer to buffer to read into\r
   @param[in,out]  Size          pointer to number of bytes in buffer\r
   @param[in]      Truncate      if TRUE then allows for truncation of the line to fit.\r

-                                if FALSE will reset the position to the begining of the \r
+                                if FALSE will reset the position to the begining of the\r

                                 line if the buffer is not large enough.\r
                                 line if the buffer is not large enough.\r

-  @param[in,out]  Ascii         Boolean value for indicating whether the file is \r
+  @param[in,out]  Ascii         Boolean value for indicating whether the file is\r

                                 Ascii (TRUE) or UCS2 (FALSE);\r
 \r
                                 Ascii (TRUE) or UCS2 (FALSE);\r
 \r

-  @retval EFI_SUCCESS           the operation was sucessful.  the line is stored in \r
+  @retval EFI_SUCCESS           the operation was sucessful.  the line is stored in\r

                                 Buffer.\r
   @retval EFI_INVALID_PARAMETER Handle was NULL.\r
   @retval EFI_INVALID_PARAMETER Size was NULL.\r
                                 Buffer.\r
   @retval EFI_INVALID_PARAMETER Handle was NULL.\r
   @retval EFI_INVALID_PARAMETER Size was NULL.\r

-  @retval EFI_BUFFER_TOO_SMALL  Size was not enough space to store the line.  \r
+  @retval EFI_BUFFER_TOO_SMALL  Size was not enough space to store the line.\r

                                 Size was updated to minimum space required.\r
   @sa FileHandleRead\r
 **/\r
                                 Size was updated to minimum space required.\r
   @sa FileHandleRead\r
 **/\r


@@ -386,10 +387,10 @@ FileHandleReadLine(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Function to read a single line from a file. The \n is not included in the returned \r
+  Function to read a single line from a file. The \n is not included in the returned\r

   buffer.  The returned buffer must be callee freed.\r
 \r
   buffer.  The returned buffer must be callee freed.\r
 \r

-  If the position upon start is 0, then the Ascii Boolean will be set.  This should be \r
+  If the position upon start is 0, then the Ascii Boolean will be set.  This should be\r

   maintained and not changed for all operations with the same file.\r
 \r
   @param[in]      Handle        FileHandle to read from.\r
   maintained and not changed for all operations with the same file.\r
 \r
   @param[in]      Handle        FileHandle to read from.\r


@@ -412,7 +413,7 @@ FileHandleReturnLine(
   If Handle is NULL, ASSERT.\r
 \r
   @param[in]     Handle         FileHandle to write to\r
   If Handle is NULL, ASSERT.\r
 \r
   @param[in]     Handle         FileHandle to write to\r

-  @param[in]     Buffer         Buffer to write, if NULL the function will \r
+  @param[in]     Buffer         Buffer to write, if NULL the function will\r

                                 take no action and return EFI_SUCCESS.\r
 \r
   @retval  EFI_SUCCESS          the data was written.\r
                                 take no action and return EFI_SUCCESS.\r
 \r
   @retval  EFI_SUCCESS          the data was written.\r

diff --git a/ShellPkg/Include/Library/ShellCEntryLib.h b/ShellPkg/Include/Library/ShellCEntryLib.h
index f2dc088e952fd23a566fb33a9d7d0912f03f1db2..1b7c4e099adfce0d91c237338fae878136cf8527 100644 (file)
--- a/ShellPkg/Include/Library/ShellCEntryLib.h
+++ b/ShellPkg/Include/Library/ShellCEntryLib.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  Provides application point extension for "C" style main funciton \r
+  Provides application point extension for "C" style main funciton\r

 \r
 \r

-Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2006-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -27,8 +27,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 INTN\r
 \r
 **/\r
 INTN\r

-EFIAPI \r
+EFIAPI\r

 ShellAppMain (\r
 ShellAppMain (\r

-  IN UINTN Argc, \r
+  IN UINTN Argc,\r

   IN CHAR16 **Argv\r
   );\r
   IN CHAR16 **Argv\r
   );\r

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index 3d2fbe27af8b0264c432564048140df6cbd7f881..b774d0463d58a4f0e5fdd298f973ae1b7a719983 100644 (file)
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -1,8 +1,8 @@
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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


@@ -25,13 +25,13 @@
 #include <Protocol/EfiShellParameters.h>\r
 \r
 /**\r
 #include <Protocol/EfiShellParameters.h>\r
 \r
 /**\r

-  This function will retrieve the information about the file for the handle \r
+  This function will retrieve the information about the file for the handle\r

   specified and store it in allocated pool memory.\r
 \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file's information. It is the \r
+  This function allocates a buffer to store the file's information. It is the\r

   caller's responsibility to free the buffer.\r
 \r
   caller's responsibility to free the buffer.\r
 \r

-  @param[in] FileHandle         The file handle of the file for which information is \r
+  @param[in] FileHandle         The file handle of the file for which information is\r

                                 being requested.\r
 \r
   @retval NULL                  Information could not be retrieved.\r
                                 being requested.\r
 \r
   @retval NULL                  Information could not be retrieved.\r


@@ -45,10 +45,10 @@ ShellGetFileInfo (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function will set the information about the file for the opened handle \r
+  This function will set the information about the file for the opened handle\r

   specified.\r
 \r
   specified.\r
 \r

-  @param[in]  FileHandle        The file handle of the file for which information \r
+  @param[in]  FileHandle        The file handle of the file for which information\r

                                 is being set.\r
 \r
   @param[in] FileInfo           The infotmation to set.\r
                                 is being set.\r
 \r
   @param[in] FileInfo           The infotmation to set.\r


@@ -72,10 +72,10 @@ ShellSetFileInfo (
 /**\r
   This function will open a file or directory referenced by DevicePath.\r
 \r
 /**\r
   This function will open a file or directory referenced by DevicePath.\r
 \r

-  This function opens a file with the open mode according to the file path. The \r
+  This function opens a file with the open mode according to the file path. The\r

   Attributes is valid only for EFI_FILE_MODE_CREATE.\r
 \r
   Attributes is valid only for EFI_FILE_MODE_CREATE.\r
 \r

-  @param[in]  FilePath                       On input the device path to the file.  On output \r
+  @param[in]  FilePath                       On input the device path to the file.  On output\r

                                 the remaining device path.\r
   @param[out]  DeviceHandle      Pointer to the system device handle.\r
   @param[out]  FileHandle                  Pointer to the file handle.\r
                                 the remaining device path.\r
   @param[out]  DeviceHandle      Pointer to the system device handle.\r
   @param[out]  FileHandle                  Pointer to the file handle.\r


@@ -84,18 +84,18 @@ ShellSetFileInfo (
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found on \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found on\r

                                 the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r


@@ -112,8 +112,8 @@ ShellOpenFileByDevicePath(
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened file's handle; \r
-  otherwise, the Filehandle is NULL. The Attributes is valid only for \r
+  If return is EFI_SUCCESS, the Filehandle is the opened file's handle;\r
+  otherwise, the Filehandle is NULL. The Attributes is valid only for\r

   EFI_FILE_MODE_CREATE.\r
 \r
   @param[in] FileName                Pointer to file name.\r
   EFI_FILE_MODE_CREATE.\r
 \r
   @param[in] FileName                Pointer to file name.\r


@@ -123,18 +123,18 @@ ShellOpenFileByDevicePath(
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found\r

                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r


@@ -150,8 +150,8 @@ ShellOpenFileByName(
 /**\r
   This function creates a directory.\r
 \r
 /**\r
   This function creates a directory.\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened directory's handle; \r
-  otherwise, the Filehandle is NULL. If the directory already existed, this \r
+  If return is EFI_SUCCESS, the Filehandle is the opened directory's handle;\r
+  otherwise, the Filehandle is NULL. If the directory already existed, this\r

   function opens the existing directory.\r
 \r
   @param[in]  DirectoryName     Pointer to Directory name.\r
   function opens the existing directory.\r
 \r
   @param[in]  DirectoryName     Pointer to Directory name.\r


@@ -159,18 +159,18 @@ ShellOpenFileByName(
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found\r

                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r


@@ -184,21 +184,21 @@ ShellCreateDirectory(
 /**\r
   This function reads information from an opened file.\r
 \r
 /**\r
   This function reads information from an opened file.\r
 \r

-  If FileHandle is not a directory, the function reads the requested number of \r
-  bytes from the file at the file's current position and returns them in Buffer. \r
+  If FileHandle is not a directory, the function reads the requested number of\r
+  bytes from the file at the file's current position and returns them in Buffer.\r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file's current position is increased by the number of bytes \r
-  returned.  If FileHandle is a directory, the function reads the directory entry \r
-  at the file's current position and returns the entry in Buffer. If the Buffer \r
-  is not large enough to hold the current directory entry, then \r
-  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
-  BufferSize is set to be the size of the buffer needed to read the entry. On \r
-  success, the current position is updated to the next directory entry. If there \r
-  are no more directory entries, the read returns a zero-length buffer. \r
+  end of the file. The file's current position is increased by the number of bytes\r
+  returned.  If FileHandle is a directory, the function reads the directory entry\r
+  at the file's current position and returns the entry in Buffer. If the Buffer\r
+  is not large enough to hold the current directory entry, then\r
+  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated.\r
+  BufferSize is set to be the size of the buffer needed to read the entry. On\r
+  success, the current position is updated to the next directory entry. If there\r
+  are no more directory entries, the read returns a zero-length buffer.\r

   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param[in] FileHandle         The opened file handle.\r
   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param[in] FileHandle         The opened file handle.\r

-  @param[in] ReadSize           On input the size of buffer in bytes.  On return \r
+  @param[in] ReadSize           On input the size of buffer in bytes.  On return\r

                                 the number of bytes written.\r
   @param[out] Buffer            The buffer to put read data into.\r
 \r
                                 the number of bytes written.\r
   @param[out] Buffer            The buffer to put read data into.\r
 \r


@@ -206,7 +206,7 @@ ShellCreateDirectory(
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r

-  @retval EFI_BUFFER_TO_SMALL    Buffer is too small. ReadSize contains required \r
+  @retval EFI_BUFFER_TO_SMALL    Buffer is too small. ReadSize contains required\r

                                 size.\r
 \r
 **/\r
                                 size.\r
 \r
 **/\r


@@ -221,11 +221,11 @@ ShellReadFile(
 /**\r
   Write data to a file.\r
 \r
 /**\r
   Write data to a file.\r
 \r

-  This function writes the specified number of bytes to the file at the current \r
-  file position. The current file position is advanced the actual number of bytes \r
-  written, which is returned in BufferSize. Partial writes only occur when there \r
-  has been a data error during the write attempt (such as "volume space full"). \r
-  The file is automatically grown to hold the data if required. Direct writes to \r
+  This function writes the specified number of bytes to the file at the current\r
+  file position. The current file position is advanced the actual number of bytes\r
+  written, which is returned in BufferSize. Partial writes only occur when there\r
+  has been a data error during the write attempt (such as "volume space full").\r
+  The file is automatically grown to hold the data if required. Direct writes to\r

   opened directories are not supported.\r
 \r
   @param[in] FileHandle         The opened file for writing.\r
   opened directories are not supported.\r
 \r
   @param[in] FileHandle         The opened file for writing.\r


@@ -252,11 +252,11 @@ ShellWriteFile(
   IN VOID                       *Buffer\r
   );\r
 \r
   IN VOID                       *Buffer\r
   );\r
 \r

-/** \r
+/**\r

   Close an open file handle.\r
 \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All "dirty" cached file data is \r
-  flushed to the device, and the file is closed. In all cases the handle is \r
+  This function closes a specified file handle. All "dirty" cached file data is\r
+  flushed to the device, and the file is closed. In all cases the handle is\r

   closed.\r
 \r
   @param[in] FileHandle           The file handle to close.\r
   closed.\r
 \r
   @param[in] FileHandle           The file handle to close.\r


@@ -274,13 +274,13 @@ ShellCloseFile (
   Delete a file and close the handle\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r
   Delete a file and close the handle\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r

-  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is \r
+  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is\r

   returned, but the handle is still closed.\r
 \r
   @param[in] FileHandle             The file handle to delete.\r
 \r
   @retval EFI_SUCCESS               The file was closed sucessfully.\r
   returned, but the handle is still closed.\r
 \r
   @param[in] FileHandle             The file handle to delete.\r
 \r
   @retval EFI_SUCCESS               The file was closed sucessfully.\r

-  @retval EFI_WARN_DELETE_FAILURE   The handle was closed, but the file was not \r
+  @retval EFI_WARN_DELETE_FAILURE   The handle was closed, but the file was not\r

                                     deleted.\r
   @retval INVALID_PARAMETER                One of the parameters has an invalid value.\r
 **/\r
                                     deleted.\r
   @retval INVALID_PARAMETER                One of the parameters has an invalid value.\r
 **/\r


@@ -293,12 +293,12 @@ ShellDeleteFile (
 /**\r
   Set the current position in a file.\r
 \r
 /**\r
   Set the current position in a file.\r
 \r

-  This function sets the current file position for the handle to the position \r
+  This function sets the current file position for the handle to the position\r

   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r
   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r

-  absolute positioning is supported, and seeking past the end of the file is \r
-  allowed (a subsequent write would grow the file). Seeking to position \r
+  absolute positioning is supported, and seeking past the end of the file is\r
+  allowed (a subsequent write would grow the file). Seeking to position\r

   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r
   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r

-  If FileHandle is a directory, the only position that may be set is zero. This \r
+  If FileHandle is a directory, the only position that may be set is zero. This\r

   has the effect of starting the read process of the directory entries over.\r
 \r
   @param[in] FileHandle         The file handle on which the position is being set.\r
   has the effect of starting the read process of the directory entries over.\r
 \r
   @param[in] FileHandle         The file handle on which the position is being set.\r


@@ -306,7 +306,7 @@ ShellDeleteFile (
   @param[in] Position           Byte position from begining of file.\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r
   @param[in] Position           Byte position from begining of file.\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r

-  @retval EFI_UNSUPPORTED       The seek request for non-zero is not valid on \r
+  @retval EFI_UNSUPPORTED       The seek request for non-zero is not valid on\r

                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r
                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r


@@ -317,11 +317,11 @@ ShellSetFilePosition (
   IN UINT64            Position\r
   );\r
 \r
   IN UINT64            Position\r
   );\r
 \r

-/** \r
+/**\r

   Gets a file's current position\r
 \r
   Gets a file's current position\r
 \r

-  This function retrieves the current file position for the file handle. For \r
-  directories, the current file position has no meaning outside of the file \r
+  This function retrieves the current file position for the file handle. For\r
+  directories, the current file position has no meaning outside of the file\r

   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r
   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r


@@ -341,7 +341,7 @@ ShellGetFilePosition (
 \r
 /**\r
   Flushes data on a file\r
 \r
 /**\r
   Flushes data on a file\r

-  \r
+\r

   This function flushes all modified data associated with a file to a device.\r
 \r
   @param[in] FileHandle         The file handle on which to flush data.\r
   This function flushes all modified data associated with a file to a device.\r
 \r
   @param[in] FileHandle         The file handle on which to flush data.\r


@@ -362,8 +362,8 @@ ShellFlushFile (
 /**\r
   Retrieves the first file from a directory\r
 \r
 /**\r
   Retrieves the first file from a directory\r
 \r

-  This function takes an open directory handle and gets the first file \r
-  in the directory's info. Caller can use ShellFindNextFile() to get \r
+  This function takes an open directory handle and gets the first file\r
+  in the directory's info. Caller can use ShellFindNextFile() to get\r

   subsequent files.\r
 \r
   Caller must use FreePool on *Buffer opon completion of all file searching.\r
   subsequent files.\r
 \r
   Caller must use FreePool on *Buffer opon completion of all file searching.\r


@@ -388,12 +388,12 @@ ShellFindFirstFile (
 /**\r
   Retrieves the next file in a directory.\r
 \r
 /**\r
   Retrieves the next file in a directory.\r
 \r

-  To use this function, caller must call the ShellFindFirstFile() to get the \r
-  first file, and then use this function get other files. This function can be \r
-  called for several times to get each file's information in the directory. If \r
-  the call of ShellFindNextFile() got the last file in the directory, the next \r
-  call of this function has no file to get. *NoFile will be set to TRUE and the \r
-  data in Buffer is meaningless. \r
+  To use this function, caller must call the ShellFindFirstFile() to get the\r
+  first file, and then use this function get other files. This function can be\r
+  called for several times to get each file's information in the directory. If\r
+  the call of ShellFindNextFile() got the last file in the directory, the next\r
+  call of this function has no file to get. *NoFile will be set to TRUE and the\r
+  data in Buffer is meaningless.\r

 \r
   @param[in] DirHandle          The file handle of the directory.\r
   @param[out] Buffer                         Pointer to buffer for file's information.\r
 \r
   @param[in] DirHandle          The file handle of the directory.\r
   @param[out] Buffer                         Pointer to buffer for file's information.\r


@@ -415,7 +415,7 @@ ShellFindNextFile(
 /**\r
   Retrieve the size of a file.\r
 \r
 /**\r
   Retrieve the size of a file.\r
 \r

-  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO\r

   data.\r
 \r
   @param[in] FileHandle         The file handle from which size is retrieved.\r
   data.\r
 \r
   @param[in] FileHandle         The file handle from which size is retrieved.\r


@@ -448,7 +448,7 @@ ShellGetExecutionBreakFlag(
 /**\r
   Return the value of an environment variable.\r
 \r
 /**\r
   Return the value of an environment variable.\r
 \r

-  This function gets the value of the environment variable set by the \r
+  This function gets the value of the environment variable set by the\r

   ShellSetEnvironmentVariable function.\r
 \r
   @param[in] EnvKey             The key name of the environment variable.\r
   ShellSetEnvironmentVariable function.\r
 \r
   @param[in] EnvKey             The key name of the environment variable.\r


@@ -506,7 +506,7 @@ ShellSetEnvironmentVariable (
   Output is only supported for pre-UEFI Shell 2.0\r
 \r
   @param[in] ImageHandle          Parent image that is starting the operation.\r
   Output is only supported for pre-UEFI Shell 2.0\r
 \r
   @param[in] ImageHandle          Parent image that is starting the operation.\r

-  @param[in] CommandLine          Pointer to null terminated command line.\r
+  @param[in] CommandLine          Pointer to NULL terminated command line.\r

   @param[in] Output               True to display debug output.  False to hide it.\r
   @param[in] EnvironmentVariables Optional pointer to array of environment variables\r
                                   in the form "x=y".  If NULL current set is used.\r
   @param[in] Output               True to display debug output.  False to hide it.\r
   @param[in] EnvironmentVariables Optional pointer to array of environment variables\r
                                   in the form "x=y".  If NULL current set is used.\r


@@ -531,8 +531,8 @@ ShellExecute (
 /**\r
   Retreives the current directory path.\r
 \r
 /**\r
   Retreives the current directory path.\r
 \r

-  If the DeviceName is NULL, it returns the current device's current directory \r
-  name. If the DeviceName is not NULL, it returns the current directory name \r
+  If the DeviceName is NULL, it returns the current device's current directory\r
+  name. If the DeviceName is not NULL, it returns the current directory name\r

   on specified drive.\r
 \r
   @param[in] DeviceName         The name of the file system to get directory on.\r
   on specified drive.\r
 \r
   @param[in] DeviceName         The name of the file system to get directory on.\r


@@ -549,12 +549,12 @@ ShellGetCurrentDir (
 /**\r
   Sets (enabled or disabled) the page break mode.\r
 \r
 /**\r
   Sets (enabled or disabled) the page break mode.\r
 \r

-  When page break mode is enabled the screen will stop scrolling \r
+  When page break mode is enabled the screen will stop scrolling\r

   and wait for operator input before scrolling a subsequent screen.\r
 \r
   @param[in] CurrentState       TRUE to enable and FALSE to disable.\r
 **/\r
   and wait for operator input before scrolling a subsequent screen.\r
 \r
   @param[in] CurrentState       TRUE to enable and FALSE to disable.\r
 **/\r

-VOID \r
+VOID\r

 EFIAPI\r
 ShellSetPageBreakMode (\r
   IN BOOLEAN                    CurrentState\r
 EFIAPI\r
 ShellSetPageBreakMode (\r
   IN BOOLEAN                    CurrentState\r


@@ -563,21 +563,21 @@ ShellSetPageBreakMode (
 /**\r
   Opens a group of files based on a path.\r
 \r
 /**\r
   Opens a group of files based on a path.\r
 \r

-  This function uses the Arg to open all the matching files. Each matched \r
-  file has a SHELL_FILE_ARG structure to record the file information. These \r
-  structures are placed on the list ListHead. Users can get the SHELL_FILE_ARG \r
+  This function uses the Arg to open all the matching files. Each matched\r
+  file has a SHELL_FILE_ARG structure to record the file information. These\r
+  structures are placed on the list ListHead. Users can get the SHELL_FILE_ARG\r

   structures from ListHead to access each file. This function supports wildcards\r
   structures from ListHead to access each file. This function supports wildcards\r

-  and will process '?' and '*' as such.  The list must be freed with a call to \r
+  and will process '?' and '*' as such.  The list must be freed with a call to\r

   ShellCloseFileMetaArg().\r
 \r
   ShellCloseFileMetaArg().\r
 \r

-  If you are NOT appending to an existing list *ListHead must be NULL.  If \r
+  If you are NOT appending to an existing list *ListHead must be NULL.  If\r

   *ListHead is NULL then it must be callee freed.\r
 \r
   @param[in] Arg                Pointer to path string.\r
   @param[in] OpenMode           Mode to open files with.\r
   @param[in] ListHead           Head of linked list of results.\r
 \r
   *ListHead is NULL then it must be callee freed.\r
 \r
   @param[in] Arg                Pointer to path string.\r
   @param[in] OpenMode           Mode to open files with.\r
   @param[in] ListHead           Head of linked list of results.\r
 \r

-  @retval EFI_SUCCESS           The operation was sucessful and the list head \r
+  @retval EFI_SUCCESS           The operation was sucessful and the list head\r

                                 contains the list of opened files.\r
   @retval != EFI_SUCCESS        The operation failed.\r
 \r
                                 contains the list of opened files.\r
   @retval != EFI_SUCCESS        The operation failed.\r
 \r


@@ -624,8 +624,8 @@ ShellFindFilePath (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Find a file by searching the CWD and then the path with a variable set of file \r
-  extensions.  If the file is not found it will append each extension in the list \r
+  Find a file by searching the CWD and then the path with a variable set of file\r
+  extensions.  If the file is not found it will append each extension in the list\r

   in the order provided and return the first one that is successful.\r
 \r
   If FileName is NULL, then ASSERT.\r
   in the order provided and return the first one that is successful.\r
 \r
   If FileName is NULL, then ASSERT.\r


@@ -666,14 +666,14 @@ typedef struct {
 extern SHELL_PARAM_ITEM EmptyParamList[];\r
 \r
 /**\r
 extern SHELL_PARAM_ITEM EmptyParamList[];\r
 \r
 /**\r

-  Checks the command line arguments passed against the list of valid ones.  \r
+  Checks the command line arguments passed against the list of valid ones.\r

   Optionally removes NULL values first.\r
   Optionally removes NULL values first.\r

-  \r
+\r

   If no initialization is required, then return RETURN_SUCCESS.\r
   If no initialization is required, then return RETURN_SUCCESS.\r

-  \r
+\r

   @param[in] CheckList          Pointer to list of parameters to check.\r
   @param[out] CheckPackage      Package of checked values.\r
   @param[in] CheckList          Pointer to list of parameters to check.\r
   @param[out] CheckPackage      Package of checked values.\r

-  @param[out] ProblemParam      Optional pointer to pointer to unicode string for \r
+  @param[out] ProblemParam      Optional pointer to pointer to unicode string for\r

                                 the paramater that caused failure.\r
   @param[in] AutoPageBreak      Will automatically set PageBreakEnabled.\r
   @param[in] AlwaysAllowNumbers Will never fail for number based flags.\r
                                 the paramater that caused failure.\r
   @param[in] AutoPageBreak      Will automatically set PageBreakEnabled.\r
   @param[in] AlwaysAllowNumbers Will never fail for number based flags.\r


@@ -681,13 +681,13 @@ extern SHELL_PARAM_ITEM EmptyParamList[];
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid.\r
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid.\r

-  @retval EFI_VOLUME_CORRUPTED  The command line was corrupt.  An argument was \r
-                                duplicated.  The duplicated command line argument \r
+  @retval EFI_VOLUME_CORRUPTED  The command line was corrupt.  An argument was\r
+                                duplicated.  The duplicated command line argument\r

                                 was returned in ProblemParam if provided.\r
   @retval EFI_DEVICE_ERROR      The commands contained 2 opposing arguments.  One\r
                                 was returned in ProblemParam if provided.\r
   @retval EFI_DEVICE_ERROR      The commands contained 2 opposing arguments.  One\r

-                                of the command line arguments was returned in \r
+                                of the command line arguments was returned in\r

                                 ProblemParam if provided.\r
                                 ProblemParam if provided.\r

-  @retval EFI_NOT_FOUND         A argument required a value that was missing.  \r
+  @retval EFI_NOT_FOUND         A argument required a value that was missing.\r

                                 The invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r
                                 The invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r


@@ -727,7 +727,7 @@ ShellCommandLineFreeVarList (
 \r
   If CheckPackage is NULL then return FALSE.\r
   If KeyString is NULL then ASSERT().\r
 \r
   If CheckPackage is NULL then return FALSE.\r
   If KeyString is NULL then ASSERT().\r

-  \r
+\r

   @param[in] CheckPackage       The package of parsed command line arguments.\r
   @param[in] KeyString          The Key of the command line argument to check for.\r
 \r
   @param[in] CheckPackage       The package of parsed command line arguments.\r
   @param[in] KeyString          The Key of the command line argument to check for.\r
 \r


@@ -745,7 +745,7 @@ ShellCommandLineGetFlag (
   Returns value from command line argument.\r
 \r
   Value parameters are in the form of "-<Key> value" or "/<Key> value".\r
   Returns value from command line argument.\r
 \r
   Value parameters are in the form of "-<Key> value" or "/<Key> value".\r

-  \r
+\r

   If CheckPackage is NULL, then return NULL.\r
 \r
   @param[in] CheckPackage       The package of parsed command line arguments.\r
   If CheckPackage is NULL, then return NULL.\r
 \r
   @param[in] CheckPackage       The package of parsed command line arguments.\r


@@ -765,7 +765,7 @@ ShellCommandLineGetValue (
   Returns raw value from command line argument.\r
 \r
   Raw value parameters are in the form of "value" in a specific position in the list.\r
   Returns raw value from command line argument.\r
 \r
   Raw value parameters are in the form of "value" in a specific position in the list.\r

-  \r
+\r

   If CheckPackage is NULL, then return NULL.\r
 \r
   @param[in] CheckPackage       The package of parsed command line arguments.\r
   If CheckPackage is NULL, then return NULL.\r
 \r
   @param[in] CheckPackage       The package of parsed command line arguments.\r


@@ -782,8 +782,8 @@ ShellCommandLineGetRawValue (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Returns the number of command line value parameters that were parsed.  \r
-  \r
+  Returns the number of command line value parameters that were parsed.\r
+\r

   This will not include flags.\r
 \r
   @retval (UINTN)-1     No parsing has ocurred.\r
   This will not include flags.\r
 \r
   @retval (UINTN)-1     No parsing has ocurred.\r


@@ -798,7 +798,7 @@ ShellCommandLineGetCount(
 /**\r
   Determins if a parameter is duplicated.\r
 \r
 /**\r
   Determins if a parameter is duplicated.\r
 \r

-  If Param is not NULL then it will point to a callee allocated string buffer \r
+  If Param is not NULL then it will point to a callee allocated string buffer\r

   with the parameter value if a duplicate is found.\r
 \r
   If CheckPackage is NULL, then ASSERT.\r
   with the parameter value if a duplicate is found.\r
 \r
   If CheckPackage is NULL, then ASSERT.\r


@@ -839,14 +839,14 @@ ShellInitialize (
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r

-  \r
-  If -1 is specified for either the Row or Col the current screen location for BOTH \r
+\r
+  If -1 is specified for either the Row or Col the current screen location for BOTH\r

   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r
   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r

-  In addition to the standard %-based flags as supported by UefiLib Print() this supports \r
+  In addition to the standard %-based flags as supported by UefiLib Print() this supports\r

   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r
   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r


@@ -876,14 +876,14 @@ ShellPrintEx(
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r

-  \r
-  If -1 is specified for either the Row or Col the current screen location for BOTH \r
+\r
+  If -1 is specified for either the Row or Col the current screen location for BOTH\r

   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r
   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r

-  In addition to the standard %-based flags as supported by UefiLib Print() this supports \r
+  In addition to the standard %-based flags as supported by UefiLib Print() this supports\r

   the following additional flags:\r
     %N       -   Set output attribute to normal.\r
     %H       -   Set output attribute to highlight.\r
   the following additional flags:\r
     %N       -   Set output attribute to normal.\r
     %H       -   Set output attribute to highlight.\r


@@ -895,6 +895,8 @@ ShellPrintEx(
 \r
   @param[in] Row                The row to print at.\r
   @param[in] Col                The column to print at.\r
 \r
   @param[in] Row                The row to print at.\r
   @param[in] Col                The column to print at.\r

+  @param[in] Language           The language of the string to retrieve.  If this parameter\r
+                                is NULL, then the current platform language is used.\r

   @param[in] HiiFormatStringId  The format string Id for getting from Hii.\r
   @param[in] HiiFormatHandle    The format string Handle for getting from Hii.\r
 \r
   @param[in] HiiFormatStringId  The format string Id for getting from Hii.\r
   @param[in] HiiFormatHandle    The format string Handle for getting from Hii.\r
 \r


@@ -905,6 +907,7 @@ EFIAPI
 ShellPrintHiiEx(\r
   IN INT32                Col OPTIONAL,\r
   IN INT32                Row OPTIONAL,\r
 ShellPrintHiiEx(\r
   IN INT32                Col OPTIONAL,\r
   IN INT32                Row OPTIONAL,\r

+  IN CONST CHAR8          *Language OPTIONAL,\r

   IN CONST EFI_STRING_ID  HiiFormatStringId,\r
   IN CONST EFI_HANDLE     HiiFormatHandle,\r
   ...\r
   IN CONST EFI_STRING_ID  HiiFormatStringId,\r
   IN CONST EFI_HANDLE     HiiFormatHandle,\r
   ...\r


@@ -966,7 +969,7 @@ ShellIsFileInPath(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Function to determine whether a string is decimal or hex representation of a number \r
+  Function to determine whether a string is decimal or hex representation of a number\r

   and return the number converted from the string.\r
 \r
   @param[in] String   String representation of a number\r
   and return the number converted from the string.\r
 \r
   @param[in] String   String representation of a number\r


@@ -980,38 +983,38 @@ ShellStrToUintn(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Safely append with automatic string resizing given length of Destination and \r
+  Safely append with automatic string resizing given length of Destination and\r

   desired length of copy from Source.\r
 \r
   desired length of copy from Source.\r
 \r

-  Append the first D characters of Source to the end of Destination, where D is \r
-  the lesser of Count and the StrLen() of Source. If appending those D characters \r
-  will fit within Destination (whose Size is given as CurrentSize) and \r
-  still leave room for a null terminator, then those characters are appended, \r
-  starting at the original terminating null of Destination, and a new terminating \r
-  null is appended.\r
+  Append the first D characters of Source to the end of Destination, where D is\r
+  the lesser of Count and the StrLen() of Source. If appending those D characters\r
+  will fit within Destination (whose Size is given as CurrentSize) and\r
+  still leave room for a NULL terminator, then those characters are appended,\r
+  starting at the original terminating NULL of Destination, and a new terminating\r
+  NULL is appended.\r

 \r
   If appending D characters onto Destination will result in a overflow of the size\r
   given in CurrentSize the string will be grown such that the copy can be performed\r
   and CurrentSize will be updated to the new size.\r
 \r
 \r
   If appending D characters onto Destination will result in a overflow of the size\r
   given in CurrentSize the string will be grown such that the copy can be performed\r
   and CurrentSize will be updated to the new size.\r
 \r

-  If Source is NULL, there is nothing to append, just return the current buffer in \r
+  If Source is NULL, there is nothing to append, just return the current buffer in\r

   Destination.\r
 \r
   If Destination is NULL, then ASSERT().\r
   Destination.\r
 \r
   If Destination is NULL, then ASSERT().\r

-  If Destination's current length (including NULL terminator) is already more than \r
+  If Destination's current length (including NULL terminator) is already more than\r

   CurrentSize, then ASSERT().\r
 \r
   @param[in,out] Destination    The String to append onto.\r
   CurrentSize, then ASSERT().\r
 \r
   @param[in,out] Destination    The String to append onto.\r

-  @param[in,out] CurrentSize    On call the number of bytes in Destination.  On \r
+  @param[in,out] CurrentSize    On call the number of bytes in Destination.  On\r

                                 return possibly the new size (still in bytes).  If NULL\r
                                 then allocate whatever is needed.\r
   @param[in]     Source         The String to append from.\r
                                 return possibly the new size (still in bytes).  If NULL\r
                                 then allocate whatever is needed.\r
   @param[in]     Source         The String to append from.\r

-  @param[in]     Count          Maximum number of characters to append.  If 0 then \r
+  @param[in]     Count          Maximum number of characters to append.  If 0 then\r

                                 all are appended.\r
 \r
   @return                       The Destination after apending the Source.\r
 **/\r
                                 all are appended.\r
 \r
   @return                       The Destination after apending the Source.\r
 **/\r

-CHAR16* \r
+CHAR16*\r

 EFIAPI\r
 StrnCatGrow (\r
   IN OUT CHAR16           **Destination,\r
 EFIAPI\r
 StrnCatGrow (\r
   IN OUT CHAR16           **Destination,\r


@@ -1021,7 +1024,7 @@ StrnCatGrow (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This is a find and replace function.  Upon successful return the NewString is a copy of \r
+  This is a find and replace function.  Upon successful return the NewString is a copy of\r

   SourceString with each instance of FindTarget replaced with ReplaceWith.\r
 \r
   If SourceString and NewString overlap the behavior is undefined.\r
   SourceString with each instance of FindTarget replaced with ReplaceWith.\r
 \r
   If SourceString and NewString overlap the behavior is undefined.\r


@@ -1042,7 +1045,7 @@ StrnCatGrow (
   @retval EFI_INVALID_PARAMETER       ReplaceWith was NULL.\r
   @retval EFI_INVALID_PARAMETER       FindTarget had length < 1.\r
   @retval EFI_INVALID_PARAMETER       SourceString had length < 1.\r
   @retval EFI_INVALID_PARAMETER       ReplaceWith was NULL.\r
   @retval EFI_INVALID_PARAMETER       FindTarget had length < 1.\r
   @retval EFI_INVALID_PARAMETER       SourceString had length < 1.\r

-  @retval EFI_BUFFER_TOO_SMALL        NewSize was less than the minimum size to hold \r
+  @retval EFI_BUFFER_TOO_SMALL        NewSize was less than the minimum size to hold\r

                                       the new string (truncation occurred).\r
   @retval EFI_SUCCESS                 The string was sucessfully copied with replacement.\r
 **/\r
                                       the new string (truncation occurred).\r
   @retval EFI_SUCCESS                 The string was sucessfully copied with replacement.\r
 **/\r


@@ -1066,8 +1069,8 @@ ShellCopySearchAndReplace2(
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r

-  This internal function checks if a Unicode character is a \r
-  decimal character.  The valid hexadecimal character is \r
+  This internal function checks if a Unicode character is a\r
+  decimal character.  The valid hexadecimal character is\r

   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
   @param[in]  Char  The character to check.\r
   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
   @param[in]  Char  The character to check.\r

diff --git a/ShellPkg/Include/Library/SortLib.h b/ShellPkg/Include/Library/SortLib.h
index 1ae47a7d994bfe659d716e47d235eab424ab6dff..bf3755866c533af7efe5ed6e49364bb3e6ad3687 100644 (file)
--- a/ShellPkg/Include/Library/SortLib.h
+++ b/ShellPkg/Include/Library/SortLib.h
@@ -1,14 +1,14 @@
 /** @file\r
   Library used for sorting and comparison routines.\r
 \r
 /** @file\r
   Library used for sorting and comparison routines.\r
 \r

-Copyright (c) 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -47,7 +47,7 @@ INTN
                                 on return a buffer of sorted elements.\r
   @param[in] Count              The number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes.\r
                                 on return a buffer of sorted elements.\r
   @param[in] Count              The number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes.\r

-  @param[in] CompareFunction    The function to call to perform the comparison \r
+  @param[in] CompareFunction    The function to call to perform the comparison\r

                                 of any 2 elements.\r
 **/\r
 VOID\r
                                 of any 2 elements.\r
 **/\r
 VOID\r


@@ -68,7 +68,7 @@ PerformQuickSort (
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r

-  @return > 0                   Buffer1 is greater than Buffer2.                 \r
+  @return > 0                   Buffer1 is greater than Buffer2.\r

 **/\r
 INTN\r
 EFIAPI\r
 **/\r
 INTN\r
 EFIAPI\r


@@ -80,12 +80,12 @@ DevicePathCompare (
 /**\r
   Function to compare 2 strings without regard to case of the characters.\r
 \r
 /**\r
   Function to compare 2 strings without regard to case of the characters.\r
 \r

-  @param[in] Buffer1            Pointer to String to compare (CHAR16**). \r
+  @param[in] Buffer1            Pointer to String to compare (CHAR16**).\r

   @param[in] Buffer2            Pointer to second String to compare (CHAR16**).\r
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r
   @param[in] Buffer2            Pointer to second String to compare (CHAR16**).\r
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r

-  @return > 0                   Buffer1 is greater than Buffer2.                 \r
+  @return > 0                   Buffer1 is greater than Buffer2.\r

 **/\r
 INTN\r
 EFIAPI\r
 **/\r
 INTN\r
 EFIAPI\r

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
index f67ab82e5beb76b9e1ad347a1a1e393d9a22b3ce..fd9064fe68f750e82abc649d707fb18dfd585222 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShell.h
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -1,14 +1,14 @@
 /** @file\r
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.\r
 /** @file\r
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification including errata.\r

-  \r
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
-  All rights reserved. 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
 \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
+  Copyright (c) 2006 - 2010, 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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -50,11 +50,11 @@ BOOLEAN
 /**\r
   Closes the file handle.\r
 \r
 /**\r
   Closes the file handle.\r
 \r

-  This function closes a specified file handle. All 'dirty' cached file data is \r
-  flushed to the device, and the file is closed. In all cases, the handle is \r
+  This function closes a specified file handle. All 'dirty' cached file data is\r
+  flushed to the device, and the file is closed. In all cases, the handle is\r

   closed.\r
 \r
   closed.\r
 \r

-  @param[in] FileHandle         The file handle to be closed\r
+  @param[in] FileHandle         The file handle to be closed.\r

 \r
   @retval EFI_SUCCESS           The file closed sucessfully.\r
 **/\r
 \r
   @retval EFI_SUCCESS           The file closed sucessfully.\r
 **/\r


@@ -70,22 +70,22 @@ EFI_STATUS
   This function creates an empty new file or directory with the specified attributes and\r
   returns the new file's handle. If the file already exists and is read-only, then\r
   EFI_INVALID_PARAMETER will be returned.\r
   This function creates an empty new file or directory with the specified attributes and\r
   returns the new file's handle. If the file already exists and is read-only, then\r
   EFI_INVALID_PARAMETER will be returned.\r

-  \r
+\r

   If the file already existed, it is truncated and its attributes updated. If the file is\r
   created successfully, the FileHandle is the file's handle, else, the FileHandle is NULL.\r
   If the file already existed, it is truncated and its attributes updated. If the file is\r
   created successfully, the FileHandle is the file's handle, else, the FileHandle is NULL.\r

-  \r
+\r

   If the file name begins with >v, then the file handle which is returned refers to the\r
   shell environment variable with the specified name. If the shell environment variable\r
   already exists and is non-volatile then EFI_INVALID_PARAMETER is returned.\r
 \r
   If the file name begins with >v, then the file handle which is returned refers to the\r
   shell environment variable with the specified name. If the shell environment variable\r
   already exists and is non-volatile then EFI_INVALID_PARAMETER is returned.\r
 \r

-  @param[in] FileName           Pointer to null-terminated file path.\r
+  @param[in] FileName           Pointer to NULL-terminated file path.\r

   @param[in] FileAttribs        The new file's attrbiutes.  the different attributes are\r
                                 described in EFI_FILE_PROTOCOL.Open().\r
   @param[out] FileHandle        On return, points to the created file handle or directory's handle\r
 \r
   @retval EFI_SUCCESS           The file was opened.  FileHandle points to the new file's handle.\r
   @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value.\r
   @param[in] FileAttribs        The new file's attrbiutes.  the different attributes are\r
                                 described in EFI_FILE_PROTOCOL.Open().\r
   @param[out] FileHandle        On return, points to the created file handle or directory's handle\r
 \r
   @retval EFI_SUCCESS           The file was opened.  FileHandle points to the new file's handle.\r
   @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED       could not open the file path\r
+  @retval EFI_UNSUPPORTED       The file path could not be opened.\r

   @retval EFI_NOT_FOUND         The specified file could not be found on the device, or could not\r
                                 file the file system on the device.\r
   @retval EFI_NO_MEDIA          The device has no medium.\r
   @retval EFI_NOT_FOUND         The specified file could not be found on the device, or could not\r
                                 file the file system on the device.\r
   @retval EFI_NO_MEDIA          The device has no medium.\r


@@ -117,7 +117,7 @@ EFI_STATUS
 \r
   @param[in] FileHandle           The file handle to delete.\r
 \r
 \r
   @param[in] FileHandle           The file handle to delete.\r
 \r

-  @retval EFI_SUCCESS             The file was closed and deleted, and the handle was closed.\r
+  @retval EFI_SUCCESS             The file was closed and deleted and the handle was closed.\r

   @retval EFI_WARN_DELETE_FAILURE The handle was closed but the file was not deleted.\r
 **/\r
 typedef\r
   @retval EFI_WARN_DELETE_FAILURE The handle was closed but the file was not deleted.\r
 **/\r
 typedef\r


@@ -131,9 +131,9 @@ EFI_STATUS
 \r
   This function deletes a file.\r
 \r
 \r
   This function deletes a file.\r
 \r

-  @param[in] FileName             Points to the null-terminated file name.\r
+  @param[in] FileName             Points to the NULL-terminated file name.\r

 \r
 \r

-  @retval EFI_SUCCESS             The file was closed and deleted, and the handle was closed.\r
+  @retval EFI_SUCCESS             The file was deleted.\r

   @retval EFI_WARN_DELETE_FAILURE The handle was closed but the file was not deleted.\r
 **/\r
 typedef\r
   @retval EFI_WARN_DELETE_FAILURE The handle was closed but the file was not deleted.\r
 **/\r
 typedef\r


@@ -148,8 +148,8 @@ EFI_STATUS
 typedef\r
 VOID\r
 (EFIAPI *EFI_SHELL_DISABLE_PAGE_BREAK) (\r
 typedef\r
 VOID\r
 (EFIAPI *EFI_SHELL_DISABLE_PAGE_BREAK) (\r

-VOID\r
-);\r
+  VOID\r
+  );\r

 \r
 /**\r
   Enables the page break output mode.\r
 \r
 /**\r
   Enables the page break output mode.\r


@@ -157,8 +157,8 @@ VOID
 typedef\r
 VOID\r
 (EFIAPI *EFI_SHELL_ENABLE_PAGE_BREAK) (\r
 typedef\r
 VOID\r
 (EFIAPI *EFI_SHELL_ENABLE_PAGE_BREAK) (\r

-VOID\r
-);\r
+  VOID\r
+  );\r

 \r
 /**\r
   Execute the command line.\r
 \r
 /**\r
   Execute the command line.\r


@@ -166,26 +166,26 @@ VOID
   This function creates a nested instance of the shell and executes the specified\r
   command (CommandLine) with the specified environment (Environment). Upon return,\r
   the status code returned by the specified command is placed in StatusCode.\r
   This function creates a nested instance of the shell and executes the specified\r
   command (CommandLine) with the specified environment (Environment). Upon return,\r
   the status code returned by the specified command is placed in StatusCode.\r

-  \r
+\r

   If Environment is NULL, then the current environment is used and all changes made\r
   by the commands executed will be reflected in the current environment. If the\r
   Environment is non-NULL, then the changes made will be discarded.\r
   If Environment is NULL, then the current environment is used and all changes made\r
   by the commands executed will be reflected in the current environment. If the\r
   Environment is non-NULL, then the changes made will be discarded.\r

-  \r
+\r

   The CommandLine is executed from the current working directory on the current\r
   device.\r
 \r
   The CommandLine is executed from the current working directory on the current\r
   device.\r
 \r

-  @param[in] ParentImageHandle  A handle of the image that is executing the specified \r
-                                command line.  \r
-  @param[in] CommandLine        Points to the null-terminated UCS-2 encoded string \r
+  @param[in] ParentImageHandle  A handle of the image that is executing the specified\r
+                                command line.\r
+  @param[in] CommandLine        Points to the NULL-terminated UCS-2 encoded string\r

                                 containing the command line. If NULL then the command-\r
                                 line will be empty.\r
                                 containing the command line. If NULL then the command-\r
                                 line will be empty.\r

-  @param[in] Environment        Points to a null-terminated array of environment \r
-                                variables with the format 'x=y', where x is the \r
+  @param[in] Environment        Points to a NULL-terminated array of environment\r
+                                variables with the format 'x=y', where x is the\r

                                 environment variable name and y is the value. If this\r
                                 is NULL, then the current shell environment is used.\r
   @param[out] ErrorCode         Points to the status code returned by the command.\r
 \r
                                 environment variable name and y is the value. If this\r
                                 is NULL, then the current shell environment is used.\r
   @param[out] ErrorCode         Points to the status code returned by the command.\r
 \r

-  @retval EFI_SUCCESS           The command executed successfully. The  status code \r
+  @retval EFI_SUCCESS           The command executed successfully. The  status code\r

                                 returned by the command is pointed to by StatusCode.\r
   @retval EFI_INVALID_PARAMETER The parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  Out of resources.\r
                                 returned by the command is pointed to by StatusCode.\r
   @retval EFI_INVALID_PARAMETER The parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  Out of resources.\r


@@ -210,9 +210,9 @@ EFI_STATUS
   The files in the file list are not opened. The OpenMode field is set to 0 and the FileInfo\r
   field is set to NULL.\r
 \r
   The files in the file list are not opened. The OpenMode field is set to 0 and the FileInfo\r
   field is set to NULL.\r
 \r

-  @param[in] FilePattern        Points to a null-terminated shell file path, including wildcards.\r
-  @param[out] FileList          On return, points to the start of a file list containing the names \r
-                                of all matching files or else points to NULL if no matching files \r
+  @param[in] FilePattern        Points to a NULL-terminated shell file path, including wildcards.\r
+  @param[out] FileList          On return, points to the start of a file list containing the names\r
+                                of all matching files or else points to NULL if no matching files\r

                                 were found.\r
 \r
   @retval EFI_SUCCESS           Files found.\r
                                 were found.\r
 \r
   @retval EFI_SUCCESS           Files found.\r


@@ -232,7 +232,7 @@ EFI_STATUS
   Find all files in a specified directory.\r
 \r
   @param[in] FileDirHandle      Handle of the directory to search.\r
   Find all files in a specified directory.\r
 \r
   @param[in] FileDirHandle      Handle of the directory to search.\r

-  @param[out] FileList          On return, points to the list of files in the directory \r
+  @param[out] FileList          On return, points to the list of files in the directory\r

                                 or NULL if there are no files in the directory.\r
 \r
   @retval EFI_SUCCESS           File information was returned successfully.\r
                                 or NULL if there are no files in the directory.\r
 \r
   @retval EFI_SUCCESS           File information was returned successfully.\r


@@ -249,10 +249,10 @@ OUT EFI_SHELL_FILE_INFO **FileList
 \r
 /**\r
   Flushes data back to a device.\r
 \r
 /**\r
   Flushes data back to a device.\r

-  \r
+\r

   This function flushes all modified data associated with a file to a device.\r
 \r
   This function flushes all modified data associated with a file to a device.\r
 \r

-  @param[in] FileHandle         The handle of the file to flush\r
+  @param[in] FileHandle         The handle of the file to flush.\r

 \r
   @retval EFI_SUCCESS           The data was flushed.\r
   @retval EFI_NO_MEDIA          The device has no medium.\r
 \r
   @retval EFI_SUCCESS           The data was flushed.\r
   @retval EFI_NO_MEDIA          The device has no medium.\r


@@ -270,12 +270,12 @@ EFI_STATUS
 \r
 /**\r
   Frees the file list.\r
 \r
 /**\r
   Frees the file list.\r

-  \r
+\r

   This function cleans up the file list and any related data structures. It has no\r
   impact on the files themselves.\r
 \r
   This function cleans up the file list and any related data structures. It has no\r
   impact on the files themselves.\r
 \r

-  @param[in] FileList           The file list to free. Type EFI_SHELL_FILE_INFO is \r
-                                defined in OpenFileList()\r
+  @param[in] FileList           The file list to free. Type EFI_SHELL_FILE_INFO is\r
+                                defined in OpenFileList().\r

 \r
   @retval EFI_SUCCESS           Free the file list successfully.\r
 **/\r
 \r
   @retval EFI_SUCCESS           Free the file list successfully.\r
 **/\r


@@ -293,9 +293,9 @@ EFI_STATUS
   FileSystemMapping. In both cases, the returned name includes the file system\r
   mapping (i.e. fs0:\current-dir).\r
 \r
   FileSystemMapping. In both cases, the returned name includes the file system\r
   mapping (i.e. fs0:\current-dir).\r
 \r

-  @param[in] FileSystemMapping  A pointer to the file system mapping. If NULL, \r
+  @param[in] FileSystemMapping  A pointer to the file system mapping. If NULL,\r

                                 then the current working directory is returned.\r
                                 then the current working directory is returned.\r

-  \r
+\r

   @retval !=NULL                The current directory.\r
   @retval NULL                  Current directory does not exist.\r
 **/\r
   @retval !=NULL                The current directory.\r
   @retval NULL                  Current directory does not exist.\r
 **/\r


@@ -327,13 +327,13 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS;
   EFI_DEVICE_NAME_USE_COMPONENT_NAME will have higher priority.\r
 \r
   @param[in] DeviceHandle       The handle of the device.\r
   EFI_DEVICE_NAME_USE_COMPONENT_NAME will have higher priority.\r
 \r
   @param[in] DeviceHandle       The handle of the device.\r

-  @param[in] Flags              Determines the possible sources of component names. \r
-  @param[in] Language           A pointer to the language specified for the device \r
-                                name, in the same format as described in the UEFI \r
+  @param[in] Flags              Determines the possible sources of component names.\r
+  @param[in] Language           A pointer to the language specified for the device\r
+                                name, in the same format as described in the UEFI\r

                                 specification, Appendix M.\r
                                 specification, Appendix M.\r

-  @param[out] BestDeviceName    On return, points to the callee-allocated null-\r
-                                terminated name of the device. If no device name \r
-                                could be found, points to NULL. The name must be \r
+  @param[out] BestDeviceName    On return, points to the callee-allocated NULL-\r
+                                terminated name of the device. If no device name\r
+                                could be found, points to NULL. The name must be\r

                                 freed by the caller...\r
 \r
   @retval EFI_SUCCESS           Get the name successfully.\r
                                 freed by the caller...\r
 \r
   @retval EFI_SUCCESS           Get the name successfully.\r


@@ -355,10 +355,10 @@ EFI_STATUS
 \r
   @param[in] Mapping                A pointer to the mapping\r
 \r
 \r
   @param[in] Mapping                A pointer to the mapping\r
 \r

-  @retval !=NULL                Pointer to the device path that corresponds to the \r
-                                device mapping. The returned pointer does not need \r
+  @retval !=NULL                Pointer to the device path that corresponds to the\r
+                                device mapping. The returned pointer does not need\r

                                 to be freed.\r
                                 to be freed.\r

-  @retval NULL                  There is no device path associated with the \r
+  @retval NULL                  There is no device path associated with the\r

                                 specified mapping.\r
 **/\r
 typedef\r
                                 specified mapping.\r
 **/\r
 typedef\r


@@ -375,7 +375,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL *
 \r
   @param[in] Path               The pointer to the path.\r
 \r
 \r
   @param[in] Path               The pointer to the path.\r
 \r

-  @return                       The pointer of the file path. The file path is callee \r
+  @return                       The pointer of the file path. The file path is callee\r

                                 allocated and should be freed by the caller.\r
 **/\r
 typedef\r
                                 allocated and should be freed by the caller.\r
 **/\r
 typedef\r


@@ -385,28 +385,26 @@ EFI_DEVICE_PATH_PROTOCOL *
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function updated with errata.\r
-\r

   Gets either a single or list of environment variables.\r
 \r
   Gets either a single or list of environment variables.\r
 \r

-  If name is not NULL then this function returns the current value of the specified \r
+  If name is not NULL then this function returns the current value of the specified\r

   environment variable.\r
 \r
   environment variable.\r
 \r

-  If Name is NULL than a list of all environment variable names is returned.  Each a \r
+  If Name is NULL than a list of all environment variable names is returned.  Each a\r

   NULL terminated string with a double NULL terminating the list.\r
 \r
   NULL terminated string with a double NULL terminating the list.\r
 \r

-  @param[in] Name               A pointer to the environment variable name.  If \r
-                                Name is NULL, then the function will return all \r
-                                of the defined shell environment variables.  In \r
-                                the case where multiple environment variables are \r
-                                being returned, each variable will be terminated by \r
-                                a NULL, and the list will be terminated by a double \r
+  @param[in] Name               A pointer to the environment variable name.  If\r
+                                Name is NULL, then the function will return all\r
+                                of the defined shell environment variables.  In\r
+                                the case where multiple environment variables are\r
+                                being returned, each variable will be terminated by\r
+                                a NULL, and the list will be terminated by a double\r

                                 NULL.\r
 \r
                                 NULL.\r
 \r

-  @return !=NULL                A pointer to the returned string.\r
+  @return                       A pointer to the returned string.\r

                                 The returned pointer does not need to be freed by the caller.\r
 \r
                                 The returned pointer does not need to be freed by the caller.\r
 \r

-  @retval NULL                  The environment variable doesn't exist or there are \r
+  @retval NULL                  The environment variable doesn't exist or there are\r

                                 no environment variables.\r
 **/\r
 typedef\r
                                 no environment variables.\r
 **/\r
 typedef\r


@@ -423,8 +421,8 @@ CONST CHAR16 *
 \r
   @param[in] FileHandle         A File Handle.\r
 \r
 \r
   @param[in] FileHandle         A File Handle.\r
 \r

-  @return !=NULL                Cannot get the file info.\r
-  @return NULL                  A pointer to a buffer with file information.\r
+  @retval NULL                  Cannot get the file info.\r
+  @return                       A pointer to a buffer with file information.\r

 **/\r
 typedef\r
 EFI_FILE_INFO *\r
 **/\r
 typedef\r
 EFI_FILE_INFO *\r


@@ -439,9 +437,9 @@ EFI_FILE_INFO *
   the device path with the file-system mapping. If there are more than one application\r
   file system mappings, the one that most closely matches Path will be used.\r
 \r
   the device path with the file-system mapping. If there are more than one application\r
   file system mappings, the one that most closely matches Path will be used.\r
 \r

-  @param[in] Path               The pointer to the device path\r
+  @param[in] Path               The pointer to the device path.\r

 \r
 \r

-  @return all                   The pointer of the null-terminated file path. The path \r
+  @return                       The pointer of the NULL-terminated file path. The path\r

                                 is callee-allocated and should be freed by the caller.\r
 **/\r
 typedef\r
                                 is callee-allocated and should be freed by the caller.\r
 **/\r
 typedef\r


@@ -458,7 +456,7 @@ CHAR16 *
   operation is not supported.\r
 \r
   @param[in] FileHandle         The file handle on which to get the current position.\r
   operation is not supported.\r
 \r
   @param[in] FileHandle         The file handle on which to get the current position.\r

-  @paramp[out] Position         Byte position from the start of the file.\r
+  @param[out] Position          Byte position from the start of the file.\r

 \r
   @retval EFI_SUCCESS           Data was accessed.\r
   @retval EFI_UNSUPPORTED       The request is not valid on open directories.\r
 \r
   @retval EFI_SUCCESS           Data was accessed.\r
   @retval EFI_UNSUPPORTED       The request is not valid on open directories.\r


@@ -493,22 +491,22 @@ EFI_STATUS
 \r
   This function returns the help information for the specified command. The help text\r
   can be internal to the shell or can be from a UEFI Shell manual page.\r
 \r
   This function returns the help information for the specified command. The help text\r
   can be internal to the shell or can be from a UEFI Shell manual page.\r

-  \r
+\r

   If Sections is specified, then each section name listed will be compared in a casesensitive\r
   manner, to the section names described in Appendix B. If the section exists,\r
   it will be appended to the returned help text. If the section does not exist, no\r
   information will be returned. If Sections is NULL, then all help text information\r
   available will be returned.\r
 \r
   If Sections is specified, then each section name listed will be compared in a casesensitive\r
   manner, to the section names described in Appendix B. If the section exists,\r
   it will be appended to the returned help text. If the section does not exist, no\r
   information will be returned. If Sections is NULL, then all help text information\r
   available will be returned.\r
 \r

-  @param[in] Command            Points to the null-terminated UEFI Shell command name.\r
-  @param[in] Sections           Points to the null-terminated comma-delimited \r
-                                section names to return. If NULL, then all \r
+  @param[in] Command            Points to the NULL-terminated UEFI Shell command name.\r
+  @param[in] Sections           Points to the NULL-terminated comma-delimited\r
+                                section names to return. If NULL, then all\r

                                 sections will be returned.\r
                                 sections will be returned.\r

-  @param[out] HelpText          On return, points to a callee-allocated buffer \r
+  @param[out] HelpText          On return, points to a callee-allocated buffer\r

                                 containing all specified help text.\r
 \r
   @retval EFI_SUCCESS           The help text was returned.\r
                                 containing all specified help text.\r
 \r
   @retval EFI_SUCCESS           The help text was returned.\r

-  @retval EFI_OUT_OF_RESOURCES  The necessary buffer could not be allocated to hold the \r
+  @retval EFI_OUT_OF_RESOURCES  The necessary buffer could not be allocated to hold the\r

                                 returned help text.\r
   @retval EFI_INVALID_PARAMETER HelpText is NULL.\r
   @retval EFI_NOT_FOUND         There is no help text available for Command.\r
                                 returned help text.\r
   @retval EFI_INVALID_PARAMETER HelpText is NULL.\r
   @retval EFI_NOT_FOUND         There is no help text available for Command.\r


@@ -522,8 +520,6 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This funciton is updated with Errata.\r
-\r

   Gets the mapping(s) that most closely matches the device path.\r
 \r
   This function gets the mapping which corresponds to the device path *DevicePath. If\r
   Gets the mapping(s) that most closely matches the device path.\r
 \r
   This function gets the mapping which corresponds to the device path *DevicePath. If\r


@@ -532,15 +528,15 @@ EFI_STATUS
   device path. If there is an exact match, the mapping is returned and *DevicePath\r
   points to the end-of-device-path node.\r
 \r
   device path. If there is an exact match, the mapping is returned and *DevicePath\r
   points to the end-of-device-path node.\r
 \r

-  If there are multiple map names they will be semi-colon seperated in the \r
+  If there are multiple map names they will be semi-colon seperated in the\r

   NULL-terminated string.\r
 \r
   NULL-terminated string.\r
 \r

-  @param[in,out] DevicePath     On entry, points to a device path pointer. On \r
-                                exit, updates the pointer to point to the \r
+  @param[in,out] DevicePath     On entry, points to a device path pointer. On\r
+                                exit, updates the pointer to point to the\r

                                 portion of the device path after the mapping.\r
 \r
   @retval NULL                  No mapping was found.\r
                                 portion of the device path after the mapping.\r
 \r
   @retval NULL                  No mapping was found.\r

-  @retval !=NULL                Pointer to null-terminated mapping. The buffer \r
+  @retval !=NULL                Pointer to NULL-terminated mapping. The buffer\r

                                 is callee allocated and should be freed by the caller.\r
 **/\r
 typedef\r
                                 is callee allocated and should be freed by the caller.\r
 **/\r
 typedef\r


@@ -582,34 +578,34 @@ VOID
 \r
   This function opens the specified file in the specified OpenMode and returns a file\r
   handle.\r
 \r
   This function opens the specified file in the specified OpenMode and returns a file\r
   handle.\r

-  If the file name begins with >v, then the file handle which is returned refers to the\r
+  If the file name begins with '>v', then the file handle which is returned refers to the\r

   shell environment variable with the specified name. If the shell environment variable\r
   exists, is non-volatile and the OpenMode indicates EFI_FILE_MODE_WRITE, then\r
   EFI_INVALID_PARAMETER is returned.\r
 \r
   shell environment variable with the specified name. If the shell environment variable\r
   exists, is non-volatile and the OpenMode indicates EFI_FILE_MODE_WRITE, then\r
   EFI_INVALID_PARAMETER is returned.\r
 \r

-  If the file name is >i, then the file handle which is returned refers to the standard\r
+  If the file name is '>i', then the file handle which is returned refers to the standard\r

   input. If the OpenMode indicates EFI_FILE_MODE_WRITE, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r
   input. If the OpenMode indicates EFI_FILE_MODE_WRITE, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r

-  If the file name is >o, then the file handle which is returned refers to the standard\r
+  If the file name is '>o', then the file handle which is returned refers to the standard\r

   output. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r
   output. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r

-  If the file name is >e, then the file handle which is returned refers to the standard\r
+  If the file name is '>e', then the file handle which is returned refers to the standard\r

   error. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r
   error. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER\r
   is returned.\r
 \r

-  If the file name is NUL, then the file handle that is returned refers to the standard NUL\r
+  If the file name is 'NUL', then the file handle that is returned refers to the standard NUL\r

   file. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER is\r
   returned.\r
 \r
   If return EFI_SUCCESS, the FileHandle is the opened file's handle, else, the\r
   FileHandle is NULL.\r
 \r
   file. If the OpenMode indicates EFI_FILE_MODE_READ, then EFI_INVALID_PARAMETER is\r
   returned.\r
 \r
   If return EFI_SUCCESS, the FileHandle is the opened file's handle, else, the\r
   FileHandle is NULL.\r
 \r

-  @param[in] FileName           Points to the null-terminated UCS-2 encoded file name.\r
+  @param[in] FileName           Points to the NULL-terminated UCS-2 encoded file name.\r

   @param[out] FileHandle        On return, points to the file handle.\r
   @param[out] FileHandle        On return, points to the file handle.\r

-  @param[in] OpenMode           File open mode. Either EFI_FILE_MODE_READ or \r
-                                EFI_FILE_MODE_WRITE from section 12.4 of the UEFI \r
+  @param[in] OpenMode           File open mode. Either EFI_FILE_MODE_READ or\r
+                                EFI_FILE_MODE_WRITE from section 12.4 of the UEFI\r

                                 Specification.\r
   @retval EFI_SUCCESS           The file was opened. FileHandle has the opened file's handle.\r
   @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. FileHandle is NULL.\r
                                 Specification.\r
   @retval EFI_SUCCESS           The file was opened. FileHandle has the opened file's handle.\r
   @retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. FileHandle is NULL.\r


@@ -641,7 +637,7 @@ EFI_STATUS
   Opens the files that match the path specified.\r
 \r
   This function opens all of the files specified by Path. Wildcards are processed\r
   Opens the files that match the path specified.\r
 \r
   This function opens all of the files specified by Path. Wildcards are processed\r

-  according to the rules specified in UEFI Shell 2.0 spec section 3.7.1. Each \r
+  according to the rules specified in UEFI Shell 2.0 spec section 3.7.1. Each\r

   matching file has an EFI_SHELL_FILE_INFO structure created in a linked list.\r
 \r
   @param[in] Path               A pointer to the path string.\r
   matching file has an EFI_SHELL_FILE_INFO structure created in a linked list.\r
 \r
   @param[in] Path               A pointer to the path string.\r


@@ -745,23 +741,18 @@ EFI_STATUS
   IN EFI_SHELL_FILE_INFO **FileList\r
   );\r
 \r
   IN EFI_SHELL_FILE_INFO **FileList\r
   );\r
 \r

-//\r
-// The SetAlias and GetAlias functions were affected by errata.  \r
-// They are not UEFI Shell 2.0 (no errata) compliant.\r
-//\r
-\r

 /**\r
   Changes a shell command alias.\r
 \r
   This function creates an alias for a shell command.\r
 \r
 /**\r
   Changes a shell command alias.\r
 \r
   This function creates an alias for a shell command.\r
 \r

-  @param[in] Command            Points to the null-terminated shell command or existing alias.\r
-  @param[in] Alias              Points to the null-terminated alias for the shell command. If this is NULL, and\r
+  @param[in] Command            Points to the NULL-terminated shell command or existing alias.\r
+  @param[in] Alias              Points to the NULL-terminated alias for the shell command. If this is NULL, and\r

                                 Command refers to an alias, that alias will be deleted.\r
   @param[in] Replace            If TRUE and the alias already exists, then the existing alias will be replaced. If\r
                                 FALSE and the alias already exists, then the existing alias is unchanged and\r
                                 EFI_ACCESS_DENIED is returned.\r
                                 Command refers to an alias, that alias will be deleted.\r
   @param[in] Replace            If TRUE and the alias already exists, then the existing alias will be replaced. If\r
                                 FALSE and the alias already exists, then the existing alias is unchanged and\r
                                 EFI_ACCESS_DENIED is returned.\r

-  @param[in] Volatile           if TRUE the Alias being set will be stored in a volatile fashion.  if FALSE the \r
+  @param[in] Volatile           if TRUE the Alias being set will be stored in a volatile fashion.  if FALSE the\r

                                 Alias being set will be stored in a non-volatile fashion.\r
 \r
   @retval EFI_SUCCESS           Alias created or deleted successfully.\r
                                 Alias being set will be stored in a non-volatile fashion.\r
 \r
   @retval EFI_SUCCESS           Alias created or deleted successfully.\r


@@ -781,20 +772,20 @@ EFI_STATUS
   This function returns the command associated with a alias or a list of all\r
   alias'.\r
 \r
   This function returns the command associated with a alias or a list of all\r
   alias'.\r
 \r

-  @param[in] Alias              Points to the null-terminated shell alias. \r
-                                If this parameter is NULL, then all \r
+  @param[in] Alias              Points to the NULL-terminated shell alias.\r
+                                If this parameter is NULL, then all\r

                                 aliases will be returned in ReturnedData.\r
   @param[out] Volatile          Upon return of a single command if TRUE indicates\r
                                 this is stored in a volatile fashion.  FALSE otherwise.\r
                                 aliases will be returned in ReturnedData.\r
   @param[out] Volatile          Upon return of a single command if TRUE indicates\r
                                 this is stored in a volatile fashion.  FALSE otherwise.\r

-  @return                              If Alias is not NULL, it will return a pointer to \r
-                                the null-terminated command for that alias. \r
-                                If Alias is NULL, ReturnedData points to a ';' \r
-                                delimited list of alias (e.g. \r
-                                ReturnedData = "dir;del;copy;mfp") that is null-terminated.  \r
+  @return                              If Alias is not NULL, it will return a pointer to\r
+                                the NULL-terminated command for that alias.\r
+                                If Alias is NULL, ReturnedData points to a ';'\r
+                                delimited list of alias (e.g.\r
+                                ReturnedData = "dir;del;copy;mfp") that is NULL-terminated.\r

   @retval NULL                  An error ocurred.\r
   @retval NULL                  Alias was not a valid Alias.\r
 **/\r
   @retval NULL                  An error ocurred.\r
   @retval NULL                  Alias was not a valid Alias.\r
 **/\r

-typedef \r
+typedef\r

 CONST CHAR16 *\r
 (EFIAPI *EFI_SHELL_GET_ALIAS)(\r
   IN  CONST CHAR16 *Alias,\r
 CONST CHAR16 *\r
 (EFIAPI *EFI_SHELL_GET_ALIAS)(\r
   IN  CONST CHAR16 *Alias,\r


@@ -816,14 +807,14 @@ CONST CHAR16 *
   directory on the specified file system.\r
 \r
   If the current working directory or the current working file system is changed then the\r
   directory on the specified file system.\r
 \r
   If the current working directory or the current working file system is changed then the\r

-  %cwd% environment variable will be updated\r
+  %cwd% environment variable will be updated.\r

 \r
   @param[in] FileSystem         A pointer to the file system's mapped name. If NULL, then the current working\r
                                 directory is changed.\r
 \r
   @param[in] FileSystem         A pointer to the file system's mapped name. If NULL, then the current working\r
                                 directory is changed.\r

-  @param[in] Dir                Points to the null-terminated directory on the device specified by FileSystem.\r
+  @param[in] Dir                Points to the NULL-terminated directory on the device specified by FileSystem.\r

 \r
 \r

-  @return !=NULL                The current directory.\r

   @retval NULL                  Current directory does not exist.\r
   @retval NULL                  Current directory does not exist.\r

+  @return                       The current directory.\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -842,12 +833,12 @@ EFI_STATUS
   variable does not exist and the Value is an empty string, there is no action. If the\r
   environment variable does not exist and the Value is a non-empty string, then the\r
   environment variable is created and assigned the specified value.\r
   variable does not exist and the Value is an empty string, there is no action. If the\r
   environment variable does not exist and the Value is a non-empty string, then the\r
   environment variable is created and assigned the specified value.\r

-  \r
-  For a description of volatile and non-volatile environment variables, see UEFI Shell \r
+\r
+  For a description of volatile and non-volatile environment variables, see UEFI Shell\r

   2.0 specification section 3.6.1.\r
 \r
   2.0 specification section 3.6.1.\r
 \r

-  @param[in] Name               Points to the null-terminated environment variable name.\r
-  @param[in] Value              Points to the null-terminated environment variable value. If the value is an\r
+  @param[in] Name               Points to the NULL-terminated environment variable name.\r
+  @param[in] Value              Points to the NULL-terminated environment variable value. If the value is an\r

                                 empty string then the environment variable is deleted.\r
   @param[in] Volatile           Indicates whether the variable is non-volatile (FALSE) or volatile (TRUE).\r
 \r
                                 empty string then the environment variable is deleted.\r
   @param[in] Volatile           Indicates whether the variable is non-volatile (FALSE) or volatile (TRUE).\r
 \r


@@ -864,9 +855,10 @@ EFI_STATUS
 /**\r
   Sets the file information to an opened file handle.\r
 \r
 /**\r
   Sets the file information to an opened file handle.\r
 \r

-  This function changes file information.\r
+  This function changes file information.  All file information in the EFI_FILE_INFO\r
+  struct will be updated to the passed in data.\r

 \r
 \r

-  @param[in] FileHandle         A file handle\r
+  @param[in] FileHandle         A file handle.\r

   @param[in] FileInfo           Points to new file information.\r
 \r
   @retval EFI_SUCCESS           The information was set.\r
   @param[in] FileInfo           Points to new file information.\r
 \r
   @retval EFI_SUCCESS           The information was set.\r


@@ -912,7 +904,7 @@ EFI_STATUS
 \r
   @param[in] DevicePath         Points to the device path. If this is NULL and Mapping points to a valid mapping,\r
                                 then the mapping will be deleted.\r
 \r
   @param[in] DevicePath         Points to the device path. If this is NULL and Mapping points to a valid mapping,\r
                                 then the mapping will be deleted.\r

-  @param[in] Mapping            Points to the null-terminated mapping for the device path.\r
+  @param[in] Mapping            Points to the NULL-terminated mapping for the device path.\r

 \r
   @retval EFI_SUCCESS           Mapping created or deleted successfully.\r
   @retval EFI_NO_MAPPING        There is no handle that corresponds exactly to DevicePath. See the\r
 \r
   @retval EFI_SUCCESS           Mapping created or deleted successfully.\r
   @retval EFI_NO_MAPPING        There is no handle that corresponds exactly to DevicePath. See the\r

diff --git a/ShellPkg/Include/Protocol/EfiShellEnvironment2.h b/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
index ea06f8de96c6b1f8573e55128d9ad9d44d73c7ac..1c828530275aefe010f54b375f00be1c13f5a5cb 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
+++ b/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
@@ -1,8 +1,8 @@
 /** @file\r
   Defines for EFI shell environment 2 ported to EDK II build environment. (no spec)\r
 \r
 /** @file\r
   Defines for EFI shell environment 2 ported to EDK II build environment. (no spec)\r
 \r

-  Copyright (c) 2005 - 2010, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2005 - 2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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


@@ -12,7 +12,7 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-  \r
+\r

 #if !defined (_SHELL_ENVIRONMENT_2_PROTOCOL_H_)\r
 #define _SHELL_ENVIRONMENT_2_PROTOCOL_H_\r
 \r
 #if !defined (_SHELL_ENVIRONMENT_2_PROTOCOL_H_)\r
 #define _SHELL_ENVIRONMENT_2_PROTOCOL_H_\r
 \r


@@ -20,8 +20,8 @@
 #define DEFAULT_AUTO_LF     FALSE\r
 \r
 /**\r
 #define DEFAULT_AUTO_LF     FALSE\r
 \r
 /**\r

-  This function is a prototype for a function that dumps information on a protocol \r
-  to a given location.  The location is dependant on the implementation.  This is \r
+  This function is a prototype for a function that dumps information on a protocol\r
+  to a given location.  The location is dependant on the implementation.  This is\r

   used when programatically adding shell commands.\r
 \r
   @param Handle                 The handle the protocol is on.\r
   used when programatically adding shell commands.\r
 \r
   @param Handle                 The handle the protocol is on.\r


@@ -36,16 +36,16 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is a prototype for each command internal to the EFI shell \r
-  implementation.  The specific command depends on the implementation.  This is \r
+  This function is a prototype for each command internal to the EFI shell\r
+  implementation.  The specific command depends on the implementation.  This is\r

   used when programatically adding shell commands.\r
 \r
   @param ImageHandle            The handle to the binary shell.\r
   @param SystemTable            Pointer to the system table.\r
 \r
   @retval EFI_SUCCESS           The command ran to completion\r
   used when programatically adding shell commands.\r
 \r
   @param ImageHandle            The handle to the binary shell.\r
   @param SystemTable            Pointer to the system table.\r
 \r
   @retval EFI_SUCCESS           The command ran to completion\r

-  @retval other                 An error ocurred.  Any error is possible \r
-                                depending on the implementation of the shell \r
+  @retval other                 An error ocurred.  Any error is possible\r
+                                depending on the implementation of the shell\r

                                 command.\r
 \r
 **/\r
                                 command.\r
 \r
 **/\r


@@ -57,8 +57,8 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is a prototype for one that gets a help string for a given command. \r
-  This is used when programatically adding shell commands.  Upon successful return \r
+  This function is a prototype for one that gets a help string for a given command.\r
+  This is used when programatically adding shell commands.  Upon successful return\r

   the memory allocated is up to the caller to free.\r
 \r
   @param Str                      Pointer to pointer to string to display for help.\r
   the memory allocated is up to the caller to free.\r
 \r
   @param Str                      Pointer to pointer to string to display for help.\r


@@ -76,24 +76,24 @@ EFI_STATUS
 Structure returned from functions that open multiple files.\r
 **/\r
 typedef struct {\r
 Structure returned from functions that open multiple files.\r
 **/\r
 typedef struct {\r

-  UINT32                    Signature;            ///< SHELL_FILE_ARG_SIGNATURE\r
-  LIST_ENTRY                Link;                 ///< Linked list helper\r
-  EFI_STATUS                Status;               ///< File's status\r
+  UINT32                    Signature;            ///< SHELL_FILE_ARG_SIGNATURE.\r
+  LIST_ENTRY                Link;                 ///< Linked list helper.\r
+  EFI_STATUS                Status;               ///< File's status.\r

 \r
 \r

-  EFI_FILE_HANDLE           Parent;               ///< What is the Parent file of this file\r
-  UINT64                    OpenMode;             ///< How was the file opened\r
-  CHAR16                    *ParentName;          ///< String representation of parent\r
-  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;    ///< DevicePath for Parent\r
+  EFI_FILE_HANDLE           Parent;               ///< What is the Parent file of this file.\r
+  UINT64                    OpenMode;             ///< How was the file opened.\r
+  CHAR16                    *ParentName;          ///< String representation of parent.\r
+  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;    ///< DevicePath for Parent.\r

 \r
 \r

-  CHAR16                    *FullName;            ///< Path and file name for this file\r
-  CHAR16                    *FileName;            ///< File name for this file\r
+  CHAR16                    *FullName;            ///< Path and file name for this file.\r
+  CHAR16                    *FileName;            ///< File name for this file.\r

 \r
 \r

-  EFI_FILE_HANDLE           Handle;               ///< Handle to this file\r
-  EFI_FILE_INFO             *Info;                ///< Pointer to file info for this file\r
+  EFI_FILE_HANDLE           Handle;               ///< Handle to this file.\r
+  EFI_FILE_INFO             *Info;                ///< Pointer to file info for this file.\r

 } SHELL_FILE_ARG;\r
 \r
 } SHELL_FILE_ARG;\r
 \r

-/// Signature for SHELL_FILE_ARG\r
-#define SHELL_FILE_ARG_SIGNATURE  SIGNATURE_32 ('g', 'r', 'a', 'f') \r
+/// Signature for SHELL_FILE_ARG.\r
+#define SHELL_FILE_ARG_SIGNATURE  SIGNATURE_32 ('g', 'r', 'a', 'f')\r

 \r
 /**\r
 GUID for the shell environment2 and shell environment.\r
 \r
 /**\r
 GUID for the shell environment2 and shell environment.\r


@@ -115,12 +115,12 @@ GUID for the shell environment2 extension (main GUID above).
 #define EFI_SHELL_MINOR_VER 0x00000000 ///< Minor version of the EFI_SHELL_ENVIRONMENT2\r
 \r
 /**\r
 #define EFI_SHELL_MINOR_VER 0x00000000 ///< Minor version of the EFI_SHELL_ENVIRONMENT2\r
 \r
 /**\r

-  Execute a command line\r
+  Execute a command line.\r

 \r
 \r

-  This function will run the CommandLine.  This includes loading any required images, \r
-  parsing any requires scripts, and it DebugOutput is TRUE printing errors \r
+  This function will run the CommandLine.  This includes loading any required images,\r
+  parsing any requires scripts, and if DebugOutput is TRUE printing errors\r

   encountered directly to the screen.\r
   encountered directly to the screen.\r

-  \r
+\r

   @param ParentImageHandle      Handle of image executing this operation.\r
   @param CommandLine            The string command line to execute.\r
   @param DebugOutput            TRUE indicates that errors should be printed directly.\r
   @param ParentImageHandle      Handle of image executing this operation.\r
   @param CommandLine            The string command line to execute.\r
   @param DebugOutput            TRUE indicates that errors should be printed directly.\r


@@ -144,15 +144,15 @@ EFI_STATUS
 /**\r
   This function returns a shell environment variable value.\r
 \r
 /**\r
   This function returns a shell environment variable value.\r
 \r

-  @param Name                   Pointer to the string with the shell environment \r
+  @param Name                   Pointer to the string with the shell environment\r

                                 variable name.\r
 \r
   @retval NULL                  The shell environment variable's value could not be found.\r
                                 variable name.\r
 \r
   @retval NULL                  The shell environment variable's value could not be found.\r

-  @retval !NULL                 The value of the shell environment variable Name.\r
+  @retval !=NULL                The value of the shell environment variable Name.\r

 \r
 **/\r
 \r
 **/\r

-typedef \r
-CHAR16 * \r
+typedef\r
+CHAR16 *\r

 (EFIAPI *SHELLENV_GET_ENV) (\r
   IN CHAR16 *Name\r
   );\r
 (EFIAPI *SHELLENV_GET_ENV) (\r
   IN CHAR16 *Name\r
   );\r


@@ -160,15 +160,15 @@ CHAR16 *
 /**\r
   This function returns a shell environment map value.\r
 \r
 /**\r
   This function returns a shell environment map value.\r
 \r

-  @param Name                   Pointer to the string with the shell environment \r
+  @param Name                   Pointer to the string with the shell environment\r

                                 map name.\r
 \r
   @retval NULL                  The shell environment map's value could not be found.\r
                                 map name.\r
 \r
   @retval NULL                  The shell environment map's value could not be found.\r

-  @retval !NULL                 The value of the shell environment map Name.\r
+  @retval !=NULL                The value of the shell environment map Name.\r

 \r
 **/\r
 \r
 **/\r

-typedef \r
-CHAR16 * \r
+typedef\r
+CHAR16 *\r

 (EFIAPI *SHELLENV_GET_MAP) (\r
   IN CHAR16 *Name\r
   );\r
 (EFIAPI *SHELLENV_GET_MAP) (\r
   IN CHAR16 *Name\r
   );\r


@@ -180,7 +180,7 @@ CHAR16 *
   list in the correct location.\r
 \r
   @param Handler                The handler function to call when the command gets called.\r
   list in the correct location.\r
 \r
   @param Handler                The handler function to call when the command gets called.\r

-  @param CmdStr                 The command name.\r
+  @param Cmd                    The command name.\r

   @param GetLineHelp            Function to call of get help for this command.\r
 \r
   @retval EFI_SUCCESS           The command is now part of the command list.\r
   @param GetLineHelp            Function to call of get help for this command.\r
 \r
   @retval EFI_SUCCESS           The command is now part of the command list.\r


@@ -203,11 +203,10 @@ EFI_STATUS
   This will get the current protocol info and add the new info or update existing info\r
   and then resave the info.\r
 \r
   This will get the current protocol info and add the new info or update existing info\r
   and then resave the info.\r
 \r

-  @param SaveId                 Save this change as an EFI variable.\r
-  @param Protocol               The protocol's GUID.\r
-  @param DumpToken              The function pointer to dump token function or \r
+  @param Protocol               Pointer to the protocol's GUID.\r
+  @param DumpToken              The function pointer to dump token function or\r

                                 NULL.\r
                                 NULL.\r

-  @param DumpInfo               The function pointer to dump infomation function \r
+  @param DumpInfo               The function pointer to dump infomation function\r

                                 or NULL.\r
   @param IdString               The english name of the protocol.\r
 **/\r
                                 or NULL.\r
   @param IdString               The english name of the protocol.\r
 **/\r


@@ -221,10 +220,10 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function finds a protocol handle by a GUID.  \r
+  This function finds a protocol handle by a GUID.\r

 \r
 \r

-  This function will check for already known protocols by GUID and if one is \r
-  found it will return the name of that protocol.  If no name is found and \r
+  This function will check for already known protocols by GUID and if one is\r
+  found it will return the name of that protocol.  If no name is found and\r

   GenId is TRUE it will generate ths string.\r
 \r
   @param Protocol               The GUID of the protocol to look for.\r
   GenId is TRUE it will generate ths string.\r
 \r
   @param Protocol               The GUID of the protocol to look for.\r


@@ -233,45 +232,46 @@ VOID
   @return !NULL                 The Name of the protocol.\r
   @retval NULL                  The Name was not found and GenId was not TRUE.\r
 **/\r
   @return !NULL                 The Name of the protocol.\r
   @retval NULL                  The Name was not found and GenId was not TRUE.\r
 **/\r

-typedef \r
+typedef\r

 CHAR16*\r
 (EFIAPI *SHELLENV_GET_PROT) (\r
 CHAR16*\r
 (EFIAPI *SHELLENV_GET_PROT) (\r

-  IN EFI_GUID *Protocol, \r
+  IN EFI_GUID *Protocol,\r

   IN BOOLEAN GenId\r
   );\r
 \r
 /**\r
   IN BOOLEAN GenId\r
   );\r
 \r
 /**\r

-  This function returns the current directory on a given device.\r
+  This function returns a string array containing the current directory on\r
+  a given device.\r

 \r
 \r

-  If DeviceName is specified, then return the current shell directory on that \r
-  device.  If DeviceName is NULL, then return the current directory on the \r
+  If DeviceName is specified, then return the current shell directory on that\r
+  device.  If DeviceName is NULL, then return the current directory on the\r

   current device.  The caller us responsible to free the returned string when\r
   no londer required.\r
 \r
   current device.  The caller us responsible to free the returned string when\r
   no londer required.\r
 \r

-  @param DeviceName             The name of the device to get the current \r
+  @param DeviceName             The name of the device to get the current\r

                                 directory on or NULL for current device.\r
 \r
                                 directory on or NULL for current device.\r
 \r

-  @return The current directory on the current or specified device.\r
+  @return String array with the current directory on the current or specified device.\r

 \r
 **/\r
 \r
 **/\r

-typedef \r
+typedef\r

 CHAR16*\r
 (EFIAPI *SHELLENV_CUR_DIR) (\r
   IN CHAR16 *DeviceName OPTIONAL\r
   );\r
 \r
 /**\r
 CHAR16*\r
 (EFIAPI *SHELLENV_CUR_DIR) (\r
   IN CHAR16 *DeviceName OPTIONAL\r
   );\r
 \r
 /**\r

-  This function will open a group of files that match the Arg path, including \r
-  support for wildcard characters ('?' and '*') in the Arg path.  If there are \r
+  This function will open a group of files that match the Arg path, including\r
+  support for wildcard characters ('?' and '*') in the Arg path.  If there are\r

   any wildcard characters in the path this function will find any and all files\r
   any wildcard characters in the path this function will find any and all files\r

-  that match the wildcards.  The return is a double linked list based on the \r
-  LIST_ENTRY linked list structure.  Use this in conjunction with the \r
+  that match the wildcards.  It returns a double linked list based on the\r
+  LIST_ENTRY linked list structure.  Use this in conjunction with the\r

   SHELL_FILE_ARG_SIGNATURE to get the SHELL_FILE_ARG structures that are returned.\r
   SHELL_FILE_ARG_SIGNATURE to get the SHELL_FILE_ARG structures that are returned.\r

-  The memory allocated by the callee for this list is freed by making a call to \r
+  The memory allocated by the callee for this list is freed by making a call to\r

   SHELLENV_FREE_FILE_LIST.\r
 \r
   @param Arg                    Pointer Path to files to open.\r
   SHELLENV_FREE_FILE_LIST.\r
 \r
   @param Arg                    Pointer Path to files to open.\r

-  @param ListHead               Pointer to allocated and initialized list head \r
+  @param ListHead               Pointer to allocated and initialized list head\r

                                 upon which to append all the opened file structures.\r
 \r
   @retval EFI_SUCCESS           1 or more files was opened and a struct of each file's\r
                                 upon which to append all the opened file structures.\r
 \r
   @retval EFI_SUCCESS           1 or more files was opened and a struct of each file's\r


@@ -291,7 +291,7 @@ EFI_STATUS
 \r
   @param ListHead               Pointer to list to free all nodes of.\r
 \r
 \r
   @param ListHead               Pointer to list to free all nodes of.\r
 \r

-  @retval EFI_SUCCESS           always returned.\r
+  @retval EFI_SUCCESS           Always returned.\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -300,21 +300,21 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function creates a new instance of the ShellInterface protocol for use on \r
+  This function creates a new instance of the ShellInterface protocol for use on\r

   the ImageHandle.\r
 \r
   the ImageHandle.\r
 \r

-  This function is for internal shell usage.  This will allocate and then populate \r
-  EFI_SHELL_INTERFACE protocol.  It is the caller's responsibility to free the \r
+  This function is for internal shell usage.  This will allocate and then populate\r
+  EFI_SHELL_INTERFACE protocol.  It is the caller's responsibility to free the\r

   memory.\r
 \r
   memory.\r
 \r

-  @param ImageHandle            The handle which will use the new ShellInterface \r
+  @param ImageHandle            The handle which will use the new ShellInterface\r

                                 protocol.\r
 \r
   @return the newly allocated shell interface protocol.\r
 \r
 **/\r
                                 protocol.\r
 \r
   @return the newly allocated shell interface protocol.\r
 \r
 **/\r

-typedef \r
-EFI_SHELL_INTERFACE* \r
+typedef\r
+EFI_SHELL_INTERFACE*\r

 (EFIAPI *SHELLENV_NEW_SHELL) (\r
   IN EFI_HANDLE ImageHandle\r
   );\r
 (EFIAPI *SHELLENV_NEW_SHELL) (\r
   IN EFI_HANDLE ImageHandle\r
   );\r


@@ -322,8 +322,8 @@ EFI_SHELL_INTERFACE*
 /**\r
   This function determins whether a script file is currently being processed.\r
 \r
 /**\r
   This function determins whether a script file is currently being processed.\r
 \r

-  A script file (.nsh file) can contain a series of commands and this is useful to \r
-  know for some shell commands whether they are being run manually or as part of a \r
+  A script file (.nsh file) can contain a series of commands and this is useful to\r
+  know for some shell commands whether they are being run manually or as part of a\r

   script.\r
 \r
   @retval TRUE                  A script file is being processed.\r
   script.\r
 \r
   @retval TRUE                  A script file is being processed.\r


@@ -336,7 +336,7 @@ BOOLEAN
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This is an internal shell function to free any and all allocated resources.  \r
+  This is an internal shell function to free any and all allocated resources.\r

   This should be called just closing the shell.\r
 **/\r
 typedef\r
   This should be called just closing the shell.\r
 **/\r
 typedef\r


@@ -348,9 +348,9 @@ VOID
 /**\r
   This function enables the page break mode.\r
 \r
 /**\r
   This function enables the page break mode.\r
 \r

-  This mode causes the output to pause after each complete screen to enable a \r
-  user to more easily read it.  If AutoWrap is TRUE then rows with too many \r
-  characters will be chopped and divided into 2 rows.  If FALSE then rows with \r
+  This mode causes the output to pause after each complete screen to enable a\r
+  user to more easily read it.  If AutoWrap is TRUE then rows with too many\r
+  characters will be chopped and divided into 2 rows.  If FALSE then rows with\r

   too many characters may not be fully visible to the user on the screen.\r
 \r
   @param StartRow               The row number to start this on.\r
   too many characters may not be fully visible to the user on the screen.\r
 \r
   @param StartRow               The row number to start this on.\r


@@ -366,7 +366,7 @@ VOID
 /**\r
   This function disables the page break mode.\r
 \r
 /**\r
   This function disables the page break mode.\r
 \r

-  Tisabling this causes the output to print out exactly as coded with no breaks \r
+  Tisabling this causes the output to print out exactly as coded with no breaks\r

   for readability.\r
 **/\r
 typedef\r
   for readability.\r
 **/\r
 typedef\r


@@ -388,7 +388,7 @@ BOOLEAN
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function sets the keys to filter for for the console in.  The valid \r
+  This function sets the keys to filter for for the console in.  The valid\r

   values to set are:\r
 \r
   #define EFI_OUTPUT_SCROLL   0x00000001\r
   values to set are:\r
 \r
   #define EFI_OUTPUT_SCROLL   0x00000001\r


@@ -404,7 +404,7 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function gets the keys to filter for for the console in.  \r
+  This function gets the keys to filter for for the console in.\r

 \r
   The valid values to get are:\r
   #define EFI_OUTPUT_SCROLL   0x00000001\r
 \r
   The valid values to get are:\r
   #define EFI_OUTPUT_SCROLL   0x00000001\r


@@ -422,10 +422,10 @@ UINT32
 /**\r
   This function determins if the shell application should break.\r
 \r
 /**\r
   This function determins if the shell application should break.\r
 \r

-  This is used to inform a shell application that a break condition has been \r
+  This is used to inform a shell application that a break condition has been\r

   initiated.  Long loops should check this to prevent delays to the break.\r
 \r
   initiated.  Long loops should check this to prevent delays to the break.\r
 \r

-  @retval TRUE                  A break has been signaled.  the application   \r
+  @retval TRUE                  A break has been signaled.  the application\r

                                 should exit with EFI_ABORTED as soon as possible.\r
   @retval FALSE                 Continue as normal.\r
 **/\r
                                 should exit with EFI_ABORTED as soon as possible.\r
   @retval FALSE                 Continue as normal.\r
 **/\r


@@ -470,14 +470,14 @@ BOOLEAN
 /**\r
   Close the console proxy to restore the original console.\r
 \r
 /**\r
   Close the console proxy to restore the original console.\r
 \r

-  This is an internal shell function to handle shell cascading.  It restores the \r
+  This is an internal shell function to handle shell cascading.  It restores the\r

   original set of console protocols.\r
   original set of console protocols.\r

-  \r
+\r

   @param ConInHandle            The handle of ConIn.\r
   @param ConInHandle            The handle of ConIn.\r

-  @param ConIn                  Pointer to the location to return the pointer to \r
+  @param ConIn                  Pointer to the location to return the pointer to\r

                                 the original console input.\r
   @param ConOutHandle           The handle of ConOut\r
                                 the original console input.\r
   @param ConOutHandle           The handle of ConOut\r

-  @param ConOut                 Pointer to the location to return the pointer to \r
+  @param ConOut                 Pointer to the location to return the pointer to\r

                                 the original console output.\r
 **/\r
 typedef\r
                                 the original console output.\r
 **/\r
 typedef\r


@@ -494,7 +494,7 @@ VOID
 //\r
 /**\r
   For ease of use the shell maps handle #'s to short numbers.\r
 //\r
 /**\r
   For ease of use the shell maps handle #'s to short numbers.\r

-  This is only done on request for various internal commands and the references \r
+  This is only done on request for various internal commands and the references\r

   are immediately freed when the internal command completes.\r
 **/\r
 typedef\r
   are immediately freed when the internal command completes.\r
 **/\r
 typedef\r


@@ -506,8 +506,8 @@ VOID
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r

-  This function gets the next handle in the handle database.  If no handles are \r
-  found EFI_NOT_FOUND is returned.  If the previous Handle was the last handle \r
+  This function gets the next handle in the handle database.  If no handles are\r
+  found EFI_NOT_FOUND is returned.  If the previous Handle was the last handle\r

   it is set to NULL before returning.\r
 \r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
   it is set to NULL before returning.\r
 \r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r


@@ -527,8 +527,8 @@ EFI_STATUS
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r

-  This function skips the next SkipNum handles in the handle database.  If there \r
-  are not enough handles left to skip that many EFI_ACCESS_DENIED is returned and \r
+  This function skips the next SkipNum handles in the handle database.  If there\r
+  are not enough handles left to skip that many EFI_ACCESS_DENIED is returned and\r

   no skip is performed.\r
 \r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
   no skip is performed.\r
 \r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r


@@ -547,9 +547,9 @@ EFI_STATUS
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r

-  This function resets the the handle database so that NEXT_HANDLE and SKIP_HANDLE \r
-  will start from EnumIndex on the next call. \r
-  \r
+  This function resets the the handle database so that NEXT_HANDLE and SKIP_HANDLE\r
+  will start from EnumIndex on the next call.\r
+\r

   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
 \r
   @param EnumIndex              Where to start.\r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
 \r
   @param EnumIndex              Where to start.\r


@@ -564,11 +564,11 @@ UINTN
 \r
 /**\r
   This is an internal shell function to enumerate the handle database.\r
 \r
 /**\r
   This is an internal shell function to enumerate the handle database.\r

-  \r
+\r

   This must be called after INIT_HANDLE_ENUMERATOR.\r
 \r
   This function releases all memory and resources associated with the handle database.\r
   This must be called after INIT_HANDLE_ENUMERATOR.\r
 \r
   This function releases all memory and resources associated with the handle database.\r

-  Tfter this no other handle enumerator functions except INIT_HANDLE_ENUMERATOR will \r
+  Tfter this no other handle enumerator functions except INIT_HANDLE_ENUMERATOR will\r

   function properly.\r
 **/\r
 typedef\r
   function properly.\r
 **/\r
 typedef\r


@@ -581,7 +581,7 @@ VOID
   This is an internal shell function to enumerate the handle database.\r
 \r
   This function returns the number of handles in the handle database.\r
   This is an internal shell function to enumerate the handle database.\r
 \r
   This function returns the number of handles in the handle database.\r

-  \r
+\r

   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
 \r
   @return the number of handles in the handle database.\r
   This must be called after INIT_HANDLE_ENUMERATOR and before CLOSE_HANDLE_ENUMERATOR.\r
 \r
   @return the number of handles in the handle database.\r


@@ -636,7 +636,7 @@ typedef struct {
 /**\r
   This is an internal shell function to initialize the protocol enumerator.\r
 \r
 /**\r
   This is an internal shell function to initialize the protocol enumerator.\r
 \r

-  This must be called before NEXT_PROTOCOL_INFO, SKIP_PROTOCOL_INFO, \r
+  This must be called before NEXT_PROTOCOL_INFO, SKIP_PROTOCOL_INFO,\r

   RESET_PROTOCOL_INFO_ENUMERATOR, and CLOSE_PROTOCOL_INFO_ENUMERATOR are\r
   called.\r
 **/\r
   RESET_PROTOCOL_INFO_ENUMERATOR, and CLOSE_PROTOCOL_INFO_ENUMERATOR are\r
   called.\r
 **/\r


@@ -647,13 +647,13 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is an internal shell function for enumeration of protocols.  \r
+  This function is an internal shell function for enumeration of protocols.\r

 \r
 \r

-  This functiol will return the next protocol in the list.  If this is called \r
+  This functiol will return the next protocol in the list.  If this is called\r

   immediately after initialization it will return the first.  If this is called\r
   immediately after reset it will return the protocol first again.\r
 \r
   immediately after initialization it will return the first.  If this is called\r
   immediately after reset it will return the protocol first again.\r
 \r

-  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be \r
+  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be\r

   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r
   @param ProtocolInfo           Pointer to pointer to protocol information structure.\r
   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r
   @param ProtocolInfo           Pointer to pointer to protocol information structure.\r


@@ -668,9 +668,9 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is an internal shell function for enumeration of protocols.  \r
+  This function is an internal shell function for enumeration of protocols.\r

 \r
 \r

-  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be \r
+  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be\r

   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r
   This function does nothing and always returns EFI_SUCCESS.\r
   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r
   This function does nothing and always returns EFI_SUCCESS.\r


@@ -684,12 +684,12 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is an internal shell function for enumeration of protocols.  \r
+  This function is an internal shell function for enumeration of protocols.\r

 \r
 \r

-  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be \r
+  This cannot be called after CLOSE_PROTOCOL_INFO_ENUMERATOR, but it must be\r

   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r
   called after INIT_PROTOCOL_INFO_ENUMERATOR.\r
 \r

-  This function resets the list of protocols such that the next one in the \r
+  This function resets the list of protocols such that the next one in the\r

   list is the begining of the list.\r
 **/\r
 typedef\r
   list is the begining of the list.\r
 **/\r
 typedef\r


@@ -700,7 +700,7 @@ VOID
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This function is an internal shell function for enumeration of protocols.  \r
+  This function is an internal shell function for enumeration of protocols.\r

 \r
   This must be called after INIT_PROTOCOL_INFO_ENUMERATOR.  After this call\r
   no protocol enumerator calls except INIT_PROTOCOL_INFO_ENUMERATOR may be made.\r
 \r
   This must be called after INIT_PROTOCOL_INFO_ENUMERATOR.  After this call\r
   no protocol enumerator calls except INIT_PROTOCOL_INFO_ENUMERATOR may be made.\r


@@ -726,22 +726,22 @@ typedef struct {
 } PROTOCOL_INFO_ENUMERATOR;\r
 \r
 /**\r
 } PROTOCOL_INFO_ENUMERATOR;\r
 \r
 /**\r

-  This function is used to retrieve a user-friendly display name for a handle.  \r
+  This function is used to retrieve a user-friendly display name for a handle.\r

 \r
 \r

-  If UseComponentName is TRUE then the component name protocol for this device \r
-  or it's parent device (if required) will be used to obtain the name of the \r
+  If UseComponentName is TRUE then the component name protocol for this device\r
+  or it's parent device (if required) will be used to obtain the name of the\r

   device.  If UseDevicePath is TRUE it will get the human readable device path\r
   and return that.  If both are TRUE it will try to use component name first\r
   device.  If UseDevicePath is TRUE it will get the human readable device path\r
   and return that.  If both are TRUE it will try to use component name first\r

-  and device path if that fails. \r
+  and device path if that fails.\r

 \r
 \r

-  It will use either ComponentName or ComponentName2 protocol, depending on \r
+  It will use either ComponentName or ComponentName2 protocol, depending on\r

   what is present.\r
 \r
   This function will furthur verify whether the handle in question produced either\r
   what is present.\r
 \r
   This function will furthur verify whether the handle in question produced either\r

-  EFI_DRIVER_CONFIGRATION_PROTOCOL or EFI_DRIVER_CONFIGURATION2_PROTOCOL and also \r
-  whether the handle in question produced either EFI_DRIVER_DIAGNOSTICS_PROTOCOL or \r
+  EFI_DRIVER_CONFIGRATION_PROTOCOL or EFI_DRIVER_CONFIGURATION2_PROTOCOL and also\r
+  whether the handle in question produced either EFI_DRIVER_DIAGNOSTICS_PROTOCOL or\r

   EFI_DRIVER_DIAGNOSTICS2_PROTOCOL.\r
   EFI_DRIVER_DIAGNOSTICS2_PROTOCOL.\r

-  \r
+\r

   Upon sucessful return the memory for *BestDeviceName is up to the caller to free.\r
 \r
   @param DeviceHandle           The device handle whose name is desired.\r
   Upon sucessful return the memory for *BestDeviceName is up to the caller to free.\r
 \r
   @param DeviceHandle           The device handle whose name is desired.\r


@@ -774,10 +774,10 @@ EFI_STATUS
 #define EFI_SHELL_ENHANCED_MODE_VER   L"1.1.2" ///< string for highest version this shell supports\r
 \r
 /**\r
 #define EFI_SHELL_ENHANCED_MODE_VER   L"1.1.2" ///< string for highest version this shell supports\r
 \r
 /**\r

-  This function gets the shell mode as stored in the shell environment \r
+  This function gets the shell mode as stored in the shell environment\r

   "efishellmode".  It will not fail.\r
 \r
   "efishellmode".  It will not fail.\r
 \r

-  @param Mode                   Returns a string representing one of the \r
+  @param Mode                   Returns a string representing one of the\r

                                 2 supported modes of the shell.\r
 \r
   @retval EFI_SUCCESS           This function always returns success.\r
                                 2 supported modes of the shell.\r
 \r
   @retval EFI_SUCCESS           This function always returns success.\r


@@ -792,17 +792,17 @@ EFI_STATUS
   Convert a file system style name to a device path.\r
 \r
   This function will convert a shell path name to a Device Path Protocol path.\r
   Convert a file system style name to a device path.\r
 \r
   This function will convert a shell path name to a Device Path Protocol path.\r

-  This function will allocate any required memory for this operation and it \r
+  This function will allocate any required memory for this operation and it\r

   is the responsibility of the caller to free that memory when no longer required.\r
 \r
   is the responsibility of the caller to free that memory when no longer required.\r
 \r

-  If anything prevents the complete conversion free any allocated memory and \r
+  If anything prevents the complete conversion free any allocated memory and\r

   return NULL.\r
 \r
   @retval !NULL                 A pointer to the callee allocated Device Path.\r
   @retval NULL                  The operation could not be completed.\r
 **/\r
   return NULL.\r
 \r
   @retval !NULL                 A pointer to the callee allocated Device Path.\r
   @retval NULL                  The operation could not be completed.\r
 **/\r

-typedef \r
-EFI_DEVICE_PATH_PROTOCOL* \r
+typedef\r
+EFI_DEVICE_PATH_PROTOCOL*\r

 (EFIAPI *SHELLENV_NAME_TO_PATH) (\r
   IN CHAR16 *Path\r
   );\r
 (EFIAPI *SHELLENV_NAME_TO_PATH) (\r
   IN CHAR16 *Path\r
   );\r


@@ -813,19 +813,19 @@ EFI_DEVICE_PATH_PROTOCOL*
   If DevPath is NULL, then ASSERT.\r
 \r
   This function looks through the shell environment map for a map whose device\r
   If DevPath is NULL, then ASSERT.\r
 \r
   This function looks through the shell environment map for a map whose device\r

-  path matches the DevPath parameter.  If one is found the Name is returned via \r
+  path matches the DevPath parameter.  If one is found the Name is returned via\r

   Name parameter.  If sucessful the caller must free the memory allocated for\r
   Name.\r
 \r
   Name parameter.  If sucessful the caller must free the memory allocated for\r
   Name.\r
 \r

-  This function will use the internal lock to prevent changes to the map during \r
+  This function will use the internal lock to prevent changes to the map during\r

   the lookup operation.\r
   the lookup operation.\r

-  \r
+\r

   @param DevPath                The device path to search for a name for.\r
   @param ConsistMapping         What state to verify map flag VAR_ID_CONSIST.\r
   @param Name                   On sucessful return the name of that device path.\r
 \r
   @retval EFI_SUCCESS           The DevPath was found and the name returned\r
   @param DevPath                The device path to search for a name for.\r
   @param ConsistMapping         What state to verify map flag VAR_ID_CONSIST.\r
   @param Name                   On sucessful return the name of that device path.\r
 \r
   @retval EFI_SUCCESS           The DevPath was found and the name returned\r

-                                in Name.  \r
+                                in Name.\r

   @retval EFI_OUT_OF_RESOURCES  A required memory allocation failed.\r
   @retval EFI_UNSUPPORTED       The DevPath was not found in the map.\r
 **/\r
   @retval EFI_OUT_OF_RESOURCES  A required memory allocation failed.\r
   @retval EFI_UNSUPPORTED       The DevPath was not found in the map.\r
 **/\r


@@ -838,17 +838,17 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function will open a group of files that match the Arg path, but will not \r
-  support the wildcard characters ('?' and '*') in the Arg path.  If there are \r
-  any wildcard characters in the path this function will return \r
-  EFI_INVALID_PARAMETER.  The return is a double linked list based on the \r
-  LIST_ENTRY linked list structure.  Use this in conjunction with the \r
+  This function will open a group of files that match the Arg path, but will not\r
+  support the wildcard characters ('?' and '*') in the Arg path.  If there are\r
+  any wildcard characters in the path this function will return\r
+  EFI_INVALID_PARAMETER.  The return is a double linked list based on the\r
+  LIST_ENTRY linked list structure.  Use this in conjunction with the\r

   SHELL_FILE_ARG_SIGNATURE to get the SHELL_FILE_ARG structures that are returned.\r
   SHELL_FILE_ARG_SIGNATURE to get the SHELL_FILE_ARG structures that are returned.\r

-  The memory allocated by the callee for this list is freed by making a call to \r
+  The memory allocated by the callee for this list is freed by making a call to\r

   SHELLENV_FREE_FILE_LIST.\r
 \r
   @param Arg                    Pointer Path to files to open.\r
   SHELLENV_FREE_FILE_LIST.\r
 \r
   @param Arg                    Pointer Path to files to open.\r

-  @param ListHead               Pointer to allocated and initialized list head \r
+  @param ListHead               Pointer to allocated and initialized list head\r

                                 upon which to append all the opened file structures.\r
 \r
   @retval EFI_SUCCESS           1 or more files was opened and a struct of each file's\r
                                 upon which to append all the opened file structures.\r
 \r
   @retval EFI_SUCCESS           1 or more files was opened and a struct of each file's\r


@@ -867,12 +867,12 @@ EFI_STATUS
 /**\r
   This function removes duplicate file listings from lists.\r
 \r
 /**\r
   This function removes duplicate file listings from lists.\r
 \r

-  This is a function for use with SHELLENV_FILE_META_ARG_NO_WILDCARD and \r
+  This is a function for use with SHELLENV_FILE_META_ARG_NO_WILDCARD and\r

   SHELLENV_FILE_META_ARG.  This function will verify that there are no duplicate\r
   files in the list of returned files.  Any file listed twice will have one of its\r
   instances removed.\r
 \r
   SHELLENV_FILE_META_ARG.  This function will verify that there are no duplicate\r
   files in the list of returned files.  Any file listed twice will have one of its\r
   instances removed.\r
 \r

-  @param ListHead               Pointer to linked list head that was returned from \r
+  @param ListHead               Pointer to linked list head that was returned from\r

                                 SHELLENV_FILE_META_ARG_NO_WILDCARD or\r
                                 SHELLENV_FILE_META_ARG.\r
 \r
                                 SHELLENV_FILE_META_ARG_NO_WILDCARD or\r
                                 SHELLENV_FILE_META_ARG.\r
 \r


@@ -890,20 +890,20 @@ EFI_STATUS
 \r
   if DevPath is NULL, then ASSERT().\r
 \r
 \r
   if DevPath is NULL, then ASSERT().\r
 \r

-  This function looks through the shell environment map for a map whose Name \r
-  matches the Name parameter.  If one is found the device path pointer is \r
-  updated to point to that file systems device path.  The caller should not \r
+  This function looks through the shell environment map for a map whose Name\r
+  matches the Name parameter.  If one is found the device path pointer is\r
+  updated to point to that file systems device path.  The caller should not\r

   free the memory from that device path.\r
 \r
   free the memory from that device path.\r
 \r

-  This function will use the internal lock to prevent changes to the map during \r
+  This function will use the internal lock to prevent changes to the map during\r

   the lookup operation.\r
 \r
   the lookup operation.\r
 \r

-  @param Name                   Pointer to NULL terminated UNICODE string of the \r
+  @param Name                   Pointer to NULL terminated UNICODE string of the\r

                                 file system name.\r
                                 file system name.\r

-  @param DevPath                Pointer to pointer to DevicePath.  only valid on \r
+  @param DevPath                Pointer to pointer to DevicePath.  only valid on\r

                                 OUT if sucessful.\r
 \r
                                 OUT if sucessful.\r
 \r

-  @retval EFI_SUCCESS           The conversion was successful and the device \r
+  @retval EFI_SUCCESS           The conversion was successful and the device\r

                                 path was returned.\r
   @retval EFI_NOT_FOUND         The file system could not be found in the map.\r
 **/\r
                                 path was returned.\r
   @retval EFI_NOT_FOUND         The file system could not be found in the map.\r
 **/\r

diff --git a/ShellPkg/Include/Protocol/EfiShellInterface.h b/ShellPkg/Include/Protocol/EfiShellInterface.h
index b5a514d60e104afd9c6809d8d6ab76f988480b7a..4e6e641ff7c9bb4b0367783e9f9cb6074f4d385b 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShellInterface.h
+++ b/ShellPkg/Include/Protocol/EfiShellInterface.h
@@ -11,15 +11,15 @@
   The shell interface's and data (including ConIo) are only valid during\r
   the applications Entry Point.  Once the application returns from it's\r
   entry point the data is freed by the invoking shell.\r
   The shell interface's and data (including ConIo) are only valid during\r
   the applications Entry Point.  Once the application returns from it's\r
   entry point the data is freed by the invoking shell.\r

-  \r
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
-  All rights reserved. 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
+\r
+  Copyright (c) 2006 - 2010, 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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/ShellPkg/Include/Protocol/EfiShellParameters.h b/ShellPkg/Include/Protocol/EfiShellParameters.h
index dcf4b72ad39ddcaee4592acb938361413a9f94a3..32d8379d3b50b4bbd68348ac227231348452f5f5 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShellParameters.h
+++ b/ShellPkg/Include/Protocol/EfiShellParameters.h
@@ -1,14 +1,14 @@
 /** @file\r
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification.\r
 /** @file\r
   EFI Shell protocol as defined in the UEFI Shell 2.0 specification.\r

-  \r
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
-  All rights reserved. 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
 \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
+  Copyright (c) 2006 - 2010, 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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -22,7 +22,7 @@
 \r
 typedef struct _EFI_SHELL_PARAMETERS_PROTOCOL {\r
   ///\r
 \r
 typedef struct _EFI_SHELL_PARAMETERS_PROTOCOL {\r
   ///\r

-  /// Points to an Argc-element array of points to null-terminated strings containing\r
+  /// Points to an Argc-element array of points to NULL-terminated strings containing\r

   /// the command-line parameters. The first entry in the array is always the full file\r
   /// path of the executable. Any quotation marks that were used to preserve\r
   /// whitespace have been removed.\r
   /// the command-line parameters. The first entry in the array is always the full file\r
   /// path of the executable. Any quotation marks that were used to preserve\r
   /// whitespace have been removed.\r


@@ -31,7 +31,7 @@ typedef struct _EFI_SHELL_PARAMETERS_PROTOCOL {
 \r
   ///\r
   /// The number of elements in the Argv array.\r
 \r
   ///\r
   /// The number of elements in the Argv array.\r

-  /// \r
+  ///\r

   UINTN Argc;\r
 \r
   ///\r
   UINTN Argc;\r
 \r
   ///\r

diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
index d5f0b03eec30db1ff19671aecb0dde89715662f2..b7180b299821d1a076a5b46371de2f9691a3bc5c 100644 (file)
--- a/ShellPkg/Include/ShellBase.h
+++ b/ShellPkg/Include/ShellBase.h
@@ -1,14 +1,14 @@
 /** @file\r
   Root include file for Shell Package modules that utilize the SHELL_RETURN type\r
 \r
 /** @file\r
   Root include file for Shell Package modules that utilize the SHELL_RETURN type\r
 \r

-Copyright (c), 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -70,7 +70,7 @@ SHELL_WRITE_PROTECTED       = 8,
 SHELL_OUT_OF_RESOURCES      = 9,\r
 \r
 ///\r
 SHELL_OUT_OF_RESOURCES      = 9,\r
 \r
 ///\r

-/// An inconsistency was detected on the file system causing the \r
+/// An inconsistency was detected on the file system causing the\r

 /// operation to fail.\r
 ///\r
 SHELL_VOLUME_CORRUPTED      = 10,\r
 /// operation to fail.\r
 ///\r
 SHELL_VOLUME_CORRUPTED      = 10,\r


@@ -81,7 +81,7 @@ SHELL_VOLUME_CORRUPTED      = 10,
 SHELL_VOLUME_FULL           = 11,\r
 \r
 ///\r
 SHELL_VOLUME_FULL           = 11,\r
 \r
 ///\r

-/// The device does not contain any medium to perform the \r
+/// The device does not contain any medium to perform the\r

 /// operation.\r
 ///\r
 SHELL_NO_MEDIA              = 12,\r
 /// operation.\r
 ///\r
 SHELL_NO_MEDIA              = 12,\r

diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
index 141b55d39c0e1326f5472249418bc717dae3e502..d689a861ca61f2c9aad6273be7c9c57b82c1fe95 100644 (file)
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 # Provides interface to shell functionality for shell commands and applications.\r
 #\r
 #/** @file\r
 # Provides interface to shell functionality for shell commands and applications.\r
 #\r

-# Copyright (c) 2006 - 2009, Intel Corporation.\r
+# Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -42,7 +42,7 @@
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid             # ALWAYS_USED\r
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid             # ALWAYS_USED\r

-  \r
+\r

 [Guids]\r
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED\r
 \r
 [Guids]\r
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED\r
 \r

diff --git a/ShellPkg/Library/BaseSortLib/BaseSortLib.c b/ShellPkg/Library/BaseSortLib/BaseSortLib.c
index a7b37a0f550573a3c7b9a5b8e178731ab155fe38..eaee544d3d61ce8a56fb7d801465d60cb08f0cbd 100644 (file)
--- a/ShellPkg/Library/BaseSortLib/BaseSortLib.c
+++ b/ShellPkg/Library/BaseSortLib/BaseSortLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Library used for sorting routines.\r
 \r
 /** @file\r
   Library used for sorting routines.\r
 \r

-Copyright (c) 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -18,11 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

-#include <Library/SortLib.h> \r
+#include <Library/SortLib.h>\r

 \r
 /**\r
 \r
 /**\r

-  Worker function for QuickSorting.  This function is identical to PerformQuickSort, \r
-  except that is uses the pre-allocated buffer so the in place sorting does not need to \r
+  Worker function for QuickSorting.  This function is identical to PerformQuickSort,\r
+  except that is uses the pre-allocated buffer so the in place sorting does not need to\r

   allocate and free buffers constantly.\r
 \r
   Each element must be equal sized.\r
   allocate and free buffers constantly.\r
 \r
   Each element must be equal sized.\r


@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r

-  @param[in] CompareFunction    The function to call to perform the comparison \r
+  @param[in] CompareFunction    The function to call to perform the comparison\r

                                 of any 2 elements\r
   @param[in] Buffer             Buffer of size ElementSize for use in swapping\r
 **/\r
                                 of any 2 elements\r
   @param[in] Buffer             Buffer of size ElementSize for use in swapping\r
 **/\r


@@ -60,7 +60,7 @@ QuickSortWorker (
   ASSERT(CompareFunction  != NULL);\r
   ASSERT(Buffer  != NULL);\r
 \r
   ASSERT(CompareFunction  != NULL);\r
   ASSERT(Buffer  != NULL);\r
 \r

-  if ( Count < 2 \r
+  if ( Count < 2\r

     || ElementSize  < 1\r
     ){\r
     return;\r
     || ElementSize  < 1\r
     ){\r
     return;\r


@@ -78,7 +78,7 @@ QuickSortWorker (
   // and everything "right" are above it\r
   //\r
   for ( LoopCount = 0\r
   // and everything "right" are above it\r
   //\r
   for ( LoopCount = 0\r

-      ; LoopCount < Count -1 \r
+      ; LoopCount < Count -1\r

       ; LoopCount++\r
       ){\r
     //\r
       ; LoopCount++\r
       ){\r
     //\r


@@ -86,7 +86,7 @@ QuickSortWorker (
     //\r
     if (CompareFunction((VOID*)((UINT8*)BufferToSort+((LoopCount)*ElementSize)),Pivot) <= 0){\r
       //\r
     //\r
     if (CompareFunction((VOID*)((UINT8*)BufferToSort+((LoopCount)*ElementSize)),Pivot) <= 0){\r
       //\r

-      // swap \r
+      // swap\r

       //\r
       CopyMem (Buffer, (UINT8*)BufferToSort+(NextSwapLocation*ElementSize), ElementSize);\r
       CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), (UINT8*)BufferToSort+((LoopCount)*ElementSize), ElementSize);\r
       //\r
       CopyMem (Buffer, (UINT8*)BufferToSort+(NextSwapLocation*ElementSize), ElementSize);\r
       CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), (UINT8*)BufferToSort+((LoopCount)*ElementSize), ElementSize);\r


@@ -94,7 +94,7 @@ QuickSortWorker (
 \r
       //\r
       // increment NextSwapLocation\r
 \r
       //\r
       // increment NextSwapLocation\r

-      // \r
+      //\r

       NextSwapLocation++;\r
     }\r
   }\r
       NextSwapLocation++;\r
     }\r
   }\r


@@ -106,20 +106,20 @@ QuickSortWorker (
   CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), Buffer, ElementSize);\r
 \r
   //\r
   CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), Buffer, ElementSize);\r
 \r
   //\r

-  // Now recurse on 2 paritial lists.  neither of these will have the 'pivot' element \r
+  // Now recurse on 2 paritial lists.  neither of these will have the 'pivot' element\r

   // IE list is sorted left half, pivot element, sorted right half...\r
   //\r
   QuickSortWorker(\r
   // IE list is sorted left half, pivot element, sorted right half...\r
   //\r
   QuickSortWorker(\r

-    BufferToSort, \r
-    NextSwapLocation, \r
-    ElementSize, \r
+    BufferToSort,\r
+    NextSwapLocation,\r
+    ElementSize,\r

     CompareFunction,\r
     Buffer);\r
 \r
   QuickSortWorker(\r
     (UINT8 *)BufferToSort + (NextSwapLocation+1) * ElementSize,\r
     CompareFunction,\r
     Buffer);\r
 \r
   QuickSortWorker(\r
     (UINT8 *)BufferToSort + (NextSwapLocation+1) * ElementSize,\r

-    Count - NextSwapLocation - 1, \r
-    ElementSize, \r
+    Count - NextSwapLocation - 1,\r
+    ElementSize,\r

     CompareFunction,\r
     Buffer);\r
 \r
     CompareFunction,\r
     Buffer);\r
 \r


@@ -140,7 +140,7 @@ QuickSortWorker (
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r

-  @param[in] CompareFunction    The function to call to perform the comparison \r
+  @param[in] CompareFunction    The function to call to perform the comparison\r

                                 of any 2 elements\r
 **/\r
 VOID\r
                                 of any 2 elements\r
 **/\r
 VOID\r


@@ -173,7 +173,7 @@ PerformQuickSort (
 \r
 /**\r
   Not supported in Base version.\r
 \r
 /**\r
   Not supported in Base version.\r

-  \r
+\r

   ASSERT and return 0.\r
 **/\r
 INTN\r
   ASSERT and return 0.\r
 **/\r
 INTN\r


@@ -194,7 +194,7 @@ DevicePathCompare (
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r

-  @return > 0                   Buffer1 is greater than Buffer2.                 \r
+  @return > 0                   Buffer1 is greater than Buffer2.\r

 **/\r
 INTN\r
 EFIAPI\r
 **/\r
 INTN\r
 EFIAPI\r

diff --git a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
index 3ce3b9f98d7ced0728b8cffc286d4dd9d530c74e..dc7b12365a54ecc86f5d9c129ec4e14060e970ac 100644 (file)
--- a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
+++ b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 #   Library used for sorting routines.\r
 #\r
 #/** @file\r
 #   Library used for sorting routines.\r
 #\r

-# Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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

diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
index 978edcf42c2452d2086090ee8a041429b8676812..6160df576a10aada5104db504ed235d3e3ccebb2 100644 (file)
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  Provides application point extension for "C" style main funciton \r
+  Provides application point extension for "C" style main funciton\r

 \r
 \r

-Copyright (c) 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -53,7 +53,7 @@ ShellCEntryLib (
   EfiShellParametersProtocol = NULL;\r
   EfiShellInterface = NULL;\r
 \r
   EfiShellParametersProtocol = NULL;\r
   EfiShellInterface = NULL;\r
 \r

-  Status = SystemTable->BootServices->OpenProtocol(ImageHandle, \r
+  Status = SystemTable->BootServices->OpenProtocol(ImageHandle,\r

                              &gEfiShellParametersProtocolGuid,\r
                              (VOID **)&EfiShellParametersProtocol,\r
                              ImageHandle,\r
                              &gEfiShellParametersProtocolGuid,\r
                              (VOID **)&EfiShellParametersProtocol,\r
                              ImageHandle,\r


@@ -72,7 +72,7 @@ ShellCEntryLib (
     //\r
     // try to get shell 1.0 interface instead.\r
     //\r
     //\r
     // try to get shell 1.0 interface instead.\r
     //\r

-    Status = SystemTable->BootServices->OpenProtocol(ImageHandle, \r
+    Status = SystemTable->BootServices->OpenProtocol(ImageHandle,\r

                                &gEfiShellInterfaceGuid,\r
                                (VOID **)&EfiShellInterface,\r
                                ImageHandle,\r
                                &gEfiShellInterfaceGuid,\r
                                (VOID **)&EfiShellInterface,\r
                                ImageHandle,\r


@@ -82,7 +82,7 @@ ShellCEntryLib (
     if (!EFI_ERROR(Status)) {\r
       //\r
       // use shell 1.0 interface\r
     if (!EFI_ERROR(Status)) {\r
       //\r
       // use shell 1.0 interface\r

-      // \r
+      //\r

       ReturnFromMain = ShellAppMain (\r
                          EfiShellInterface->Argc,\r
                          EfiShellInterface->Argv\r
       ReturnFromMain = ShellAppMain (\r
                          EfiShellInterface->Argc,\r
                          EfiShellInterface->Argv\r

diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
index 15a744ff8876aa72b61eea0683f4e67a8b72538a..8cb3b59b9138696c58a959b87fcaeb99879fcbf8 100644 (file)
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 #/** @file\r

-# Provides interface to shell functionality for shell commands and applications.\r
+#  Provides interface to shell functionality for shell commands and applications.\r

 #\r
 #\r

-# Copyright (c) 2006 - 2009, Intel Corporation.\r
+#  Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index db46b80f9aa2868a5143509b548ea115b2e9e74e..f105176bf69b89f81bf873c374e1c12ef1cf20bf 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -1,8 +1,8 @@
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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


@@ -40,8 +40,8 @@ STATIC CHAR16                        *mPostReplaceFormat2;
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r
 /**\r
   Check if a Unicode character is a hexadecimal character.\r
 \r

-  This internal function checks if a Unicode character is a \r
-  decimal character.  The valid hexadecimal character is \r
+  This internal function checks if a Unicode character is a\r
+  decimal character.  The valid hexadecimal character is\r

   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r
   L'0' to L'9', L'a' to L'f', or L'A' to L'F'.\r
 \r
 \r


@@ -74,7 +74,7 @@ ShellFindSE2 (
 \r
   BufferSize = 0;\r
   Buffer = NULL;\r
 \r
   BufferSize = 0;\r
   Buffer = NULL;\r

-  Status = gBS->OpenProtocol(ImageHandle, \r
+  Status = gBS->OpenProtocol(ImageHandle,\r

                              &gEfiShellEnvironment2Guid,\r
                              (VOID **)&mEfiShellEnvironment2,\r
                              ImageHandle,\r
                              &gEfiShellEnvironment2Guid,\r
                              (VOID **)&mEfiShellEnvironment2,\r
                              ImageHandle,\r


@@ -113,7 +113,7 @@ ShellFindSE2 (
       //\r
       Status = EFI_NOT_FOUND;\r
       for (HandleIndex = 0; HandleIndex < (BufferSize/sizeof(Buffer[0])); HandleIndex++) {\r
       //\r
       Status = EFI_NOT_FOUND;\r
       for (HandleIndex = 0; HandleIndex < (BufferSize/sizeof(Buffer[0])); HandleIndex++) {\r

-        Status = gBS->OpenProtocol(Buffer[HandleIndex], \r
+        Status = gBS->OpenProtocol(Buffer[HandleIndex],\r

                                    &gEfiShellEnvironment2Guid,\r
                                    (VOID **)&mEfiShellEnvironment2,\r
                                    ImageHandle,\r
                                    &gEfiShellEnvironment2Guid,\r
                                    (VOID **)&mEfiShellEnvironment2,\r
                                    ImageHandle,\r


@@ -156,7 +156,7 @@ ShellLibConstructorWorker (
   //\r
   // UEFI 2.0 shell interfaces (used preferentially)\r
   //\r
   //\r
   // UEFI 2.0 shell interfaces (used preferentially)\r
   //\r

-  Status = gBS->OpenProtocol(ImageHandle, \r
+  Status = gBS->OpenProtocol(ImageHandle,\r

                              &gEfiShellProtocolGuid,\r
                              (VOID **)&mEfiShellProtocol,\r
                              ImageHandle,\r
                              &gEfiShellProtocolGuid,\r
                              (VOID **)&mEfiShellProtocol,\r
                              ImageHandle,\r


@@ -166,7 +166,7 @@ ShellLibConstructorWorker (
   if (EFI_ERROR(Status)) {\r
     mEfiShellProtocol = NULL;\r
   }\r
   if (EFI_ERROR(Status)) {\r
     mEfiShellProtocol = NULL;\r
   }\r

-  Status = gBS->OpenProtocol(ImageHandle, \r
+  Status = gBS->OpenProtocol(ImageHandle,\r

                              &gEfiShellParametersProtocolGuid,\r
                              (VOID **)&mEfiShellParametersProtocol,\r
                              ImageHandle,\r
                              &gEfiShellParametersProtocolGuid,\r
                              (VOID **)&mEfiShellParametersProtocol,\r
                              ImageHandle,\r


@@ -187,7 +187,7 @@ ShellLibConstructorWorker (
       DEBUG((DEBUG_ERROR, "Status: 0x%08x\r\n", Status));\r
       mEfiShellEnvironment2 = NULL;\r
     }\r
       DEBUG((DEBUG_ERROR, "Status: 0x%08x\r\n", Status));\r
       mEfiShellEnvironment2 = NULL;\r
     }\r

-    Status = gBS->OpenProtocol(ImageHandle, \r
+    Status = gBS->OpenProtocol(ImageHandle,\r

                                &gEfiShellInterfaceGuid,\r
                                (VOID **)&mEfiShellInterface,\r
                                ImageHandle,\r
                                &gEfiShellInterfaceGuid,\r
                                (VOID **)&mEfiShellInterface,\r
                                ImageHandle,\r


@@ -201,7 +201,7 @@ ShellLibConstructorWorker (
   //\r
   // only success getting 2 of either the old or new, but no 1/2 and 1/2\r
   //\r
   //\r
   // 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
+  if ((mEfiShellEnvironment2 != NULL && mEfiShellInterface          != NULL) ||\r

       (mEfiShellProtocol     != NULL && mEfiShellParametersProtocol != NULL)    ) {\r
     if (mEfiShellProtocol != NULL) {\r
       FileFunctionMap.GetFileInfo     = mEfiShellProtocol->GetFileInfo;\r
       (mEfiShellProtocol     != NULL && mEfiShellParametersProtocol != NULL)    ) {\r
     if (mEfiShellProtocol != NULL) {\r
       FileFunctionMap.GetFileInfo     = mEfiShellProtocol->GetFileInfo;\r


@@ -259,11 +259,11 @@ ShellLibConstructor (
 \r
   //\r
   // verify that auto initialize is not set false\r
 \r
   //\r
   // verify that auto initialize is not set false\r

-  // \r
+  //\r

   if (PcdGetBool(PcdShellLibAutoInitialize) == 0) {\r
     return (EFI_SUCCESS);\r
   }\r
   if (PcdGetBool(PcdShellLibAutoInitialize) == 0) {\r
     return (EFI_SUCCESS);\r
   }\r

-  \r
+\r

   return (ShellLibConstructorWorker(ImageHandle, SystemTable));\r
 }\r
 \r
   return (ShellLibConstructorWorker(ImageHandle, SystemTable));\r
 }\r
 \r


@@ -287,21 +287,21 @@ ShellLibDestructor (
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellInterfaceGuid,\r
                        ImageHandle,\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellInterfaceGuid,\r
                        ImageHandle,\r

-                       NULL);  \r
+                       NULL);\r

     mEfiShellInterface = NULL;\r
   }\r
   if (mEfiShellProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellProtocolGuid,\r
                        ImageHandle,\r
     mEfiShellInterface = NULL;\r
   }\r
   if (mEfiShellProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellProtocolGuid,\r
                        ImageHandle,\r

-                       NULL);  \r
+                       NULL);\r

     mEfiShellProtocol = NULL;\r
   }\r
   if (mEfiShellParametersProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellParametersProtocolGuid,\r
                        ImageHandle,\r
     mEfiShellProtocol = NULL;\r
   }\r
   if (mEfiShellParametersProtocol != NULL) {\r
     gBS->CloseProtocol(ImageHandle,\r
                        &gEfiShellParametersProtocolGuid,\r
                        ImageHandle,\r

-                       NULL);    \r
+                       NULL);\r

     mEfiShellParametersProtocol = NULL;\r
   }\r
   mEfiShellEnvironment2Handle = NULL;\r
     mEfiShellParametersProtocol = NULL;\r
   }\r
   mEfiShellEnvironment2Handle = NULL;\r


@@ -354,13 +354,13 @@ ShellInitialize (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function will retrieve the information about the file for the handle \r
+  This function will retrieve the information about the file for the handle\r

   specified and store it in allocated pool memory.\r
 \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file's information. It is the \r
+  This function allocates a buffer to store the file's information. It is the\r

   caller's responsibility to free the buffer\r
 \r
   caller's responsibility to free the buffer\r
 \r

-  @param  FileHandle  The file handle of the file for which information is \r
+  @param  FileHandle  The file handle of the file for which information is\r

   being requested.\r
 \r
   @retval NULL information could not be retrieved.\r
   being requested.\r
 \r
   @retval NULL information could not be retrieved.\r


@@ -376,10 +376,10 @@ ShellGetFileInfo (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function will set the information about the file for the opened handle \r
+  This function will set the information about the file for the opened handle\r

   specified.\r
 \r
   specified.\r
 \r

-  @param  FileHandle            The file handle of the file for which information \r
+  @param  FileHandle            The file handle of the file for which information\r

   is being set\r
 \r
   @param  FileInfo              The infotmation to set.\r
   is being set\r
 \r
   @param  FileInfo              The infotmation to set.\r


@@ -400,15 +400,15 @@ ShellSetFileInfo (
   IN EFI_FILE_INFO              *FileInfo\r
   ) {\r
   return (FileFunctionMap.SetFileInfo(FileHandle, FileInfo));\r
   IN EFI_FILE_INFO              *FileInfo\r
   ) {\r
   return (FileFunctionMap.SetFileInfo(FileHandle, FileInfo));\r

-}  \r
-  \r
+}\r
+\r

   /**\r
   This function will open a file or directory referenced by DevicePath.\r
 \r
   /**\r
   This function will open a file or directory referenced by DevicePath.\r
 \r

-  This function opens a file with the open mode according to the file path. The \r
+  This function opens a file with the open mode according to the file path. The\r

   Attributes is valid only for EFI_FILE_MODE_CREATE.\r
 \r
   Attributes is valid only for EFI_FILE_MODE_CREATE.\r
 \r

-  @param  FilePath                 on input the device path to the file.  On output \r
+  @param  FilePath                 on input the device path to the file.  On output\r

                           the remaining device path.\r
   @param  DeviceHandle         pointer to the system device handle.\r
   @param  FileHandle             pointer to the file handle.\r
                           the remaining device path.\r
   @param  DeviceHandle         pointer to the system device handle.\r
   @param  FileHandle             pointer to the file handle.\r


@@ -417,18 +417,18 @@ ShellSetFileInfo (
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found on \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found on\r

                                 the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED    The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED    The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r


@@ -452,7 +452,7 @@ ShellOpenFileByDevicePath(
   ASSERT(FilePath != NULL);\r
   ASSERT(FileHandle != NULL);\r
   ASSERT(DeviceHandle != NULL);\r
   ASSERT(FilePath != NULL);\r
   ASSERT(FileHandle != NULL);\r
   ASSERT(DeviceHandle != NULL);\r

-  // \r
+  //\r

   // which shell interface should we use\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
   // which shell interface should we use\r
   //\r
   if (mEfiShellProtocol != NULL) {\r


@@ -466,14 +466,14 @@ ShellOpenFileByDevicePath(
     Status = ShellOpenFileByName(FileName, FileHandle, OpenMode, Attributes);\r
     FreePool(FileName);\r
     return (Status);\r
     Status = ShellOpenFileByName(FileName, FileHandle, OpenMode, Attributes);\r
     FreePool(FileName);\r
     return (Status);\r

-  } \r
+  }\r

 \r
 \r
   //\r
   // use old shell method.\r
   //\r
 \r
 \r
   //\r
   // use old shell method.\r
   //\r

-  Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, \r
-                                  FilePath, \r
+  Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid,\r
+                                  FilePath,\r

                                   DeviceHandle);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
                                   DeviceHandle);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r


@@ -555,8 +555,8 @@ ShellOpenFileByDevicePath(
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened file's handle; \r
-  otherwise, the Filehandle is NULL. The Attributes is valid only for \r
+  If return is EFI_SUCCESS, the Filehandle is the opened file's handle;\r
+  otherwise, the Filehandle is NULL. The Attributes is valid only for\r

   EFI_FILE_MODE_CREATE.\r
 \r
   if FileNAme is NULL then ASSERT()\r
   EFI_FILE_MODE_CREATE.\r
 \r
   if FileNAme is NULL then ASSERT()\r


@@ -568,18 +568,18 @@ ShellOpenFileByDevicePath(
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found\r

                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
 **/\r


@@ -616,7 +616,7 @@ ShellOpenFileByName(
       FreePool(FileInfo);\r
     }\r
     return (Status);\r
       FreePool(FileInfo);\r
     }\r
     return (Status);\r

-  } \r
+  }\r

   //\r
   // Using EFI Shell version\r
   // this means convert name to path and call that function\r
   //\r
   // Using EFI Shell version\r
   // this means convert name to path and call that function\r


@@ -636,8 +636,8 @@ ShellOpenFileByName(
 /**\r
   This function create a directory\r
 \r
 /**\r
   This function create a directory\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened directory's handle; \r
-  otherwise, the Filehandle is NULL. If the directory already existed, this \r
+  If return is EFI_SUCCESS, the Filehandle is the opened directory's handle;\r
+  otherwise, the Filehandle is NULL. If the directory already existed, this\r

   function opens the existing directory.\r
 \r
   @param  DirectoryName                pointer to directory name\r
   function opens the existing directory.\r
 \r
   @param  DirectoryName                pointer to directory name\r


@@ -645,18 +645,18 @@ ShellOpenFileByName(
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r
 \r
   @retval EFI_SUCCESS                  The information was set.\r
   @retval EFI_INVALID_PARAMETER        One of the parameters has an invalid value.\r

-  @retval EFI_UNSUPPORTED            Could not open the file path.     \r
-  @retval EFI_NOT_FOUND                The specified file could not be found on the \r
-                                device or the file system could not be found \r
+  @retval EFI_UNSUPPORTED            Could not open the file path.\r
+  @retval EFI_NOT_FOUND                The specified file could not be found on the\r
+                                device or the file system could not be found\r

                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r
                                 on the device.\r
   @retval EFI_NO_MEDIA               The device has no medium.\r

-  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the \r
+  @retval EFI_MEDIA_CHANGED        The device has a different medium in it or the\r

                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r
                                 medium is no longer supported.\r
   @retval EFI_DEVICE_ERROR         The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_WRITE_PROTECTED    The file or medium is write protected.\r
   @retval EFI_ACCESS_DENIED        The file was opened read only.\r

-  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the \r
+  @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open the\r

                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
   @sa ShellOpenFileByName\r
                                 file.\r
   @retval EFI_VOLUME_FULL            The volume is full.\r
   @sa ShellOpenFileByName\r


@@ -687,21 +687,21 @@ ShellCreateDirectory(
 /**\r
   This function reads information from an opened file.\r
 \r
 /**\r
   This function reads information from an opened file.\r
 \r

-  If FileHandle is not a directory, the function reads the requested number of \r
-  bytes from the file at the file's current position and returns them in Buffer. \r
+  If FileHandle is not a directory, the function reads the requested number of\r
+  bytes from the file at the file's current position and returns them in Buffer.\r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file's current position is increased by the number of bytes \r
-  returned.  If FileHandle is a directory, the function reads the directory entry \r
-  at the file's current position and returns the entry in Buffer. If the Buffer \r
-  is not large enough to hold the current directory entry, then \r
-  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
-  BufferSize is set to be the size of the buffer needed to read the entry. On \r
-  success, the current position is updated to the next directory entry. If there \r
-  are no more directory entries, the read returns a zero-length buffer. \r
+  end of the file. The file's current position is increased by the number of bytes\r
+  returned.  If FileHandle is a directory, the function reads the directory entry\r
+  at the file's current position and returns the entry in Buffer. If the Buffer\r
+  is not large enough to hold the current directory entry, then\r
+  EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated.\r
+  BufferSize is set to be the size of the buffer needed to read the entry. On\r
+  success, the current position is updated to the next directory entry. If there\r
+  are no more directory entries, the read returns a zero-length buffer.\r

   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param FileHandle             the opened file handle\r
   EFI_FILE_INFO is the structure returned as the directory entry.\r
 \r
   @param FileHandle             the opened file handle\r

-  @param BufferSize             on input the size of buffer in bytes.  on return \r
+  @param BufferSize             on input the size of buffer in bytes.  on return\r

                                 the number of bytes written.\r
   @param Buffer                 the buffer to put read data into.\r
 \r
                                 the number of bytes written.\r
   @param Buffer                 the buffer to put read data into.\r
 \r


@@ -709,7 +709,7 @@ ShellCreateDirectory(
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR     The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r
   @retval EFI_NO_MEDIA         The device has no media.\r
   @retval EFI_DEVICE_ERROR     The device reported an error.\r
   @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted.\r

-  @retval EFI_BUFFER_TO_SMALL  Buffer is too small. ReadSize contains required \r
+  @retval EFI_BUFFER_TO_SMALL  Buffer is too small. ReadSize contains required\r

                                 size.\r
 \r
 **/\r
                                 size.\r
 \r
 **/\r


@@ -727,11 +727,11 @@ ShellReadFile(
 /**\r
   Write data to a file.\r
 \r
 /**\r
   Write data to a file.\r
 \r

-  This function writes the specified number of bytes to the file at the current \r
-  file position. The current file position is advanced the actual number of bytes \r
-  written, which is returned in BufferSize. Partial writes only occur when there \r
-  has been a data error during the write attempt (such as "volume space full"). \r
-  The file is automatically grown to hold the data if required. Direct writes to \r
+  This function writes the specified number of bytes to the file at the current\r
+  file position. The current file position is advanced the actual number of bytes\r
+  written, which is returned in BufferSize. Partial writes only occur when there\r
+  has been a data error during the write attempt (such as "volume space full").\r
+  The file is automatically grown to hold the data if required. Direct writes to\r

   opened directories are not supported.\r
 \r
   @param FileHandle           The opened file for writing\r
   opened directories are not supported.\r
 \r
   @param FileHandle           The opened file for writing\r


@@ -758,11 +758,11 @@ ShellWriteFile(
   return (FileFunctionMap.WriteFile(FileHandle, BufferSize, Buffer));\r
 }\r
 \r
   return (FileFunctionMap.WriteFile(FileHandle, BufferSize, Buffer));\r
 }\r
 \r

-/** \r
+/**\r

   Close an open file handle.\r
 \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All "dirty" cached file data is \r
-  flushed to the device, and the file is closed. In all cases the handle is \r
+  This function closes a specified file handle. All "dirty" cached file data is\r
+  flushed to the device, and the file is closed. In all cases the handle is\r

   closed.\r
 \r
 @param FileHandle               the file handle to close.\r
   closed.\r
 \r
 @param FileHandle               the file handle to close.\r


@@ -781,13 +781,13 @@ ShellCloseFile (
   Delete a file and close the handle\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r
   Delete a file and close the handle\r
 \r
   This function closes and deletes a file. In all cases the file handle is closed.\r

-  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is \r
+  If the file cannot be deleted, the warning code EFI_WARN_DELETE_FAILURE is\r

   returned, but the handle is still closed.\r
 \r
   @param FileHandle             the file handle to delete\r
 \r
   @retval EFI_SUCCESS           the file was closed sucessfully\r
   returned, but the handle is still closed.\r
 \r
   @param FileHandle             the file handle to delete\r
 \r
   @retval EFI_SUCCESS           the file was closed sucessfully\r

-  @retval EFI_WARN_DELETE_FAILURE the handle was closed, but the file was not \r
+  @retval EFI_WARN_DELETE_FAILURE the handle was closed, but the file was not\r

                                 deleted\r
   @retval INVALID_PARAMETER            One of the parameters has an invalid value.\r
 **/\r
                                 deleted\r
   @retval INVALID_PARAMETER            One of the parameters has an invalid value.\r
 **/\r


@@ -802,19 +802,19 @@ ShellDeleteFile (
 /**\r
   Set the current position in a file.\r
 \r
 /**\r
   Set the current position in a file.\r
 \r

-  This function sets the current file position for the handle to the position \r
+  This function sets the current file position for the handle to the position\r

   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r
   supplied. With the exception of seeking to position 0xFFFFFFFFFFFFFFFF, only\r

-  absolute positioning is supported, and seeking past the end of the file is \r
-  allowed (a subsequent write would grow the file). Seeking to position \r
+  absolute positioning is supported, and seeking past the end of the file is\r
+  allowed (a subsequent write would grow the file). Seeking to position\r

   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r
   0xFFFFFFFFFFFFFFFF causes the current position to be set to the end of the file.\r

-  If FileHandle is a directory, the only position that may be set is zero. This \r
+  If FileHandle is a directory, the only position that may be set is zero. This\r

   has the effect of starting the read process of the directory entries over.\r
 \r
   @param FileHandle             The file handle on which the position is being set\r
   @param Position               Byte position from begining of file\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r
   has the effect of starting the read process of the directory entries over.\r
 \r
   @param FileHandle             The file handle on which the position is being set\r
   @param Position               Byte position from begining of file\r
 \r
   @retval EFI_SUCCESS           Operation completed sucessfully.\r

-  @retval EFI_UNSUPPORTED       the seek request for non-zero is not valid on \r
+  @retval EFI_UNSUPPORTED       the seek request for non-zero is not valid on\r

                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r
                                 directories.\r
   @retval INVALID_PARAMETER     One of the parameters has an invalid value.\r
 **/\r


@@ -827,11 +827,11 @@ ShellSetFilePosition (
   return (FileFunctionMap.SetFilePosition(FileHandle, Position));\r
 }\r
 \r
   return (FileFunctionMap.SetFilePosition(FileHandle, Position));\r
 }\r
 \r

-/** \r
+/**\r

   Gets a file's current position\r
 \r
   Gets a file's current position\r
 \r

-  This function retrieves the current file position for the file handle. For \r
-  directories, the current file position has no meaning outside of the file \r
+  This function retrieves the current file position for the file handle. For\r
+  directories, the current file position has no meaning outside of the file\r

   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r
   system driver and as such the operation is not supported. An error is returned\r
   if FileHandle is a directory.\r
 \r


@@ -852,7 +852,7 @@ ShellGetFilePosition (
 }\r
 /**\r
   Flushes data on a file\r
 }\r
 /**\r
   Flushes data on a file\r

-  \r
+\r

   This function flushes all modified data associated with a file to a device.\r
 \r
   @param FileHandle             The file handle on which to flush data\r
   This function flushes all modified data associated with a file to a device.\r
 \r
   @param FileHandle             The file handle on which to flush data\r


@@ -875,8 +875,8 @@ ShellFlushFile (
 /**\r
   Retrieves the first file from a directory\r
 \r
 /**\r
   Retrieves the first file from a directory\r
 \r

-  This function opens a directory and gets the first file's info in the \r
-  directory. Caller can use ShellFindNextFile() to get other files.  When \r
+  This function opens a directory and gets the first file's info in the\r
+  directory. Caller can use ShellFindNextFile() to get other files.  When\r

   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r
   @param DirHandle              The file handle of the directory to search\r
   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r
   @param DirHandle              The file handle of the directory to search\r


@@ -904,12 +904,12 @@ ShellFindFirstFile (
 /**\r
   Retrieves the next file in a directory.\r
 \r
 /**\r
   Retrieves the next file in a directory.\r
 \r

-  To use this function, caller must call the LibFindFirstFile() to get the \r
-  first file, and then use this function get other files. This function can be \r
-  called for several times to get each file's information in the directory. If \r
-  the call of ShellFindNextFile() got the last file in the directory, the next \r
-  call of this function has no file to get. *NoFile will be set to TRUE and the \r
-  Buffer memory will be automatically freed. \r
+  To use this function, caller must call the LibFindFirstFile() to get the\r
+  first file, and then use this function get other files. This function can be\r
+  called for several times to get each file's information in the directory. If\r
+  the call of ShellFindNextFile() got the last file in the directory, the next\r
+  call of this function has no file to get. *NoFile will be set to TRUE and the\r
+  Buffer memory will be automatically freed.\r

 \r
   @param DirHandle              the file handle of the directory\r
   @param Buffer                                    pointer to buffer for file's information\r
 \r
   @param DirHandle              the file handle of the directory\r
   @param Buffer                                    pointer to buffer for file's information\r


@@ -938,7 +938,7 @@ ShellFindNextFile(
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r

-  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO\r

   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r
   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r


@@ -969,7 +969,7 @@ ShellGetExecutionBreakFlag(
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r


@@ -981,7 +981,7 @@ ShellGetExecutionBreakFlag(
       return (FALSE);\r
     }\r
     return (TRUE);\r
       return (FALSE);\r
     }\r
     return (TRUE);\r

-  } \r
+  }\r

 \r
   //\r
   // using EFI Shell; call the function to check\r
 \r
   //\r
   // using EFI Shell; call the function to check\r


@@ -992,7 +992,7 @@ ShellGetExecutionBreakFlag(
 /**\r
   return the value of an environment variable\r
 \r
 /**\r
   return the value of an environment variable\r
 \r

-  this function gets the value of the environment variable set by the \r
+  this function gets the value of the environment variable set by the\r

   ShellSetEnvironmentVariable function\r
 \r
   @param EnvKey                 The key name of the environment variable.\r
   ShellSetEnvironmentVariable function\r
 \r
   @param EnvKey                 The key name of the environment variable.\r


@@ -1006,7 +1006,7 @@ ShellGetEnvironmentVariable (
   IN CONST CHAR16                *EnvKey\r
   )\r
 {\r
   IN CONST CHAR16                *EnvKey\r
   )\r
 {\r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r


@@ -1051,12 +1051,12 @@ ShellSetEnvironmentVariable (
   IN BOOLEAN                    Volatile\r
   )\r
 {\r
   IN BOOLEAN                    Volatile\r
   )\r
 {\r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->SetEnv(EnvKey, EnvVal, Volatile));\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->SetEnv(EnvKey, EnvVal, Volatile));\r

-  } \r
+  }\r

 \r
   //\r
   // This feature does not exist under EFI shell\r
 \r
   //\r
   // This feature does not exist under EFI shell\r


@@ -1079,7 +1079,7 @@ EnvironmentVariables and Status are only supported for UEFI Shell 2.0.
 Output is only supported for pre-UEFI Shell 2.0\r
 \r
   @param ImageHandle            Parent image that is starting the operation\r
 Output is only supported for pre-UEFI Shell 2.0\r
 \r
   @param ImageHandle            Parent image that is starting the operation\r

-  @param CommandLine            pointer to null terminated command line.\r
+  @param CommandLine            pointer to NULL terminated command line.\r

   @param Output                 true to display debug output.  false to hide it.\r
   @param EnvironmentVariables   optional pointer to array of environment variables\r
                                 in the form "x=y".  if NULL current set is used.\r
   @param Output                 true to display debug output.  false to hide it.\r
   @param EnvironmentVariables   optional pointer to array of environment variables\r
                                 in the form "x=y".  if NULL current set is used.\r


@@ -1101,7 +1101,7 @@ ShellExecute (
   OUT EFI_STATUS                *Status OPTIONAL\r
   )\r
 {\r
   OUT EFI_STATUS                *Status OPTIONAL\r
   )\r
 {\r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r


@@ -1112,7 +1112,7 @@ ShellExecute (
                                       CommandLine,\r
                                       EnvironmentVariables,\r
                                       Status));\r
                                       CommandLine,\r
                                       EnvironmentVariables,\r
                                       Status));\r

-  } \r
+  }\r

   //\r
   // ASSERT that we must have EFI shell\r
   //\r
   //\r
   // ASSERT that we must have EFI shell\r
   //\r


@@ -1121,15 +1121,15 @@ ShellExecute (
   // Call EFI Shell version (not using EnvironmentVariables or Status parameters)\r
   // Due to oddity in the EFI shell we want to dereference the ParentHandle here\r
   //\r
   // Call EFI Shell version (not using EnvironmentVariables or Status parameters)\r
   // Due to oddity in the EFI shell we want to dereference the ParentHandle here\r
   //\r

-  return (mEfiShellEnvironment2->Execute(*ParentHandle, \r
-                                        CommandLine, \r
+  return (mEfiShellEnvironment2->Execute(*ParentHandle,\r
+                                        CommandLine,\r

                                         Output));\r
 }\r
 /**\r
   Retreives the current directory path\r
 \r
                                         Output));\r
 }\r
 /**\r
   Retreives the current directory path\r
 \r

-  If the DeviceName is NULL, it returns the current device's current directory \r
-  name. If the DeviceName is not NULL, it returns the current directory name \r
+  If the DeviceName is NULL, it returns the current device's current directory\r
+  name. If the DeviceName is not NULL, it returns the current directory name\r

   on specified drive.\r
 \r
   @param DeviceName             the name of the drive to get directory on\r
   on specified drive.\r
 \r
   @param DeviceName             the name of the drive to get directory on\r


@@ -1143,12 +1143,12 @@ ShellGetCurrentDir (
   IN CHAR16                     *DeviceName OPTIONAL\r
   )\r
 {\r
   IN CHAR16                     *DeviceName OPTIONAL\r
   )\r
 {\r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->GetCurDir(DeviceName));\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->GetCurDir(DeviceName));\r

-  } \r
+  }\r

   //\r
   // ASSERT that we must have EFI shell\r
   //\r
   //\r
   // ASSERT that we must have EFI shell\r
   //\r


@@ -1158,12 +1158,12 @@ ShellGetCurrentDir (
 /**\r
   sets (enabled or disabled) the page break mode\r
 \r
 /**\r
   sets (enabled or disabled) the page break mode\r
 \r

-  when page break mode is enabled the screen will stop scrolling \r
+  when page break mode is enabled the screen will stop scrolling\r

   and wait for operator input before scrolling a subsequent screen.\r
 \r
   @param CurrentState           TRUE to enable and FALSE to disable\r
 **/\r
   and wait for operator input before scrolling a subsequent screen.\r
 \r
   @param CurrentState           TRUE to enable and FALSE to disable\r
 **/\r

-VOID \r
+VOID\r

 EFIAPI\r
 ShellSetPageBreakMode (\r
   IN BOOLEAN                    CurrentState\r
 EFIAPI\r
 ShellSetPageBreakMode (\r
   IN BOOLEAN                    CurrentState\r


@@ -1173,7 +1173,7 @@ ShellSetPageBreakMode (
   // check for enabling\r
   //\r
   if (CurrentState != 0x00) {\r
   // check for enabling\r
   //\r
   if (CurrentState != 0x00) {\r

-    // \r
+    //\r

     // check for UEFI Shell 2.0\r
     //\r
     if (mEfiShellProtocol != NULL) {\r
     // check for UEFI Shell 2.0\r
     //\r
     if (mEfiShellProtocol != NULL) {\r


@@ -1183,7 +1183,7 @@ ShellSetPageBreakMode (
       mEfiShellProtocol->EnablePageBreak();\r
       return;\r
     } else {\r
       mEfiShellProtocol->EnablePageBreak();\r
       return;\r
     } else {\r

-      // \r
+      //\r

       // ASSERT that must have EFI Shell\r
       //\r
       ASSERT(mEfiShellEnvironment2 != NULL);\r
       // ASSERT that must have EFI Shell\r
       //\r
       ASSERT(mEfiShellEnvironment2 != NULL);\r


@@ -1194,7 +1194,7 @@ ShellSetPageBreakMode (
       return;\r
     }\r
   } else {\r
       return;\r
     }\r
   } else {\r

-    // \r
+    //\r

     // check for UEFI Shell 2.0\r
     //\r
     if (mEfiShellProtocol != NULL) {\r
     // check for UEFI Shell 2.0\r
     //\r
     if (mEfiShellProtocol != NULL) {\r


@@ -1204,7 +1204,7 @@ ShellSetPageBreakMode (
       mEfiShellProtocol->DisablePageBreak();\r
       return;\r
     } else {\r
       mEfiShellProtocol->DisablePageBreak();\r
       return;\r
     } else {\r

-      // \r
+      //\r

       // ASSERT that must have EFI Shell\r
       //\r
       ASSERT(mEfiShellEnvironment2 != NULL);\r
       // ASSERT that must have EFI Shell\r
       //\r
       ASSERT(mEfiShellEnvironment2 != NULL);\r


@@ -1235,7 +1235,7 @@ typedef struct {
 \r
   if OldStyleFileList is NULL then ASSERT()\r
 \r
 \r
   if OldStyleFileList is NULL then ASSERT()\r
 \r

-  this function will convert a SHELL_FILE_ARG based list into a callee allocated \r
+  this function will convert a SHELL_FILE_ARG based list into a callee allocated\r

   EFI_SHELL_FILE_INFO based list.  it is up to the caller to free the memory via\r
   the ShellCloseFileMetaArg function.\r
 \r
   EFI_SHELL_FILE_INFO based list.  it is up to the caller to free the memory via\r
   the ShellCloseFileMetaArg function.\r
 \r


@@ -1270,7 +1270,7 @@ InternalShellConvertFileListType (
     //\r
     // make sure the old list was valid\r
     //\r
     //\r
     // make sure the old list was valid\r
     //\r

-    ASSERT(OldInfo           != NULL); \r
+    ASSERT(OldInfo           != NULL);\r

     ASSERT(OldInfo->Info     != NULL);\r
     ASSERT(OldInfo->FullName != NULL);\r
     ASSERT(OldInfo->FileName != NULL);\r
     ASSERT(OldInfo->Info     != NULL);\r
     ASSERT(OldInfo->FullName != NULL);\r
     ASSERT(OldInfo->FileName != NULL);\r


@@ -1279,8 +1279,8 @@ InternalShellConvertFileListType (
     // allocate a new EFI_SHELL_FILE_INFO object\r
     //\r
     NewInfo               = AllocateZeroPool(sizeof(EFI_SHELL_FILE_INFO));\r
     // allocate a new EFI_SHELL_FILE_INFO object\r
     //\r
     NewInfo               = AllocateZeroPool(sizeof(EFI_SHELL_FILE_INFO));\r

-    \r
-    // \r
+\r
+    //\r

     // copy the simple items\r
     //\r
     NewInfo->Handle       = OldInfo->Handle;\r
     // copy the simple items\r
     //\r
     NewInfo->Handle       = OldInfo->Handle;\r


@@ -1295,7 +1295,7 @@ InternalShellConvertFileListType (
     NewInfo->FullName     = AllocateZeroPool(StrSize(OldInfo->FullName));\r
     NewInfo->FileName     = AllocateZeroPool(StrSize(OldInfo->FileName));\r
     NewInfo->Info         = AllocateZeroPool((UINTN)OldInfo->Info->Size);\r
     NewInfo->FullName     = AllocateZeroPool(StrSize(OldInfo->FullName));\r
     NewInfo->FileName     = AllocateZeroPool(StrSize(OldInfo->FileName));\r
     NewInfo->Info         = AllocateZeroPool((UINTN)OldInfo->Info->Size);\r

-    \r
+\r

     //\r
     // make sure all the memory allocations were sucessful\r
     //\r
     //\r
     // make sure all the memory allocations were sucessful\r
     //\r


@@ -1320,21 +1320,21 @@ InternalShellConvertFileListType (
 /**\r
   Opens a group of files based on a path.\r
 \r
 /**\r
   Opens a group of files based on a path.\r
 \r

-  This function uses the Arg to open all the matching files. Each matched \r
-  file has a SHELL_FILE_ARG structure to record the file information. These \r
-  structures are placed on the list ListHead. Users can get the SHELL_FILE_ARG \r
+  This function uses the Arg to open all the matching files. Each matched\r
+  file has a SHELL_FILE_ARG structure to record the file information. These\r
+  structures are placed on the list ListHead. Users can get the SHELL_FILE_ARG\r

   structures from ListHead to access each file. This function supports wildcards\r
   structures from ListHead to access each file. This function supports wildcards\r

-  and will process '?' and '*' as such.  the list must be freed with a call to \r
+  and will process '?' and '*' as such.  the list must be freed with a call to\r

   ShellCloseFileMetaArg().\r
 \r
   ShellCloseFileMetaArg().\r
 \r

-  If you are NOT appending to an existing list *ListHead must be NULL.  If \r
+  If you are NOT appending to an existing list *ListHead must be NULL.  If\r

   *ListHead is NULL then it must be callee freed.\r
 \r
   @param Arg                    pointer to path string\r
   @param OpenMode               mode to open files with\r
   @param ListHead               head of linked list of results\r
 \r
   *ListHead is NULL then it must be callee freed.\r
 \r
   @param Arg                    pointer to path string\r
   @param OpenMode               mode to open files with\r
   @param ListHead               head of linked list of results\r
 \r

-  @retval EFI_SUCCESS           the operation was sucessful and the list head \r
+  @retval EFI_SUCCESS           the operation was sucessful and the list head\r

                                 contains the list of opened files\r
   #retval EFI_UNSUPPORTED       a previous ShellOpenFileMetaArg must be closed first.\r
                                 *ListHead is set to NULL.\r
                                 contains the list of opened files\r
   #retval EFI_UNSUPPORTED       a previous ShellOpenFileMetaArg must be closed first.\r
                                 *ListHead is set to NULL.\r


@@ -1352,14 +1352,14 @@ ShellOpenFileMetaArg (
 {\r
   EFI_STATUS                    Status;\r
   LIST_ENTRY                    mOldStyleFileList;\r
 {\r
   EFI_STATUS                    Status;\r
   LIST_ENTRY                    mOldStyleFileList;\r

-  \r
+\r

   //\r
   // ASSERT that Arg and ListHead are not NULL\r
   //\r
   ASSERT(Arg      != NULL);\r
   ASSERT(ListHead != NULL);\r
 \r
   //\r
   // ASSERT that Arg and ListHead are not NULL\r
   //\r
   ASSERT(Arg      != NULL);\r
   ASSERT(ListHead != NULL);\r
 \r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r


@@ -1369,9 +1369,9 @@ ShellOpenFileMetaArg (
         return (EFI_OUT_OF_RESOURCES);\r
       }\r
       InitializeListHead(&((*ListHead)->Link));\r
         return (EFI_OUT_OF_RESOURCES);\r
       }\r
       InitializeListHead(&((*ListHead)->Link));\r

-    }    \r
-    Status = mEfiShellProtocol->OpenFileList(Arg, \r
-                                           OpenMode, \r
+    }\r
+    Status = mEfiShellProtocol->OpenFileList(Arg,\r
+                                           OpenMode,\r

                                            ListHead);\r
     if (EFI_ERROR(Status)) {\r
       mEfiShellProtocol->RemoveDupInFileList(ListHead);\r
                                            ListHead);\r
     if (EFI_ERROR(Status)) {\r
       mEfiShellProtocol->RemoveDupInFileList(ListHead);\r


@@ -1379,7 +1379,7 @@ ShellOpenFileMetaArg (
       Status = mEfiShellProtocol->RemoveDupInFileList(ListHead);\r
     }\r
     return (Status);\r
       Status = mEfiShellProtocol->RemoveDupInFileList(ListHead);\r
     }\r
     return (Status);\r

-  } \r
+  }\r

 \r
   //\r
   // ASSERT that we must have EFI shell\r
 \r
   //\r
   // ASSERT that we must have EFI shell\r


@@ -1441,18 +1441,18 @@ ShellCloseFileMetaArg (
   //\r
   ASSERT(ListHead != NULL);\r
 \r
   //\r
   ASSERT(ListHead != NULL);\r
 \r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->FreeFileList(ListHead));\r
   } else {\r
     //\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellProtocol != NULL) {\r
     return (mEfiShellProtocol->FreeFileList(ListHead));\r
   } else {\r
     //\r

-    // Since this is EFI Shell version we need to free our internally made copy \r
+    // Since this is EFI Shell version we need to free our internally made copy\r

     // of the list\r
     //\r
     // of the list\r
     //\r

-    for ( Node = GetFirstNode(&(*ListHead)->Link) \r
-        ; IsListEmpty(&(*ListHead)->Link) == FALSE \r
+    for ( Node = GetFirstNode(&(*ListHead)->Link)\r
+        ; IsListEmpty(&(*ListHead)->Link) == FALSE\r

         ; Node = GetFirstNode(&(*ListHead)->Link)) {\r
       RemoveEntryList(Node);\r
       ((EFI_SHELL_FILE_INFO_NO_CONST*)Node)->Handle->Close(((EFI_SHELL_FILE_INFO_NO_CONST*)Node)->Handle);\r
         ; Node = GetFirstNode(&(*ListHead)->Link)) {\r
       RemoveEntryList(Node);\r
       ((EFI_SHELL_FILE_INFO_NO_CONST*)Node)->Handle->Close(((EFI_SHELL_FILE_INFO_NO_CONST*)Node)->Handle);\r


@@ -1514,7 +1514,7 @@ ShellFindFilePath (
     Size = StrSize(Path);\r
     Size += StrSize(FileName);\r
     TestPath = AllocateZeroPool(Size);\r
     Size = StrSize(Path);\r
     Size += StrSize(FileName);\r
     TestPath = AllocateZeroPool(Size);\r

-    Walker = (CHAR16*)Path; \r
+    Walker = (CHAR16*)Path;\r

     do {\r
       CopyMem(TestPath, Walker, StrSize(Walker));\r
       if (StrStr(TestPath, L";") != NULL) {\r
     do {\r
       CopyMem(TestPath, Walker, StrSize(Walker));\r
       if (StrStr(TestPath, L";") != NULL) {\r


@@ -1539,8 +1539,8 @@ ShellFindFilePath (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Find a file by searching the CWD and then the path with a variable set of file \r
-  extensions.  If the file is not found it will append each extension in the list \r
+  Find a file by searching the CWD and then the path with a variable set of file\r
+  extensions.  If the file is not found it will append each extension in the list\r

   in the order provided and return the first one that is successful.\r
 \r
   If FileName is NULL, then ASSERT.\r
   in the order provided and return the first one that is successful.\r
 \r
   If FileName is NULL, then ASSERT.\r


@@ -1606,9 +1606,9 @@ typedef struct {
 } SHELL_PARAM_PACKAGE;\r
 \r
 /**\r
 } SHELL_PARAM_PACKAGE;\r
 \r
 /**\r

-  Checks the list of valid arguments and returns TRUE if the item was found.  If the \r
+  Checks the list of valid arguments and returns TRUE if the item was found.  If the\r

   return value is TRUE then the type parameter is set also.\r
   return value is TRUE then the type parameter is set also.\r

-  \r
+\r

   if CheckList is NULL then ASSERT();\r
   if Name is NULL then ASSERT();\r
   if Type is NULL then ASSERT();\r
   if CheckList is NULL then ASSERT();\r
   if Name is NULL then ASSERT();\r
   if Type is NULL then ASSERT();\r


@@ -1694,7 +1694,7 @@ InternalIsFlag (
   //\r
   // If the Name has a / or - as the first character return TRUE\r
   //\r
   //\r
   // If the Name has a / or - as the first character return TRUE\r
   //\r

-  if ((Name[0] == L'/') || \r
+  if ((Name[0] == L'/') ||\r

       (Name[0] == L'-') ||\r
       (Name[0] == L'+')\r
       ) {\r
       (Name[0] == L'-') ||\r
       (Name[0] == L'+')\r
       ) {\r


@@ -1704,13 +1704,13 @@ InternalIsFlag (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Checks the command line arguments passed against the list of valid ones.  \r
+  Checks the command line arguments passed against the list of valid ones.\r

 \r
   If no initialization is required, then return RETURN_SUCCESS.\r
 \r
   If no initialization is required, then return RETURN_SUCCESS.\r

-  \r
+\r

   @param CheckList              pointer to list of parameters to check\r
   @param CheckPackage           pointer to pointer to list checked values\r
   @param CheckList              pointer to list of parameters to check\r
   @param CheckPackage           pointer to pointer to list checked values\r

-  @param ProblemParam           optional pointer to pointer to unicode string for \r
+  @param ProblemParam           optional pointer to pointer to unicode string for\r

                                 the paramater that caused failure.  If used then the\r
                                 caller is responsible for freeing the memory.\r
   @param AutoPageBreak          will automatically set PageBreakEnabled for "b" parameter\r
                                 the paramater that caused failure.  If used then the\r
                                 caller is responsible for freeing the memory.\r
   @param AutoPageBreak          will automatically set PageBreakEnabled for "b" parameter\r


@@ -1720,10 +1720,10 @@ InternalIsFlag (
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid\r
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid\r

-  @retval EFI_VOLUME_CORRUPTED  the command line was corrupt.  an argument was \r
-                                duplicated.  the duplicated command line argument \r
+  @retval EFI_VOLUME_CORRUPTED  the command line was corrupt.  an argument was\r
+                                duplicated.  the duplicated command line argument\r

                                 was returned in ProblemParam if provided.\r
                                 was returned in ProblemParam if provided.\r

-  @retval EFI_NOT_FOUND         a argument required a value that was missing.  \r
+  @retval EFI_NOT_FOUND         a argument required a value that was missing.\r

                                 the invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r
                                 the invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r


@@ -1804,9 +1804,9 @@ InternalCommandLineParse (
       switch (CurrentItemPackage->Type) {\r
         //\r
         // possibly trigger the next loop(s) to populate the value of this item\r
       switch (CurrentItemPackage->Type) {\r
         //\r
         // possibly trigger the next loop(s) to populate the value of this item\r

-        //        \r
+        //\r

         case TypeValue:\r
         case TypeValue:\r

-          GetItemValue = 1; \r
+          GetItemValue = 1;\r

           ValueSize = 0;\r
           break;\r
         case TypeDoubleValue:\r
           ValueSize = 0;\r
           break;\r
         case TypeDoubleValue:\r


@@ -1886,27 +1886,27 @@ InternalCommandLineParse (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Checks the command line arguments passed against the list of valid ones.  \r
+  Checks the command line arguments passed against the list of valid ones.\r

   Optionally removes NULL values first.\r
   Optionally removes NULL values first.\r

-  \r
+\r

   If no initialization is required, then return RETURN_SUCCESS.\r
   If no initialization is required, then return RETURN_SUCCESS.\r

-  \r
+\r

   @param CheckList              pointer to list of parameters to check\r
   @param CheckPackage           pointer to pointer to list checked values\r
   @param CheckList              pointer to list of parameters to check\r
   @param CheckPackage           pointer to pointer to list checked values\r

-  @param ProblemParam           optional pointer to pointer to unicode string for \r
+  @param ProblemParam           optional pointer to pointer to unicode string for\r

                                 the paramater that caused failure.\r
   @param AutoPageBreak          will automatically set PageBreakEnabled for "b" parameter\r
 \r
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid\r
                                 the paramater that caused failure.\r
   @param AutoPageBreak          will automatically set PageBreakEnabled for "b" parameter\r
 \r
   @retval EFI_SUCCESS           The operation completed sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid\r

-  @retval EFI_VOLUME_CORRUPTED  the command line was corrupt.  an argument was \r
-                                duplicated.  the duplicated command line argument \r
+  @retval EFI_VOLUME_CORRUPTED  the command line was corrupt.  an argument was\r
+                                duplicated.  the duplicated command line argument\r

                                 was returned in ProblemParam if provided.\r
   @retval EFI_DEVICE_ERROR      the commands contained 2 opposing arguments.  one\r
                                 was returned in ProblemParam if provided.\r
   @retval EFI_DEVICE_ERROR      the commands contained 2 opposing arguments.  one\r

-                                of the command line arguments was returned in \r
+                                of the command line arguments was returned in\r

                                 ProblemParam if provided.\r
                                 ProblemParam if provided.\r

-  @retval EFI_NOT_FOUND         a argument required a value that was missing.  \r
+  @retval EFI_NOT_FOUND         a argument required a value that was missing.\r

                                 the invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r
                                 the invalid command line argument was returned in\r
                                 ProblemParam if provided.\r
 **/\r


@@ -1919,33 +1919,33 @@ ShellCommandLineParseEx (
   IN BOOLEAN                    AutoPageBreak,\r
   IN BOOLEAN                    AlwaysAllowNumbers\r
   ) {\r
   IN BOOLEAN                    AutoPageBreak,\r
   IN BOOLEAN                    AlwaysAllowNumbers\r
   ) {\r

-  // \r
+  //\r

   // ASSERT that CheckList and CheckPackage aren't NULL\r
   //\r
   ASSERT(CheckList    != NULL);\r
   ASSERT(CheckPackage != NULL);\r
 \r
   // ASSERT that CheckList and CheckPackage aren't NULL\r
   //\r
   ASSERT(CheckList    != NULL);\r
   ASSERT(CheckPackage != NULL);\r
 \r

-  // \r
+  //\r

   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellParametersProtocol != NULL) {\r
   // Check for UEFI Shell 2.0 protocols\r
   //\r
   if (mEfiShellParametersProtocol != NULL) {\r

-    return (InternalCommandLineParse(CheckList, \r
-                                     CheckPackage, \r
-                                     ProblemParam, \r
-                                     AutoPageBreak, \r
+    return (InternalCommandLineParse(CheckList,\r
+                                     CheckPackage,\r
+                                     ProblemParam,\r
+                                     AutoPageBreak,\r

                                      (CONST CHAR16**) mEfiShellParametersProtocol->Argv,\r
                                      mEfiShellParametersProtocol->Argc,\r
                                      AlwaysAllowNumbers));\r
   }\r
 \r
                                      (CONST CHAR16**) mEfiShellParametersProtocol->Argv,\r
                                      mEfiShellParametersProtocol->Argc,\r
                                      AlwaysAllowNumbers));\r
   }\r
 \r

-  // \r
+  //\r

   // ASSERT That EFI Shell is not required\r
   //\r
   ASSERT (mEfiShellInterface != NULL);\r
   // ASSERT That EFI Shell is not required\r
   //\r
   ASSERT (mEfiShellInterface != NULL);\r

-  return (InternalCommandLineParse(CheckList, \r
-                                   CheckPackage, \r
-                                   ProblemParam, \r
-                                   AutoPageBreak, \r
+  return (InternalCommandLineParse(CheckList,\r
+                                   CheckPackage,\r
+                                   ProblemParam,\r
+                                   AutoPageBreak,\r

                                    (CONST CHAR16**) mEfiShellInterface->Argv,\r
                                    mEfiShellInterface->Argc,\r
                                    AlwaysAllowNumbers));\r
                                    (CONST CHAR16**) mEfiShellInterface->Argv,\r
                                    mEfiShellInterface->Argc,\r
                                    AlwaysAllowNumbers));\r


@@ -2002,7 +2002,7 @@ ShellCommandLineFreeVarList (
     if (((SHELL_PARAM_PACKAGE*)Node)->Value != NULL) {\r
       FreePool(((SHELL_PARAM_PACKAGE*)Node)->Value);\r
     }\r
     if (((SHELL_PARAM_PACKAGE*)Node)->Value != NULL) {\r
       FreePool(((SHELL_PARAM_PACKAGE*)Node)->Value);\r
     }\r

-    \r
+\r

     //\r
     // free the node structure\r
     //\r
     //\r
     // free the node structure\r
     //\r


@@ -2020,7 +2020,7 @@ ShellCommandLineFreeVarList (
 \r
   if CheckPackage is NULL then return FALSE.\r
   if KeyString is NULL then ASSERT()\r
 \r
   if CheckPackage is NULL then return FALSE.\r
   if KeyString is NULL then ASSERT()\r

-  \r
+\r

   @param CheckPackage           The package of parsed command line arguments\r
   @param KeyString              the Key of the command line argument to check for\r
 \r
   @param CheckPackage           The package of parsed command line arguments\r
   @param KeyString              the Key of the command line argument to check for\r
 \r


@@ -2050,9 +2050,9 @@ ShellCommandLineGetFlag (
   //\r
   // enumerate through the list of parametrs\r
   //\r
   //\r
   // enumerate through the list of parametrs\r
   //\r

-  for ( Node = GetFirstNode(CheckPackage) \r
-      ; !IsNull (CheckPackage, Node) \r
-      ; Node = GetNextNode(CheckPackage, Node) \r
+  for ( Node = GetFirstNode(CheckPackage)\r
+      ; !IsNull (CheckPackage, Node)\r
+      ; Node = GetNextNode(CheckPackage, Node)\r

       ){\r
     //\r
     // If the Name matches, return TRUE (and there may be NULL name)\r
       ){\r
     //\r
     // If the Name matches, return TRUE (and there may be NULL name)\r


@@ -2061,7 +2061,7 @@ ShellCommandLineGetFlag (
       //\r
       // If Type is TypeStart then only compare the begining of the strings\r
       //\r
       //\r
       // If Type is TypeStart then only compare the begining of the strings\r
       //\r

-      if ( ((SHELL_PARAM_PACKAGE*)Node)->Type == TypeStart \r
+      if ( ((SHELL_PARAM_PACKAGE*)Node)->Type == TypeStart\r

         && StrnCmp(KeyString, ((SHELL_PARAM_PACKAGE*)Node)->Name, StrLen(KeyString)) == 0\r
         ){\r
         return (TRUE);\r
         && StrnCmp(KeyString, ((SHELL_PARAM_PACKAGE*)Node)->Name, StrLen(KeyString)) == 0\r
         ){\r
         return (TRUE);\r


@@ -2076,7 +2076,7 @@ ShellCommandLineGetFlag (
   returns value from command line argument\r
 \r
   value parameters are in the form of "-<Key> value" or "/<Key> value"\r
   returns value from command line argument\r
 \r
   value parameters are in the form of "-<Key> value" or "/<Key> value"\r

-  \r
+\r

   if CheckPackage is NULL, then return NULL;\r
 \r
   @param CheckPackage           The package of parsed command line arguments\r
   if CheckPackage is NULL, then return NULL;\r
 \r
   @param CheckPackage           The package of parsed command line arguments\r


@@ -2103,9 +2103,9 @@ ShellCommandLineGetValue (
   //\r
   // enumerate through the list of parametrs\r
   //\r
   //\r
   // enumerate through the list of parametrs\r
   //\r

-  for ( Node = GetFirstNode(CheckPackage) \r
-      ; !IsNull (CheckPackage, Node) \r
-      ; Node = GetNextNode(CheckPackage, Node) \r
+  for ( Node = GetFirstNode(CheckPackage)\r
+      ; !IsNull (CheckPackage, Node)\r
+      ; Node = GetNextNode(CheckPackage, Node)\r

       ){\r
     //\r
     // If the Name matches, return the value (name can be NULL)\r
       ){\r
     //\r
     // If the Name matches, return the value (name can be NULL)\r


@@ -2114,7 +2114,7 @@ ShellCommandLineGetValue (
       //\r
       // If Type is TypeStart then only compare the begining of the strings\r
       //\r
       //\r
       // If Type is TypeStart then only compare the begining of the strings\r
       //\r

-      if ( ((SHELL_PARAM_PACKAGE*)Node)->Type == TypeStart \r
+      if ( ((SHELL_PARAM_PACKAGE*)Node)->Type == TypeStart\r

         && StrnCmp(KeyString, ((SHELL_PARAM_PACKAGE*)Node)->Name, StrLen(KeyString)) == 0\r
         ){\r
         //\r
         && StrnCmp(KeyString, ((SHELL_PARAM_PACKAGE*)Node)->Name, StrLen(KeyString)) == 0\r
         ){\r
         //\r


@@ -2135,11 +2135,11 @@ ShellCommandLineGetValue (
   returns raw value from command line argument\r
 \r
   raw value parameters are in the form of "value" in a specific position in the list\r
   returns raw value from command line argument\r
 \r
   raw value parameters are in the form of "value" in a specific position in the list\r

-  \r
+\r

   if CheckPackage is NULL, then return NULL;\r
 \r
   @param CheckPackage           The package of parsed command line arguments\r
   if CheckPackage is NULL, then return NULL;\r
 \r
   @param CheckPackage           The package of parsed command line arguments\r

-  @param Position               the position of the value \r
+  @param Position               the position of the value\r

 \r
   @retval NULL                  the flag is not on the command line\r
   @return !=NULL                pointer to unicode string of the value\r
 \r
   @retval NULL                  the flag is not on the command line\r
   @return !=NULL                pointer to unicode string of the value\r


@@ -2162,9 +2162,9 @@ ShellCommandLineGetRawValue (
   //\r
   // enumerate through the list of parametrs\r
   //\r
   //\r
   // enumerate through the list of parametrs\r
   //\r

-  for ( Node = GetFirstNode(CheckPackage) \r
-      ; !IsNull (CheckPackage, Node) \r
-      ; Node = GetNextNode(CheckPackage, Node) \r
+  for ( Node = GetFirstNode(CheckPackage)\r
+      ; !IsNull (CheckPackage, Node)\r
+      ; Node = GetNextNode(CheckPackage, Node)\r

       ){\r
     //\r
     // If the position matches, return the value\r
       ){\r
     //\r
     // If the position matches, return the value\r


@@ -2177,8 +2177,8 @@ ShellCommandLineGetRawValue (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  returns the number of command line value parameters that were parsed.  \r
-  \r
+  returns the number of command line value parameters that were parsed.\r
+\r

   this will not include flags.\r
 \r
   @retval (UINTN)-1     No parsing has ocurred\r
   this will not include flags.\r
 \r
   @retval (UINTN)-1     No parsing has ocurred\r


@@ -2196,7 +2196,7 @@ ShellCommandLineGetCount(
 /**\r
   Determins if a parameter is duplicated.\r
 \r
 /**\r
   Determins if a parameter is duplicated.\r
 \r

-  If Param is not NULL then it will point to a callee allocated string buffer \r
+  If Param is not NULL then it will point to a callee allocated string buffer\r

   with the parameter value if a duplicate is found.\r
 \r
   If CheckPackage is NULL, then ASSERT.\r
   with the parameter value if a duplicate is found.\r
 \r
   If CheckPackage is NULL, then ASSERT.\r


@@ -2216,16 +2216,16 @@ ShellCommandLineCheckDuplicate (
 {\r
   LIST_ENTRY                    *Node1;\r
   LIST_ENTRY                    *Node2;\r
 {\r
   LIST_ENTRY                    *Node1;\r
   LIST_ENTRY                    *Node2;\r

-  \r
+\r

   ASSERT(CheckPackage != NULL);\r
 \r
   ASSERT(CheckPackage != NULL);\r
 \r

-  for ( Node1 = GetFirstNode(CheckPackage) \r
-      ; !IsNull (CheckPackage, Node1) \r
-      ; Node1 = GetNextNode(CheckPackage, Node1) \r
+  for ( Node1 = GetFirstNode(CheckPackage)\r
+      ; !IsNull (CheckPackage, Node1)\r
+      ; Node1 = GetNextNode(CheckPackage, Node1)\r

       ){\r
       ){\r

-    for ( Node2 = GetNextNode(CheckPackage, Node1) \r
-        ; !IsNull (CheckPackage, Node2) \r
-        ; Node2 = GetNextNode(CheckPackage, Node2) \r
+    for ( Node2 = GetNextNode(CheckPackage, Node1)\r
+        ; !IsNull (CheckPackage, Node2)\r
+        ; Node2 = GetNextNode(CheckPackage, Node2)\r

         ){\r
       if (StrCmp(((SHELL_PARAM_PACKAGE*)Node1)->Name, ((SHELL_PARAM_PACKAGE*)Node2)->Name) == 0) {\r
         if (Param != NULL) {\r
         ){\r
       if (StrCmp(((SHELL_PARAM_PACKAGE*)Node1)->Name, ((SHELL_PARAM_PACKAGE*)Node2)->Name) == 0) {\r
         if (Param != NULL) {\r


@@ -2240,7 +2240,7 @@ ShellCommandLineCheckDuplicate (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This is a find and replace function.  Upon successful return the NewString is a copy of \r
+  This is a find and replace function.  Upon successful return the NewString is a copy of\r

   SourceString with each instance of FindTarget replaced with ReplaceWith.\r
 \r
   If SourceString and NewString overlap the behavior is undefined.\r
   SourceString with each instance of FindTarget replaced with ReplaceWith.\r
 \r
   If SourceString and NewString overlap the behavior is undefined.\r


@@ -2261,7 +2261,7 @@ ShellCommandLineCheckDuplicate (
   @retval EFI_INVALID_PARAMETER       ReplaceWith was NULL.\r
   @retval EFI_INVALID_PARAMETER       FindTarget had length < 1.\r
   @retval EFI_INVALID_PARAMETER       SourceString had length < 1.\r
   @retval EFI_INVALID_PARAMETER       ReplaceWith was NULL.\r
   @retval EFI_INVALID_PARAMETER       FindTarget had length < 1.\r
   @retval EFI_INVALID_PARAMETER       SourceString had length < 1.\r

-  @retval EFI_BUFFER_TOO_SMALL        NewSize was less than the minimum size to hold \r
+  @retval EFI_BUFFER_TOO_SMALL        NewSize was less than the minimum size to hold\r

                                       the new string (truncation occurred).\r
   @retval EFI_SUCCESS                 the string was sucessfully copied with replacement.\r
 **/\r
                                       the new string (truncation occurred).\r
   @retval EFI_SUCCESS                 the string was sucessfully copied with replacement.\r
 **/\r


@@ -2275,7 +2275,7 @@ ShellCopySearchAndReplace2(
   IN CONST CHAR16                     *FindTarget,\r
   IN CONST CHAR16                     *ReplaceWith,\r
   IN CONST BOOLEAN                    SkipPreCarrot\r
   IN CONST CHAR16                     *FindTarget,\r
   IN CONST CHAR16                     *ReplaceWith,\r
   IN CONST BOOLEAN                    SkipPreCarrot\r

-  ) \r
+  )\r

 {\r
   UINTN Size;\r
   if ( (SourceString == NULL)\r
 {\r
   UINTN Size;\r
   if ( (SourceString == NULL)\r


@@ -2290,10 +2290,10 @@ ShellCopySearchAndReplace2(
   NewString = SetMem16(NewString, NewSize, CHAR_NULL);\r
   while (*SourceString != CHAR_NULL) {\r
     //\r
   NewString = SetMem16(NewString, NewSize, CHAR_NULL);\r
   while (*SourceString != CHAR_NULL) {\r
     //\r

-    // if we find the FindTarget and either Skip == FALSE or Skip == TRUE and we \r
+    // if we find the FindTarget and either Skip == FALSE or Skip == TRUE and we\r

     // dont have a carrot do a replace...\r
     //\r
     // dont have a carrot do a replace...\r
     //\r

-    if (StrnCmp(SourceString, FindTarget, StrLen(FindTarget)) == 0 \r
+    if (StrnCmp(SourceString, FindTarget, StrLen(FindTarget)) == 0\r

       && ((SkipPreCarrot && *(SourceString-1) != L'^') || SkipPreCarrot == FALSE)\r
       ){\r
       SourceString += StrLen(FindTarget);\r
       && ((SkipPreCarrot && *(SourceString-1) != L'^') || SkipPreCarrot == FALSE)\r
       ){\r
       SourceString += StrLen(FindTarget);\r


@@ -2350,14 +2350,14 @@ InternalPrintTo (
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string\r
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string\r

-  \r
-  If -1 is specified for either the Row or Col the current screen location for BOTH \r
+\r
+  If -1 is specified for either the Row or Col the current screen location for BOTH\r

   will be used.\r
 \r
   if either Row or Col is out of range for the current console, then ASSERT\r
   if Format is NULL, then ASSERT\r
 \r
   will be used.\r
 \r
   if either Row or Col is out of range for the current console, then ASSERT\r
   if Format is NULL, then ASSERT\r
 \r

-  In addition to the standard %-based flags as supported by UefiLib Print() this supports \r
+  In addition to the standard %-based flags as supported by UefiLib Print() this supports\r

   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r
   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r


@@ -2382,14 +2382,14 @@ InternalShellPrintWorker(
   IN INT32                Row OPTIONAL,\r
   IN CONST CHAR16         *Format,\r
   VA_LIST                 Marker\r
   IN INT32                Row OPTIONAL,\r
   IN CONST CHAR16         *Format,\r
   VA_LIST                 Marker\r

-  ) \r
+  )\r

 {\r
   UINTN             Return;\r
   EFI_STATUS        Status;\r
   UINTN             NormalAttribute;\r
   CHAR16            *ResumeLocation;\r
   CHAR16            *FormatWalker;\r
 {\r
   UINTN             Return;\r
   EFI_STATUS        Status;\r
   UINTN             NormalAttribute;\r
   CHAR16            *ResumeLocation;\r
   CHAR16            *FormatWalker;\r

-  \r
+\r

   //\r
   // Back and forth each time fixing up 1 of our flags...\r
   //\r
   //\r
   // Back and forth each time fixing up 1 of our flags...\r
   //\r


@@ -2479,14 +2479,14 @@ InternalShellPrintWorker(
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r

-  \r
-  If -1 is specified for either the Row or Col the current screen location for BOTH \r
+\r
+  If -1 is specified for either the Row or Col the current screen location for BOTH\r

   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r
   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r

-  In addition to the standard %-based flags as supported by UefiLib Print() this supports \r
+  In addition to the standard %-based flags as supported by UefiLib Print() this supports\r

   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r
   the following additional flags:\r
     %N       -   Set output attribute to normal\r
     %H       -   Set output attribute to highlight\r


@@ -2510,7 +2510,7 @@ ShellPrintEx(
   IN INT32                Row OPTIONAL,\r
   IN CONST CHAR16         *Format,\r
   ...\r
   IN INT32                Row OPTIONAL,\r
   IN CONST CHAR16         *Format,\r
   ...\r

-  ) \r
+  )\r

 {\r
   VA_LIST           Marker;\r
   EFI_STATUS        Status;\r
 {\r
   VA_LIST           Marker;\r
   EFI_STATUS        Status;\r


@@ -2524,35 +2524,38 @@ ShellPrintEx(
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r
   Print at a specific location on the screen.\r
 \r
   This function will move the cursor to a given screen location and print the specified string.\r

-  \r
-  If -1 is specified for either the Row or Col the current screen location for BOTH \r
+\r
+  If -1 is specified for either the Row or Col the current screen location for BOTH\r

   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r
   will be used.\r
 \r
   If either Row or Col is out of range for the current console, then ASSERT.\r
   If Format is NULL, then ASSERT.\r
 \r

-  In addition to the standard %-based flags as supported by UefiLib Print() this supports \r
+  In addition to the standard %-based flags as supported by UefiLib Print() this supports\r

   the following additional flags:\r
   the following additional flags:\r

-    %N       -   Set output attribute to normal\r
-    %H       -   Set output attribute to highlight\r
-    %E       -   Set output attribute to error\r
-    %B       -   Set output attribute to blue color\r
-    %V       -   Set output attribute to green color\r
+    %N       -   Set output attribute to normal.\r
+    %H       -   Set output attribute to highlight.\r
+    %E       -   Set output attribute to error.\r
+    %B       -   Set output attribute to blue color.\r
+    %V       -   Set output attribute to green color.\r

 \r
   Note: The background color is controlled by the shell command cls.\r
 \r
 \r
   Note: The background color is controlled by the shell command cls.\r
 \r

-  @param[in] Row                the row to print at\r
-  @param[in] Col                the column to print at\r
-  @param[in] HiiFormatStringId  the format string Id for getting from Hii\r
-  @param[in] HiiFormatHandle    the format string Handle for getting from Hii\r
+  @param[in] Row                The row to print at.\r
+  @param[in] Col                The column to print at.\r
+  @param[in] Language           The language of the string to retrieve.  If this parameter\r
+                                is NULL, then the current platform language is used.\r
+  @param[in] HiiFormatStringId  The format string Id for getting from Hii.\r
+  @param[in] HiiFormatHandle    The format string Handle for getting from Hii.\r

 \r
 \r

-  @return the number of characters printed to the screen\r
+  @return the number of characters printed to the screen.\r

 **/\r
 UINTN\r
 EFIAPI\r
 ShellPrintHiiEx(\r
   IN INT32                Col OPTIONAL,\r
   IN INT32                Row OPTIONAL,\r
 **/\r
 UINTN\r
 EFIAPI\r
 ShellPrintHiiEx(\r
   IN INT32                Col OPTIONAL,\r
   IN INT32                Row OPTIONAL,\r

+  IN CONST CHAR8          *Language OPTIONAL,\r

   IN CONST EFI_STRING_ID  HiiFormatStringId,\r
   IN CONST EFI_HANDLE     HiiFormatHandle,\r
   ...\r
   IN CONST EFI_STRING_ID  HiiFormatStringId,\r
   IN CONST EFI_HANDLE     HiiFormatHandle,\r
   ...\r


@@ -2563,7 +2566,7 @@ ShellPrintHiiEx(
   UINTN             RetVal;\r
 \r
   VA_START (Marker, HiiFormatHandle);\r
   UINTN             RetVal;\r
 \r
   VA_START (Marker, HiiFormatHandle);\r

-  HiiFormatString = HiiGetString(HiiFormatHandle, HiiFormatStringId, NULL);\r
+  HiiFormatString = HiiGetString(HiiFormatHandle, HiiFormatStringId, Language);\r

   ASSERT(HiiFormatString != NULL);\r
 \r
   RetVal = InternalShellPrintWorker(Col, Row, HiiFormatString, Marker);\r
   ASSERT(HiiFormatString != NULL);\r
 \r
   RetVal = InternalShellPrintWorker(Col, Row, HiiFormatString, Marker);\r


@@ -2678,7 +2681,7 @@ ShellIsFileInPath(
   return (Status);\r
 }\r
 /**\r
   return (Status);\r
 }\r
 /**\r

-  Function to determine whether a string is decimal or hex representation of a number \r
+  Function to determine whether a string is decimal or hex representation of a number\r

   and return the number converted from the string.\r
 \r
   @param[in] String   String representation of a number\r
   and return the number converted from the string.\r
 \r
   @param[in] String   String representation of a number\r


@@ -2706,9 +2709,9 @@ ShellStrToUintn(
   append the first D characters of Source to the end of Destination, where D is\r
   the lesser of Count and the StrLen() of Source. If appending those D characters\r
   will fit within Destination (whose Size is given as CurrentSize) and\r
   append the first D characters of Source to the end of Destination, where D is\r
   the lesser of Count and the StrLen() of Source. If appending those D characters\r
   will fit within Destination (whose Size is given as CurrentSize) and\r

-  still leave room for a null terminator, then those characters are appended,\r
-  starting at the original terminating null of Destination, and a new terminating\r
-  null is appended.\r
+  still leave room for a NULL terminator, then those characters are appended,\r
+  starting at the original terminating NULL of Destination, and a new terminating\r
+  NULL is appended.\r

 \r
   If appending D characters onto Destination will result in a overflow of the size\r
   given in CurrentSize the string will be grown such that the copy can be performed\r
 \r
   If appending D characters onto Destination will result in a overflow of the size\r
   given in CurrentSize the string will be grown such that the copy can be performed\r

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.h b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
index fe886ae79e2b8946c8df7cdaa1175a3665917036..044179797de635bfbe891ed1684fbac944a847fb 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.h
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.h
@@ -1,8 +1,8 @@
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r
 /** @file\r
   Provides interface to shell functionality for shell commands and applications.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2010, 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
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\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

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index b089ec61fceefbe09611cd7a4e02283e6f688b65..d650d4c89cd8579523c65f7225669c70d4c95350 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 # Provides interface to shell functionality for shell commands and applications.\r
 #\r
 #/** @file\r
 # Provides interface to shell functionality for shell commands and applications.\r
 #\r

-# Copyright (c) 2006 - 2009, Intel Corporation.\r
+# Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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


@@ -50,8 +50,8 @@
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # ALWAYS_CONSUMED\r

-  \r
-  # shell 2.0 \r
+\r
+  # shell 2.0\r

   gEfiShellProtocolGuid                         # SOMETIMES_CONSUMED\r
   gEfiShellParametersProtocolGuid               # SOMETIMES_CONSUMED\r
 \r
   gEfiShellProtocolGuid                         # SOMETIMES_CONSUMED\r
   gEfiShellParametersProtocolGuid               # SOMETIMES_CONSUMED\r
 \r


@@ -66,4 +66,4 @@
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED\r
   gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED\r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED\r
   gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED\r

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength   # ALWAYS_CONSUMED
\ No newline at end of file
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength   # ALWAYS_CONSUMED\r

diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.c b/ShellPkg/Library/UefiSortLib/UefiSortLib.c
index 2a65f36507d09eee8ec04f6e2309903c28b8e5df..26654a9fcf7d1403f993f6c58873b60255360e23 100644 (file)
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.c
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Library used for sorting routines.\r
 \r
 /** @file\r
   Library used for sorting routines.\r
 \r

-Copyright (c) 2009, Intel Corporation<BR>\r
-All rights reserved. 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
+  Copyright (c) 2009-2010, 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
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \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
+  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

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -23,15 +23,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

-#include <Library/SortLib.h> \r
+#include <Library/SortLib.h>\r

 \r
 STATIC EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText = NULL;\r
 STATIC EFI_UNICODE_COLLATION_PROTOCOL   *mUnicodeCollation = NULL;\r
 \r
 \r
 /**\r
 \r
 STATIC EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText = NULL;\r
 STATIC EFI_UNICODE_COLLATION_PROTOCOL   *mUnicodeCollation = NULL;\r
 \r
 \r
 /**\r

-  Worker function for QuickSorting.  This function is identical to PerformQuickSort, \r
-  except that is uses the pre-allocated buffer so the in place sorting does not need to \r
+  Worker function for QuickSorting.  This function is identical to PerformQuickSort,\r
+  except that is uses the pre-allocated buffer so the in place sorting does not need to\r

   allocate and free buffers constantly.\r
 \r
   Each element must be equal sized.\r
   allocate and free buffers constantly.\r
 \r
   Each element must be equal sized.\r


@@ -47,7 +47,7 @@ STATIC EFI_UNICODE_COLLATION_PROTOCOL   *mUnicodeCollation = NULL;
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r

-  @param[in] CompareFunction    The function to call to perform the comparison \r
+  @param[in] CompareFunction    The function to call to perform the comparison\r

                                 of any 2 elements\r
   @param[in] Buffer             Buffer of size ElementSize for use in swapping\r
 **/\r
                                 of any 2 elements\r
   @param[in] Buffer             Buffer of size ElementSize for use in swapping\r
 **/\r


@@ -69,7 +69,7 @@ QuickSortWorker (
   ASSERT(CompareFunction  != NULL);\r
   ASSERT(Buffer  != NULL);\r
 \r
   ASSERT(CompareFunction  != NULL);\r
   ASSERT(Buffer  != NULL);\r
 \r

-  if ( Count < 2 \r
+  if ( Count < 2\r

     || ElementSize  < 1\r
     ){\r
     return;\r
     || ElementSize  < 1\r
     ){\r
     return;\r


@@ -87,7 +87,7 @@ QuickSortWorker (
   // and everything "right" are above it\r
   //\r
   for ( LoopCount = 0\r
   // and everything "right" are above it\r
   //\r
   for ( LoopCount = 0\r

-      ; LoopCount < Count -1 \r
+      ; LoopCount < Count -1\r

       ; LoopCount++\r
       ){\r
     //\r
       ; LoopCount++\r
       ){\r
     //\r


@@ -95,7 +95,7 @@ QuickSortWorker (
     //\r
     if (CompareFunction((VOID*)((UINT8*)BufferToSort+((LoopCount)*ElementSize)),Pivot) <= 0){\r
       //\r
     //\r
     if (CompareFunction((VOID*)((UINT8*)BufferToSort+((LoopCount)*ElementSize)),Pivot) <= 0){\r
       //\r

-      // swap \r
+      // swap\r

       //\r
       CopyMem (Buffer, (UINT8*)BufferToSort+(NextSwapLocation*ElementSize), ElementSize);\r
       CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), (UINT8*)BufferToSort+((LoopCount)*ElementSize), ElementSize);\r
       //\r
       CopyMem (Buffer, (UINT8*)BufferToSort+(NextSwapLocation*ElementSize), ElementSize);\r
       CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), (UINT8*)BufferToSort+((LoopCount)*ElementSize), ElementSize);\r


@@ -103,7 +103,7 @@ QuickSortWorker (
 \r
       //\r
       // increment NextSwapLocation\r
 \r
       //\r
       // increment NextSwapLocation\r

-      // \r
+      //\r

       NextSwapLocation++;\r
     }\r
   }\r
       NextSwapLocation++;\r
     }\r
   }\r


@@ -115,20 +115,20 @@ QuickSortWorker (
   CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), Buffer, ElementSize);\r
 \r
   //\r
   CopyMem ((UINT8*)BufferToSort+(NextSwapLocation*ElementSize), Buffer, ElementSize);\r
 \r
   //\r

-  // Now recurse on 2 paritial lists.  neither of these will have the 'pivot' element \r
+  // Now recurse on 2 paritial lists.  neither of these will have the 'pivot' element\r

   // IE list is sorted left half, pivot element, sorted right half...\r
   //\r
   QuickSortWorker(\r
   // IE list is sorted left half, pivot element, sorted right half...\r
   //\r
   QuickSortWorker(\r

-    BufferToSort, \r
-    NextSwapLocation, \r
-    ElementSize, \r
+    BufferToSort,\r
+    NextSwapLocation,\r
+    ElementSize,\r

     CompareFunction,\r
     Buffer);\r
 \r
   QuickSortWorker(\r
     (UINT8 *)BufferToSort + (NextSwapLocation+1) * ElementSize,\r
     CompareFunction,\r
     Buffer);\r
 \r
   QuickSortWorker(\r
     (UINT8 *)BufferToSort + (NextSwapLocation+1) * ElementSize,\r

-    Count - NextSwapLocation - 1, \r
-    ElementSize, \r
+    Count - NextSwapLocation - 1,\r
+    ElementSize,\r

     CompareFunction,\r
     Buffer);\r
 \r
     CompareFunction,\r
     Buffer);\r
 \r


@@ -149,7 +149,7 @@ QuickSortWorker (
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r
                                 on return a buffer of sorted elements\r
   @param[in] Count              the number of elements in the buffer to sort\r
   @param[in] ElementSize        Size of an element in bytes\r

-  @param[in] CompareFunction    The function to call to perform the comparison \r
+  @param[in] CompareFunction    The function to call to perform the comparison\r

                                 of any 2 elements\r
 **/\r
 VOID\r
                                 of any 2 elements\r
 **/\r
 VOID\r


@@ -188,7 +188,7 @@ PerformQuickSort (
 \r
   @retval 0                     Buffer1 equal to Buffer2\r
   @return < 0                   Buffer1 is less than Buffer2\r
 \r
   @retval 0                     Buffer1 equal to Buffer2\r
   @return < 0                   Buffer1 is less than Buffer2\r

-  @return > 0                   Buffer1 is greater than Buffer2                     \r
+  @return > 0                   Buffer1 is greater than Buffer2\r

 **/\r
 INTN\r
 DevicePathCompare (\r
 **/\r
 INTN\r
 DevicePathCompare (\r


@@ -202,7 +202,7 @@ DevicePathCompare (
   CHAR16                    *TextPath2;\r
   EFI_STATUS                Status;\r
   INTN                      RetVal;\r
   CHAR16                    *TextPath2;\r
   EFI_STATUS                Status;\r
   INTN                      RetVal;\r

-   \r
+\r

   DevicePath1 = *(EFI_DEVICE_PATH_PROTOCOL**)Buffer1;\r
   DevicePath2 = *(EFI_DEVICE_PATH_PROTOCOL**)Buffer2;\r
 \r
   DevicePath1 = *(EFI_DEVICE_PATH_PROTOCOL**)Buffer1;\r
   DevicePath2 = *(EFI_DEVICE_PATH_PROTOCOL**)Buffer2;\r
 \r


@@ -217,7 +217,7 @@ DevicePathCompare (
   if (DevicePath2 == NULL) {\r
     return 1;\r
   }\r
   if (DevicePath2 == NULL) {\r
     return 1;\r
   }\r

-  \r
+\r

   if (mDevicePathToText == NULL) {\r
     Status = gBS->LocateProtocol(\r
       &gEfiDevicePathToTextProtocolGuid,\r
   if (mDevicePathToText == NULL) {\r
     Status = gBS->LocateProtocol(\r
       &gEfiDevicePathToTextProtocolGuid,\r


@@ -245,7 +245,7 @@ DevicePathCompare (
     DevicePath2,\r
     FALSE,\r
     FALSE);\r
     DevicePath2,\r
     FALSE,\r
     FALSE);\r

-  \r
+\r

   RetVal = mUnicodeCollation->StriColl(\r
     mUnicodeCollation,\r
     TextPath1,\r
   RetVal = mUnicodeCollation->StriColl(\r
     mUnicodeCollation,\r
     TextPath1,\r


@@ -265,7 +265,7 @@ DevicePathCompare (
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r
 \r
   @retval 0                     Buffer1 equal to Buffer2.\r
   @return < 0                   Buffer1 is less than Buffer2.\r

-  @return > 0                   Buffer1 is greater than Buffer2.                 \r
+  @return > 0                   Buffer1 is greater than Buffer2.\r

 **/\r
 INTN\r
 EFIAPI\r
 **/\r
 INTN\r
 EFIAPI\r

diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
index a93c42dab0a977d4e8deebc1de919a97d73e9ee7..f8f1bb43a8e5315e477f07e6590ffd5bf5447496 100644 (file)
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
@@ -1,9 +1,9 @@
 #/** @file\r
 #   Library used for sorting routines.\r
 #\r
 #/** @file\r
 #   Library used for sorting routines.\r
 #\r

-# Copyright (c) 2009, Intel Corporation.\r
+#  Copyright (c) 2009, Intel Corporation. All rights reserved. <BR>\r

 #\r
 #\r

-#  All rights reserved. This program and the accompanying materials\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
 #  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