]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / Disk / CdExpressPei / PeiCdExpress.c
index 242dbf8eb190b67e4f690c4439a7957e3d122d34..6a84f9efd1c055f4395a5e27f4f31b9333c0ac28 100644 (file)
@@ -9,9 +9,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "PeiCdExpress.h"\r
 \r
-PEI_CD_EXPRESS_PRIVATE_DATA *mPrivateData = NULL;\r
-CHAR8 *mRecoveryFileName;\r
-UINTN mRecoveryFileNameSize;\r
+PEI_CD_EXPRESS_PRIVATE_DATA  *mPrivateData = NULL;\r
+CHAR8                        *mRecoveryFileName;\r
+UINTN                        mRecoveryFileNameSize;\r
 \r
 /**\r
   Installs the Device Recovery Module PPI, Initialize BlockIo Ppi\r
@@ -27,12 +27,12 @@ UINTN mRecoveryFileNameSize;
 EFI_STATUS\r
 EFIAPI\r
 CdExpressPeimEntry (\r
-  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
-  IN CONST EFI_PEI_SERVICES    **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE     FileHandle,\r
+  IN CONST EFI_PEI_SERVICES  **PeiServices\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  PEI_CD_EXPRESS_PRIVATE_DATA *PrivateData;\r
+  EFI_STATUS                   Status;\r
+  PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData;\r
 \r
   if (!EFI_ERROR (PeiServicesRegisterForShadow (FileHandle))) {\r
     return EFI_SUCCESS;\r
@@ -43,13 +43,14 @@ CdExpressPeimEntry (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  mRecoveryFileNameSize = PcdGetSize(PcdRecoveryFileName) / sizeof(CHAR16);\r
-  mRecoveryFileName = AllocatePool(mRecoveryFileNameSize);\r
+  mRecoveryFileNameSize = PcdGetSize (PcdRecoveryFileName) / sizeof (CHAR16);\r
+  mRecoveryFileName     = AllocatePool (mRecoveryFileNameSize);\r
   if (mRecoveryFileName == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  Status = UnicodeStrToAsciiStrS(PcdGetPtr(PcdRecoveryFileName), mRecoveryFileName, mRecoveryFileNameSize);\r
-  if (EFI_ERROR(Status)) {\r
+\r
+  Status = UnicodeStrToAsciiStrS (PcdGetPtr (PcdRecoveryFileName), mRecoveryFileName, mRecoveryFileNameSize);\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
@@ -57,23 +58,23 @@ CdExpressPeimEntry (
   // Initialize Private Data (to zero, as is required by subsequent operations)\r
   //\r
   ZeroMem (PrivateData, sizeof (*PrivateData));\r
-  PrivateData->Signature    = PEI_CD_EXPRESS_PRIVATE_DATA_SIGNATURE;\r
+  PrivateData->Signature = PEI_CD_EXPRESS_PRIVATE_DATA_SIGNATURE;\r
 \r
-  PrivateData->BlockBuffer  = AllocatePages (EFI_SIZE_TO_PAGES (PEI_CD_BLOCK_SIZE));\r
+  PrivateData->BlockBuffer = AllocatePages (EFI_SIZE_TO_PAGES (PEI_CD_BLOCK_SIZE));\r
   if (PrivateData->BlockBuffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   PrivateData->CapsuleCount = 0;\r
-  Status = UpdateBlocksAndVolumes (PrivateData, TRUE);\r
-  Status = UpdateBlocksAndVolumes (PrivateData, FALSE);\r
+  Status                    = UpdateBlocksAndVolumes (PrivateData, TRUE);\r
+  Status                    = UpdateBlocksAndVolumes (PrivateData, FALSE);\r
 \r
   //\r
   // Installs Ppi\r
   //\r
-  PrivateData->DeviceRecoveryPpi.GetNumberRecoveryCapsules  = GetNumberRecoveryCapsules;\r
-  PrivateData->DeviceRecoveryPpi.GetRecoveryCapsuleInfo     = GetRecoveryCapsuleInfo;\r
-  PrivateData->DeviceRecoveryPpi.LoadRecoveryCapsule        = LoadRecoveryCapsule;\r
+  PrivateData->DeviceRecoveryPpi.GetNumberRecoveryCapsules = GetNumberRecoveryCapsules;\r
+  PrivateData->DeviceRecoveryPpi.GetRecoveryCapsuleInfo    = GetRecoveryCapsuleInfo;\r
+  PrivateData->DeviceRecoveryPpi.LoadRecoveryCapsule       = LoadRecoveryCapsule;\r
 \r
   PrivateData->PpiDescriptor.Flags = (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);\r
   PrivateData->PpiDescriptor.Guid  = &gEfiPeiDeviceRecoveryModulePpiGuid;\r
@@ -83,6 +84,7 @@ CdExpressPeimEntry (
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // PrivateData is allocated now, set it to the module variable\r
   //\r
@@ -93,21 +95,20 @@ CdExpressPeimEntry (
   //\r
   PrivateData->NotifyDescriptor.Flags =\r
     (\r
-      EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK\r
+     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK\r
     );\r
-  PrivateData->NotifyDescriptor.Guid    = &gEfiPeiVirtualBlockIoPpiGuid;\r
-  PrivateData->NotifyDescriptor.Notify  = BlockIoNotifyEntry;\r
+  PrivateData->NotifyDescriptor.Guid   = &gEfiPeiVirtualBlockIoPpiGuid;\r
+  PrivateData->NotifyDescriptor.Notify = BlockIoNotifyEntry;\r
 \r
   PrivateData->NotifyDescriptor2.Flags =\r
     (\r
-      EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK |\r
-      EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST\r
+     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK |\r
+     EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST\r
     );\r
-  PrivateData->NotifyDescriptor2.Guid    = &gEfiPeiVirtualBlockIo2PpiGuid;\r
-  PrivateData->NotifyDescriptor2.Notify  = BlockIoNotifyEntry;\r
+  PrivateData->NotifyDescriptor2.Guid   = &gEfiPeiVirtualBlockIo2PpiGuid;\r
+  PrivateData->NotifyDescriptor2.Notify = BlockIoNotifyEntry;\r
 \r
   return PeiServicesNotifyPpi (&PrivateData->NotifyDescriptor);\r
-\r
 }\r
 \r
 /**\r
@@ -151,8 +152,8 @@ BlockIoNotifyEntry (
 **/\r
 EFI_STATUS\r
 UpdateBlocksAndVolumes (\r
-  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA     *PrivateData,\r
-  IN     BOOLEAN                         BlockIo2\r
+  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData,\r
+  IN     BOOLEAN                      BlockIo2\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -176,19 +177,20 @@ UpdateBlocksAndVolumes (
   for (BlockIoPpiInstance = 0; BlockIoPpiInstance < PEI_CD_EXPRESS_MAX_BLOCK_IO_PPI; BlockIoPpiInstance++) {\r
     if (BlockIo2) {\r
       Status = PeiServicesLocatePpi (\r
-                                &gEfiPeiVirtualBlockIo2PpiGuid,\r
-                                BlockIoPpiInstance,\r
-                                &TempPpiDescriptor,\r
-                                (VOID **) &BlockIo2Ppi\r
-                                );\r
+                 &gEfiPeiVirtualBlockIo2PpiGuid,\r
+                 BlockIoPpiInstance,\r
+                 &TempPpiDescriptor,\r
+                 (VOID **)&BlockIo2Ppi\r
+                 );\r
     } else {\r
       Status = PeiServicesLocatePpi (\r
-                                &gEfiPeiVirtualBlockIoPpiGuid,\r
-                                BlockIoPpiInstance,\r
-                                &TempPpiDescriptor,\r
-                                (VOID **) &BlockIoPpi\r
-                                );\r
+                 &gEfiPeiVirtualBlockIoPpiGuid,\r
+                 BlockIoPpiInstance,\r
+                 &TempPpiDescriptor,\r
+                 (VOID **)&BlockIoPpi\r
+                 );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Done with all Block Io Ppis\r
@@ -196,7 +198,7 @@ UpdateBlocksAndVolumes (
       break;\r
     }\r
 \r
-    PeiServices = (EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
+    PeiServices = (EFI_PEI_SERVICES  **)GetPeiServicesTablePointer ();\r
     if (BlockIo2) {\r
       Status = BlockIo2Ppi->GetNumberOfBlockDevices (\r
                               PeiServices,\r
@@ -205,18 +207,20 @@ UpdateBlocksAndVolumes (
                               );\r
     } else {\r
       Status = BlockIoPpi->GetNumberOfBlockDevices (\r
-                            PeiServices,\r
-                            BlockIoPpi,\r
-                            &NumberBlockDevices\r
-                            );\r
+                             PeiServices,\r
+                             BlockIoPpi,\r
+                             &NumberBlockDevices\r
+                             );\r
     }\r
+\r
     if (EFI_ERROR (Status) || (NumberBlockDevices == 0)) {\r
       continue;\r
     }\r
+\r
     //\r
     // Just retrieve the first block, should emulate all blocks.\r
     //\r
-    for (IndexBlockDevice = 1; IndexBlockDevice <= NumberBlockDevices && PrivateData->CapsuleCount < PEI_CD_EXPRESS_MAX_CAPSULE_NUMBER; IndexBlockDevice ++) {\r
+    for (IndexBlockDevice = 1; IndexBlockDevice <= NumberBlockDevices && PrivateData->CapsuleCount < PEI_CD_EXPRESS_MAX_CAPSULE_NUMBER; IndexBlockDevice++) {\r
       if (BlockIo2) {\r
         Status = BlockIo2Ppi->GetBlockDeviceMediaInfo (\r
                                 PeiServices,\r
@@ -226,28 +230,32 @@ UpdateBlocksAndVolumes (
                                 );\r
         if (EFI_ERROR (Status) ||\r
             !Media2.MediaPresent ||\r
-             ((Media2.InterfaceType != MSG_ATAPI_DP) && (Media2.InterfaceType != MSG_USB_DP)) ||\r
+            ((Media2.InterfaceType != MSG_ATAPI_DP) && (Media2.InterfaceType != MSG_USB_DP)) ||\r
             (Media2.BlockSize != PEI_CD_BLOCK_SIZE)\r
-            ) {\r
+            )\r
+        {\r
           continue;\r
         }\r
+\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress InterfaceType is %d\n", Media2.InterfaceType));\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress MediaPresent is %d\n", Media2.MediaPresent));\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media2.BlockSize));\r
       } else {\r
         Status = BlockIoPpi->GetBlockDeviceMediaInfo (\r
-                              PeiServices,\r
-                              BlockIoPpi,\r
-                              IndexBlockDevice,\r
-                              &Media\r
-                              );\r
+                               PeiServices,\r
+                               BlockIoPpi,\r
+                               IndexBlockDevice,\r
+                               &Media\r
+                               );\r
         if (EFI_ERROR (Status) ||\r
             !Media.MediaPresent ||\r
-             ((Media.DeviceType != IdeCDROM) && (Media.DeviceType != UsbMassStorage)) ||\r
+            ((Media.DeviceType != IdeCDROM) && (Media.DeviceType != UsbMassStorage)) ||\r
             (Media.BlockSize != PEI_CD_BLOCK_SIZE)\r
-            ) {\r
+            )\r
+        {\r
           continue;\r
         }\r
+\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress DeviceType is %d\n", Media.DeviceType));\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress MediaPresent is %d\n", Media.MediaPresent));\r
         DEBUG ((DEBUG_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media.BlockSize));\r
@@ -260,8 +268,9 @@ UpdateBlocksAndVolumes (
       if (BlockIo2) {\r
         PrivateData->CapsuleData[PrivateData->CapsuleCount].BlockIo2 = BlockIo2Ppi;\r
       } else {\r
-        PrivateData->CapsuleData[PrivateData->CapsuleCount].BlockIo  = BlockIoPpi;\r
+        PrivateData->CapsuleData[PrivateData->CapsuleCount].BlockIo = BlockIoPpi;\r
       }\r
+\r
       Status = FindRecoveryCapsules (PrivateData);\r
       DEBUG ((DEBUG_INFO, "Status is %d\n", Status));\r
 \r
@@ -271,7 +280,6 @@ UpdateBlocksAndVolumes (
 \r
       PrivateData->CapsuleCount++;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -289,7 +297,7 @@ UpdateBlocksAndVolumes (
 EFI_STATUS\r
 EFIAPI\r
 FindRecoveryCapsules (\r
-  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA            *PrivateData\r
+  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -307,10 +315,10 @@ FindRecoveryCapsules (
   UINTN                           OriginalLBA;\r
   UINTN                           IndexBlockDevice;\r
 \r
-  Buffer      = PrivateData->BlockBuffer;\r
-  BufferSize  = PEI_CD_BLOCK_SIZE;\r
+  Buffer     = PrivateData->BlockBuffer;\r
+  BufferSize = PEI_CD_BLOCK_SIZE;\r
 \r
-  Lba         = 16;\r
+  Lba = 16;\r
   //\r
   // The volume descriptor starts on Lba 16\r
   //\r
@@ -326,29 +334,30 @@ FindRecoveryCapsules (
     SetMem (Buffer, BufferSize, 0);\r
     if (BlockIo2Ppi != NULL) {\r
       Status = BlockIo2Ppi->ReadBlocks (\r
-                            (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                            BlockIo2Ppi,\r
-                            IndexBlockDevice,\r
-                            Lba,\r
-                            BufferSize,\r
-                            Buffer\r
-                            );\r
+                              (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                              BlockIo2Ppi,\r
+                              IndexBlockDevice,\r
+                              Lba,\r
+                              BufferSize,\r
+                              Buffer\r
+                              );\r
     } else {\r
       Status = BlockIoPpi->ReadBlocks (\r
-                            (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                            BlockIoPpi,\r
-                            IndexBlockDevice,\r
-                            Lba,\r
-                            BufferSize,\r
-                            Buffer\r
-                            );\r
+                             (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                             BlockIoPpi,\r
+                             IndexBlockDevice,\r
+                             Lba,\r
+                             BufferSize,\r
+                             Buffer\r
+                             );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
 \r
-    StandardID = (UINT8 *) (Buffer + PEI_CD_EXPRESS_STANDARD_ID_OFFSET);\r
-    if (!StringCmp (StandardID, (UINT8 *) PEI_CD_STANDARD_ID, PEI_CD_EXPRESS_STANDARD_ID_SIZE, TRUE)) {\r
+    StandardID = (UINT8 *)(Buffer + PEI_CD_EXPRESS_STANDARD_ID_OFFSET);\r
+    if (!StringCmp (StandardID, (UINT8 *)PEI_CD_STANDARD_ID, PEI_CD_EXPRESS_STANDARD_ID_SIZE, TRUE)) {\r
       break;\r
     }\r
 \r
@@ -357,7 +366,7 @@ FindRecoveryCapsules (
       StartOfVolume = FALSE;\r
     }\r
 \r
-    Type = *(UINT8 *) (Buffer + PEI_CD_EXPRESS_VOLUME_TYPE_OFFSET);\r
+    Type = *(UINT8 *)(Buffer + PEI_CD_EXPRESS_VOLUME_TYPE_OFFSET);\r
     if (Type == PEI_CD_EXPRESS_VOLUME_TYPE_TERMINATOR) {\r
       if (VolumeSpaceSize == 0) {\r
         break;\r
@@ -374,12 +383,12 @@ FindRecoveryCapsules (
       continue;\r
     }\r
 \r
-    VolumeSpaceSize = *(UINT32 *) (Buffer + PEI_CD_EXPRESS_VOLUME_SPACE_OFFSET);\r
+    VolumeSpaceSize = *(UINT32 *)(Buffer + PEI_CD_EXPRESS_VOLUME_SPACE_OFFSET);\r
 \r
-    RoorDirRecord   = (PEI_CD_EXPRESS_DIR_FILE_RECORD *) (Buffer + PEI_CD_EXPRESS_ROOT_DIR_RECORD_OFFSET);\r
-    RootDirLBA      = RoorDirRecord->LocationOfExtent[0];\r
+    RoorDirRecord = (PEI_CD_EXPRESS_DIR_FILE_RECORD *)(Buffer + PEI_CD_EXPRESS_ROOT_DIR_RECORD_OFFSET);\r
+    RootDirLBA    = RoorDirRecord->LocationOfExtent[0];\r
 \r
-    Status          = RetrieveCapsuleFileFromRoot (PrivateData, BlockIoPpi, BlockIo2Ppi, IndexBlockDevice, RootDirLBA);\r
+    Status = RetrieveCapsuleFileFromRoot (PrivateData, BlockIoPpi, BlockIo2Ppi, IndexBlockDevice, RootDirLBA);\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Just look for the first primary descriptor\r
@@ -410,11 +419,11 @@ FindRecoveryCapsules (
 EFI_STATUS\r
 EFIAPI\r
 RetrieveCapsuleFileFromRoot (\r
-  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA        *PrivateData,\r
-  IN EFI_PEI_RECOVERY_BLOCK_IO_PPI          *BlockIoPpi,\r
-  IN EFI_PEI_RECOVERY_BLOCK_IO2_PPI         *BlockIo2Ppi,\r
-  IN UINTN                                  IndexBlockDevice,\r
-  IN UINT32                                 Lba\r
+  IN OUT PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData,\r
+  IN EFI_PEI_RECOVERY_BLOCK_IO_PPI    *BlockIoPpi,\r
+  IN EFI_PEI_RECOVERY_BLOCK_IO2_PPI   *BlockIo2Ppi,\r
+  IN UINTN                            IndexBlockDevice,\r
+  IN UINT32                           Lba\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -423,40 +432,42 @@ RetrieveCapsuleFileFromRoot (
   PEI_CD_EXPRESS_DIR_FILE_RECORD  *FileRecord;\r
   UINTN                           Index;\r
 \r
-  Buffer      = PrivateData->BlockBuffer;\r
-  BufferSize  = PEI_CD_BLOCK_SIZE;\r
+  Buffer     = PrivateData->BlockBuffer;\r
+  BufferSize = PEI_CD_BLOCK_SIZE;\r
 \r
   SetMem (Buffer, BufferSize, 0);\r
 \r
   if (BlockIo2Ppi != NULL) {\r
     Status = BlockIo2Ppi->ReadBlocks (\r
-                          (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                          BlockIo2Ppi,\r
-                          IndexBlockDevice,\r
-                          Lba,\r
-                          BufferSize,\r
-                          Buffer\r
-                          );\r
+                            (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                            BlockIo2Ppi,\r
+                            IndexBlockDevice,\r
+                            Lba,\r
+                            BufferSize,\r
+                            Buffer\r
+                            );\r
   } else {\r
     Status = BlockIoPpi->ReadBlocks (\r
-                          (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                          BlockIoPpi,\r
-                          IndexBlockDevice,\r
-                          Lba,\r
-                          BufferSize,\r
-                          Buffer\r
-                          );\r
+                           (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                           BlockIoPpi,\r
+                           IndexBlockDevice,\r
+                           Lba,\r
+                           BufferSize,\r
+                           Buffer\r
+                           );\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   while (1) {\r
-    FileRecord = (PEI_CD_EXPRESS_DIR_FILE_RECORD *) Buffer;\r
+    FileRecord = (PEI_CD_EXPRESS_DIR_FILE_RECORD *)Buffer;\r
 \r
     if (FileRecord->Length == 0) {\r
       break;\r
     }\r
+\r
     //\r
     // Not intend to check other flag now\r
     //\r
@@ -481,12 +492,12 @@ RetrieveCapsuleFileFromRoot (
       continue;\r
     }\r
 \r
-    PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleStartLBA = FileRecord->LocationOfExtent[0];\r
+    PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleStartLBA         = FileRecord->LocationOfExtent[0];\r
     PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleBlockAlignedSize =\r
       (\r
-        FileRecord->DataLength[0] /\r
-        PEI_CD_BLOCK_SIZE +\r
-        1\r
+       FileRecord->DataLength[0] /\r
+       PEI_CD_BLOCK_SIZE +\r
+       1\r
       ) *\r
       PEI_CD_BLOCK_SIZE;\r
     PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleSize = FileRecord->DataLength[0];\r
@@ -523,12 +534,12 @@ RetrieveCapsuleFileFromRoot (
 EFI_STATUS\r
 EFIAPI\r
 GetNumberRecoveryCapsules (\r
-  IN EFI_PEI_SERVICES                               **PeiServices,\r
-  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI             *This,\r
-  OUT UINTN                                         *NumberRecoveryCapsules\r
+  IN EFI_PEI_SERVICES                    **PeiServices,\r
+  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,\r
+  OUT UINTN                              *NumberRecoveryCapsules\r
   )\r
 {\r
-  PEI_CD_EXPRESS_PRIVATE_DATA *PrivateData;\r
+  PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData;\r
 \r
   PrivateData = PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This);\r
   UpdateBlocksAndVolumes (PrivateData, TRUE);\r
@@ -570,16 +581,16 @@ GetNumberRecoveryCapsules (
 EFI_STATUS\r
 EFIAPI\r
 GetRecoveryCapsuleInfo (\r
-  IN  EFI_PEI_SERVICES                              **PeiServices,\r
-  IN  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI            *This,\r
-  IN  UINTN                                         CapsuleInstance,\r
-  OUT UINTN                                         *Size,\r
-  OUT EFI_GUID                                      *CapsuleType\r
+  IN  EFI_PEI_SERVICES                    **PeiServices,\r
+  IN  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,\r
+  IN  UINTN                               CapsuleInstance,\r
+  OUT UINTN                               *Size,\r
+  OUT EFI_GUID                            *CapsuleType\r
   )\r
 {\r
-  PEI_CD_EXPRESS_PRIVATE_DATA *PrivateData;\r
-  UINTN                       NumberRecoveryCapsules;\r
-  EFI_STATUS                  Status;\r
+  PEI_CD_EXPRESS_PRIVATE_DATA  *PrivateData;\r
+  UINTN                        NumberRecoveryCapsules;\r
+  EFI_STATUS                   Status;\r
 \r
   Status = GetNumberRecoveryCapsules (PeiServices, This, &NumberRecoveryCapsules);\r
 \r
@@ -625,10 +636,10 @@ GetRecoveryCapsuleInfo (
 EFI_STATUS\r
 EFIAPI\r
 LoadRecoveryCapsule (\r
-  IN EFI_PEI_SERVICES                             **PeiServices,\r
-  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI           *This,\r
-  IN UINTN                                        CapsuleInstance,\r
-  OUT VOID                                        *Buffer\r
+  IN EFI_PEI_SERVICES                    **PeiServices,\r
+  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,\r
+  IN UINTN                               CapsuleInstance,\r
+  OUT VOID                               *Buffer\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -653,23 +664,24 @@ LoadRecoveryCapsule (
 \r
   if (BlockIo2Ppi != NULL) {\r
     Status = BlockIo2Ppi->ReadBlocks (\r
-                          PeiServices,\r
-                          BlockIo2Ppi,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
-                          Buffer\r
-                          );\r
+                            PeiServices,\r
+                            BlockIo2Ppi,\r
+                            PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
+                            PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
+                            PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
+                            Buffer\r
+                            );\r
   } else {\r
     Status = BlockIoPpi->ReadBlocks (\r
-                          PeiServices,\r
-                          BlockIoPpi,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
-                          PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
-                          Buffer\r
-                          );\r
+                           PeiServices,\r
+                           BlockIoPpi,\r
+                           PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock,\r
+                           PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA,\r
+                           PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize,\r
+                           Buffer\r
+                           );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -687,14 +699,14 @@ LoadRecoveryCapsule (
 **/\r
 BOOLEAN\r
 StringCmp (\r
-  IN UINT8      *Source1,\r
-  IN UINT8      *Source2,\r
-  IN UINTN      Size,\r
-  IN BOOLEAN    CaseSensitive\r
+  IN UINT8    *Source1,\r
+  IN UINT8    *Source2,\r
+  IN UINTN    Size,\r
+  IN BOOLEAN  CaseSensitive\r
   )\r
 {\r
-  UINTN Index;\r
-  UINT8 Dif;\r
+  UINTN  Index;\r
+  UINT8  Dif;\r
 \r
   for (Index = 0; Index < Size; Index++) {\r
     if (Source1[Index] == Source2[Index]) {\r
@@ -702,7 +714,7 @@ StringCmp (
     }\r
 \r
     if (!CaseSensitive) {\r
-      Dif = (UINT8) ((Source1[Index] > Source2[Index]) ? (Source1[Index] - Source2[Index]) : (Source2[Index] - Source1[Index]));\r
+      Dif = (UINT8)((Source1[Index] > Source2[Index]) ? (Source1[Index] - Source2[Index]) : (Source2[Index] - Source1[Index]));\r
       if (Dif == ('a' - 'A')) {\r
         continue;\r
       }\r