OvmfPkg/MptScsiDxe: Reset device on ExitBootServices()

[mirror_edk2.git] / FatPkg / FatPei / FatLiteApi.c

diff --git a/FatPkg/FatPei/FatLiteApi.c b/FatPkg/FatPei/FatLiteApi.c
index b71eaaab2a60051632a6429c8d6a15f8ba07a71a..d07422ba93b7470b51d0c23674c82738bccfed88 100644 (file)
--- a/FatPkg/FatPei/FatLiteApi.c
+++ b/FatPkg/FatPei/FatLiteApi.c
@@ -1,15 +1,9 @@
 /** @file\r
   FAT recovery PEIM entry point, Ppi Functions and FAT Api functions.\r
 \r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 \r
-This program and the accompanying materials are licensed and made available\r
-under the terms and conditions of the BSD License which accompanies this\r
-distribution. The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -18,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 PEI_FAT_PRIVATE_DATA  *mPrivateData = NULL;\r
 \r
 /**\r
-  BlockIo installation nofication function. Find out all the current BlockIO\r
+  BlockIo installation notification function. Find out all the current BlockIO\r
   PPIs in the system and add them into private data. Assume there is\r
 \r
   @param  PeiServices             General purpose services available to every\r
@@ -262,7 +256,7 @@ FatPeimEntry (
 \r
   Status = PeiServicesAllocatePages (\r
             EfiBootServicesCode,\r
-            (sizeof (PEI_FAT_PRIVATE_DATA) - 1) / PEI_FAT_MEMMORY_PAGE_SIZE + 1,\r
+            (sizeof (PEI_FAT_PRIVATE_DATA) - 1) / PEI_FAT_MEMORY_PAGE_SIZE + 1,\r
             &Address\r
             );\r
   if (EFI_ERROR (Status)) {\r
@@ -437,10 +431,6 @@ GetRecoveryCapsuleInfo (
     return Status;\r
   }\r
 \r
-  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-    CapsuleInstance = CapsuleInstance + 1;\r
-  }\r
-\r
   if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -565,10 +555,6 @@ LoadRecoveryCapsule (
     return Status;\r
   }\r
 \r
-  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
-    CapsuleInstance = CapsuleInstance + 1;\r
-  }\r
-\r
   if ((CapsuleInstance == 0) || (CapsuleInstance > NumberRecoveryCapsules)) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -605,7 +591,7 @@ LoadRecoveryCapsule (
 \r
 /**\r
   Finds the recovery file on a FAT volume.\r
-  This function finds the the recovery file named FileName on a specified FAT volume and returns\r
+  This function finds the recovery file named FileName on a specified FAT volume and returns\r
   its FileHandle pointer.\r
 \r
   @param  PrivateData             Global memory map for accessing global\r
@@ -614,7 +600,7 @@ LoadRecoveryCapsule (
   @param  FileName                The recovery file name to find.\r
   @param  Handle                  The output file handle.\r
 \r
-  @retval EFI_DEVICE_ERROR        Some error occured when operating the FAT\r
+  @retval EFI_DEVICE_ERROR        Some error occurred when operating the FAT\r
                                   volume.\r
   @retval EFI_NOT_FOUND           The recovery file was not found.\r
   @retval EFI_SUCCESS             The recovery file was successfully found on the\r