]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
MdeModulePkg/scsi :Coverity scan flags multiple issues in edk2-stable202205
[mirror_edk2.git] / MdeModulePkg / Bus / Scsi / ScsiDiskDxe / ScsiDisk.c
index 6bfcf03a4b4122fac888bf6880be5ceb091a8640..6555aeed7d69355df2db54da8db8cec4c6dfe004 100644 (file)
@@ -2,14 +2,18 @@
   SCSI disk driver that layers on every SCSI IO protocol in the system.\r
 \r
 Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 1985 - 2022, American Megatrends International LLC.<BR>\r
+<<<<<<< HEAD\r
+=======\r
+\r
+>>>>>>> ace365b4e0 (MdeModulePkg/scsi :Coverity scan flags multiple issues in edk2-stable202205)\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-\r
 #include "ScsiDisk.h"\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gScsiDiskDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gScsiDiskDriverBinding = {\r
   ScsiDiskDriverBindingSupported,\r
   ScsiDiskDriverBindingStart,\r
   ScsiDiskDriverBindingStop,\r
@@ -18,7 +22,7 @@ EFI_DRIVER_BINDING_PROTOCOL gScsiDiskDriverBinding = {
   NULL\r
 };\r
 \r
-EFI_DISK_INFO_PROTOCOL gScsiDiskInfoProtocolTemplate = {\r
+EFI_DISK_INFO_PROTOCOL  gScsiDiskInfoProtocolTemplate = {\r
   EFI_DISK_INFO_SCSI_INTERFACE_GUID,\r
   ScsiDiskInfoInquiry,\r
   ScsiDiskInfoIdentify,\r
@@ -40,8 +44,8 @@ EFI_DISK_INFO_PROTOCOL gScsiDiskInfoProtocolTemplate = {
 **/\r
 VOID *\r
 AllocateAlignedBuffer (\r
-  IN SCSI_DISK_DEV            *ScsiDiskDevice,\r
-  IN UINTN                    BufferSize\r
+  IN SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN UINTN          BufferSize\r
   )\r
 {\r
   return AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), ScsiDiskDevice->ScsiIo->IoAlign);\r
@@ -59,8 +63,8 @@ AllocateAlignedBuffer (
 **/\r
 VOID\r
 FreeAlignedBuffer (\r
-  IN VOID                     *Buffer,\r
-  IN UINTN                    BufferSize\r
+  IN VOID   *Buffer,\r
+  IN UINTN  BufferSize\r
   )\r
 {\r
   if (Buffer != NULL) {\r
@@ -68,6 +72,33 @@ FreeAlignedBuffer (
   }\r
 }\r
 \r
+/**\r
+  Remove trailing spaces from the string.\r
+\r
+  @param String   The ASCII string to remove the trailing spaces.\r
+\r
+  @retval the new length of the string.\r
+**/\r
+UINTN\r
+RemoveTrailingSpaces (\r
+  IN OUT CHAR8  *String\r
+  )\r
+{\r
+  UINTN  Length;\r
+\r
+  Length = AsciiStrLen (String);\r
+  if (Length == 0) {\r
+    return 0;\r
+  }\r
+\r
+  while ((Length > 0) && (String[Length-1] == ' ')) {\r
+    Length--;\r
+  }\r
+\r
+  String[Length] = '\0';\r
+  return Length;\r
+}\r
+\r
 /**\r
   The user Entry Point for module ScsiDisk.\r
 \r
@@ -82,12 +113,12 @@ FreeAlignedBuffer (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-InitializeScsiDisk(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+InitializeScsiDisk (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install driver model protocol(s).\r
@@ -102,7 +133,6 @@ InitializeScsiDisk(
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   return Status;\r
 }\r
 \r
@@ -140,7 +170,7 @@ ScsiDiskDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiScsiIoProtocolGuid,\r
-                  (VOID **) &ScsiIo,\r
+                  (VOID **)&ScsiIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -153,7 +183,8 @@ ScsiDiskDriverBindingSupported (
   if (!EFI_ERROR (Status)) {\r
     if ((DeviceType == EFI_SCSI_TYPE_DISK) ||\r
         (DeviceType == EFI_SCSI_TYPE_CDROM) ||\r
-        (DeviceType == EFI_SCSI_TYPE_WLUN)) {\r
+        (DeviceType == EFI_SCSI_TYPE_WLUN))\r
+    {\r
       Status = EFI_SUCCESS;\r
     } else {\r
       Status = EFI_UNSUPPORTED;\r
@@ -169,7 +200,6 @@ ScsiDiskDriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start this driver on ControllerHandle.\r
 \r
@@ -205,10 +235,13 @@ ScsiDiskDriverBindingStart (
   UINT8                 MaxRetry;\r
   BOOLEAN               NeedRetry;\r
   BOOLEAN               MustReadCapacity;\r
+  CHAR8                 VendorStr[VENDOR_IDENTIFICATION_LENGTH + 1];\r
+  CHAR8                 ProductStr[PRODUCT_IDENTIFICATION_LENGTH + 1];\r
+  CHAR16                DeviceStr[VENDOR_IDENTIFICATION_LENGTH + PRODUCT_IDENTIFICATION_LENGTH + 2];\r
 \r
   MustReadCapacity = TRUE;\r
 \r
-  ScsiDiskDevice = (SCSI_DISK_DEV *) AllocateZeroPool (sizeof (SCSI_DISK_DEV));\r
+  ScsiDiskDevice = (SCSI_DISK_DEV *)AllocateZeroPool (sizeof (SCSI_DISK_DEV));\r
   if (ScsiDiskDevice == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -216,7 +249,7 @@ ScsiDiskDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiScsiIoProtocolGuid,\r
-                  (VOID **) &ScsiIo,\r
+                  (VOID **)&ScsiIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -252,35 +285,36 @@ ScsiDiskDriverBindingStart (
 \r
   ScsiIo->GetDeviceType (ScsiIo, &(ScsiDiskDevice->DeviceType));\r
   switch (ScsiDiskDevice->DeviceType) {\r
-  case EFI_SCSI_TYPE_DISK:\r
-    ScsiDiskDevice->BlkIo.Media->BlockSize = 0x200;\r
-    MustReadCapacity = TRUE;\r
-    break;\r
+    case EFI_SCSI_TYPE_DISK:\r
+      ScsiDiskDevice->BlkIo.Media->BlockSize = 0x200;\r
+      MustReadCapacity                       = TRUE;\r
+      break;\r
 \r
-  case EFI_SCSI_TYPE_CDROM:\r
-    ScsiDiskDevice->BlkIo.Media->BlockSize = 0x800;\r
-    ScsiDiskDevice->BlkIo.Media->ReadOnly  = TRUE;\r
-    MustReadCapacity = FALSE;\r
-    break;\r
+    case EFI_SCSI_TYPE_CDROM:\r
+      ScsiDiskDevice->BlkIo.Media->BlockSize = 0x800;\r
+      ScsiDiskDevice->BlkIo.Media->ReadOnly  = TRUE;\r
+      MustReadCapacity                       = FALSE;\r
+      break;\r
 \r
-  case EFI_SCSI_TYPE_WLUN:\r
-    MustReadCapacity = FALSE;\r
-    break;\r
+    case EFI_SCSI_TYPE_WLUN:\r
+      MustReadCapacity = FALSE;\r
+      break;\r
   }\r
+\r
   //\r
   // The Sense Data Array's initial size is 6\r
   //\r
   ScsiDiskDevice->SenseDataNumber = 6;\r
-  ScsiDiskDevice->SenseData = (EFI_SCSI_SENSE_DATA *) AllocateZeroPool (\r
-                                 sizeof (EFI_SCSI_SENSE_DATA) * ScsiDiskDevice->SenseDataNumber\r
-                                 );\r
+  ScsiDiskDevice->SenseData       = (EFI_SCSI_SENSE_DATA *)AllocateZeroPool (\r
+                                                             sizeof (EFI_SCSI_SENSE_DATA) * ScsiDiskDevice->SenseDataNumber\r
+                                                             );\r
   if (ScsiDiskDevice->SenseData == NULL) {\r
     gBS->CloseProtocol (\r
-          Controller,\r
-          &gEfiScsiIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+           Controller,\r
+           &gEfiScsiIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
     FreePool (ScsiDiskDevice);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -307,6 +341,7 @@ ScsiDiskDriverBindingStart (
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
+\r
   //\r
   // The second parameter "TRUE" means must\r
   // retrieve media capacity\r
@@ -341,6 +376,7 @@ ScsiDiskDriverBindingStart (
             DEBUG ((DEBUG_ERROR, "ScsiDisk: Failed to install the Erase Block Protocol! Status = %r\n", Status));\r
           }\r
         }\r
+\r
         if (DetermineInstallStorageSecurity (ScsiDiskDevice, Controller)) {\r
           Status = gBS->InstallProtocolInterface (\r
                           &Controller,\r
@@ -352,19 +388,38 @@ ScsiDiskDriverBindingStart (
             DEBUG ((DEBUG_ERROR, "ScsiDisk: Failed to install the Storage Security Command Protocol! Status = %r\n", Status));\r
           }\r
         }\r
+\r
+        CopyMem (\r
+          VendorStr,\r
+          &ScsiDiskDevice->InquiryData.Reserved_5_95[VENDOR_IDENTIFICATION_OFFSET],\r
+          VENDOR_IDENTIFICATION_LENGTH\r
+          );\r
+        VendorStr[VENDOR_IDENTIFICATION_LENGTH] = 0;\r
+        RemoveTrailingSpaces (VendorStr);\r
+\r
+        CopyMem (\r
+          ProductStr,\r
+          &ScsiDiskDevice->InquiryData.Reserved_5_95[PRODUCT_IDENTIFICATION_OFFSET],\r
+          PRODUCT_IDENTIFICATION_LENGTH\r
+          );\r
+        ProductStr[PRODUCT_IDENTIFICATION_LENGTH] = 0;\r
+        RemoveTrailingSpaces (ProductStr);\r
+\r
+        UnicodeSPrint (DeviceStr, sizeof (DeviceStr), L"%a %a", VendorStr, ProductStr);\r
+\r
         ScsiDiskDevice->ControllerNameTable = NULL;\r
         AddUnicodeString2 (\r
           "eng",\r
           gScsiDiskComponentName.SupportedLanguages,\r
           &ScsiDiskDevice->ControllerNameTable,\r
-          L"SCSI Disk Device",\r
+          DeviceStr,\r
           TRUE\r
           );\r
         AddUnicodeString2 (\r
           "en",\r
           gScsiDiskComponentName2.SupportedLanguages,\r
           &ScsiDiskDevice->ControllerNameTable,\r
-          L"SCSI Disk Device",\r
+          DeviceStr,\r
           FALSE\r
           );\r
         return EFI_SUCCESS;\r
@@ -381,10 +436,8 @@ ScsiDiskDriverBindingStart (
          Controller\r
          );\r
   return Status;\r
-\r
 }\r
 \r
-\r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
@@ -407,21 +460,21 @@ ScsiDiskDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer   OPTIONAL\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer   OPTIONAL\r
   )\r
 {\r
-  EFI_BLOCK_IO_PROTOCOL      *BlkIo;\r
-  EFI_ERASE_BLOCK_PROTOCOL   *EraseBlock;\r
-  SCSI_DISK_DEV              *ScsiDiskDevice;\r
-  EFI_STATUS                 Status;\r
+  EFI_BLOCK_IO_PROTOCOL     *BlkIo;\r
+  EFI_ERASE_BLOCK_PROTOCOL  *EraseBlock;\r
+  SCSI_DISK_DEV             *ScsiDiskDevice;\r
+  EFI_STATUS                Status;\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiBlockIoProtocolGuid,\r
-                  (VOID **) &BlkIo,\r
+                  (VOID **)&BlkIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -435,7 +488,8 @@ ScsiDiskDriverBindingStop (
   //\r
   // Wait for the BlockIo2 requests queue to become empty\r
   //\r
-  while (!IsListEmpty (&ScsiDiskDevice->AsyncTaskQueue));\r
+  while (!IsListEmpty (&ScsiDiskDevice->AsyncTaskQueue)) {\r
+  }\r
 \r
   //\r
   // If Erase Block Protocol is installed, then uninstall this protocol.\r
@@ -443,7 +497,7 @@ ScsiDiskDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiEraseBlockProtocolGuid,\r
-                  (VOID **) &EraseBlock,\r
+                  (VOID **)&EraseBlock,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -482,6 +536,7 @@ ScsiDiskDriverBindingStop (
 \r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // errors met\r
   //\r
@@ -504,19 +559,19 @@ ScsiDiskDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskReset (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  BOOLEAN                 ExtendedVerification\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  BOOLEAN                ExtendedVerification\r
   )\r
 {\r
-  EFI_TPL       OldTpl;\r
-  SCSI_DISK_DEV *ScsiDiskDevice;\r
-  EFI_STATUS    Status;\r
+  EFI_TPL        OldTpl;\r
+  SCSI_DISK_DEV  *ScsiDiskDevice;\r
+  EFI_STATUS     Status;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  ScsiDiskDevice  = SCSI_DISK_DEV_FROM_BLKIO (This);\r
+  ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);\r
 \r
-  Status          = ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+  Status = ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
 \r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_UNSUPPORTED) {\r
@@ -563,11 +618,11 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  OUT VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -583,8 +638,7 @@ ScsiDiskReadBlocks (
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);\r
   Media          = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
-\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -593,11 +647,11 @@ ScsiDiskReadBlocks (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -612,33 +666,37 @@ ScsiDiskReadBlocks (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
+\r
   //\r
   // Get the intrinsic block size\r
   //\r
-  BlockSize       = Media->BlockSize;\r
+  BlockSize = Media->BlockSize;\r
 \r
   if (BlockSize == 0) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
 \r
   if (!(Media->MediaPresent)) {\r
     Status = EFI_NO_MEDIA;\r
@@ -675,7 +733,7 @@ ScsiDiskReadBlocks (
     goto Done;\r
   }\r
 \r
-  if ((Media->IoAlign > 1) && (((UINTN) Buffer & (Media->IoAlign - 1)) != 0)) {\r
+  if ((Media->IoAlign > 1) && (((UINTN)Buffer & (Media->IoAlign - 1)) != 0)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
@@ -704,7 +762,7 @@ Done:
   @retval EFI_WRITE_PROTECTED   The device can not be written to.\r
   @retval EFI_DEVICE_ERROR      Fail to detect media.\r
   @retval EFI_NO_MEDIA          Media is not present.\r
-  @retval EFI_MEDIA_CHNAGED     Media has changed.\r
+  @retval EFI_MEDIA_CHANGED     Media has changed.\r
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.\r
   @retval EFI_INVALID_PARAMETER Invalid parameter passed in.\r
 \r
@@ -712,11 +770,11 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskWriteBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  IN  VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  IN  VOID                   *Buffer\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -732,8 +790,7 @@ ScsiDiskWriteBlocks (
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);\r
   Media          = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
-\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -742,11 +799,11 @@ ScsiDiskWriteBlocks (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -761,33 +818,37 @@ ScsiDiskWriteBlocks (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
+\r
   //\r
   // Get the intrinsic block size\r
   //\r
-  BlockSize       = Media->BlockSize;\r
+  BlockSize = Media->BlockSize;\r
 \r
   if (BlockSize == 0) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
 \r
   if (!(Media->MediaPresent)) {\r
     Status = EFI_NO_MEDIA;\r
@@ -829,10 +890,11 @@ ScsiDiskWriteBlocks (
     goto Done;\r
   }\r
 \r
-  if ((Media->IoAlign > 1) && (((UINTN) Buffer & (Media->IoAlign - 1)) != 0)) {\r
+  if ((Media->IoAlign > 1) && (((UINTN)Buffer & (Media->IoAlign - 1)) != 0)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
+\r
   //\r
   // if all the parameters are valid, then perform read sectors command\r
   // to transfer data from device to host.\r
@@ -857,7 +919,7 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskFlushBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This\r
   )\r
 {\r
   //\r
@@ -866,7 +928,6 @@ ScsiDiskFlushBlocks (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Reset SCSI Disk.\r
 \r
@@ -886,15 +947,15 @@ ScsiDiskResetEx (
   IN  BOOLEAN                 ExtendedVerification\r
   )\r
 {\r
-  EFI_TPL       OldTpl;\r
-  SCSI_DISK_DEV *ScsiDiskDevice;\r
-  EFI_STATUS    Status;\r
+  EFI_TPL        OldTpl;\r
+  SCSI_DISK_DEV  *ScsiDiskDevice;\r
+  EFI_STATUS     Status;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  ScsiDiskDevice  = SCSI_DISK_DEV_FROM_BLKIO2 (This);\r
+  ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);\r
 \r
-  Status          = ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+  Status = ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
 \r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_UNSUPPORTED) {\r
@@ -950,12 +1011,12 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskReadBlocksEx (\r
-  IN     EFI_BLOCK_IO2_PROTOCOL   *This,\r
-  IN     UINT32                   MediaId,\r
-  IN     EFI_LBA                  Lba,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN      *Token,\r
-  IN     UINTN                    BufferSize,\r
-  OUT    VOID                     *Buffer\r
+  IN     EFI_BLOCK_IO2_PROTOCOL  *This,\r
+  IN     UINT32                  MediaId,\r
+  IN     EFI_LBA                 Lba,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN     *Token,\r
+  IN     UINTN                   BufferSize,\r
+  OUT    VOID                    *Buffer\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -971,8 +1032,7 @@ ScsiDiskReadBlocksEx (
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);\r
   Media          = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
-\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -981,11 +1041,11 @@ ScsiDiskReadBlocksEx (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -1000,33 +1060,37 @@ ScsiDiskReadBlocksEx (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
+\r
   //\r
   // Get the intrinsic block size\r
   //\r
-  BlockSize       = Media->BlockSize;\r
+  BlockSize = Media->BlockSize;\r
 \r
   if (BlockSize == 0) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
 \r
   if (!(Media->MediaPresent)) {\r
     Status = EFI_NO_MEDIA;\r
@@ -1068,7 +1132,7 @@ ScsiDiskReadBlocksEx (
     goto Done;\r
   }\r
 \r
-  if ((Media->IoAlign > 1) && (((UINTN) Buffer & (Media->IoAlign - 1)) != 0)) {\r
+  if ((Media->IoAlign > 1) && (((UINTN)Buffer & (Media->IoAlign - 1)) != 0)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
@@ -1079,13 +1143,13 @@ ScsiDiskReadBlocksEx (
   //\r
   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Token->TransactionStatus = EFI_SUCCESS;\r
-    Status = ScsiDiskAsyncReadSectors (\r
-               ScsiDiskDevice,\r
-               Buffer,\r
-               Lba,\r
-               NumberOfBlocks,\r
-               Token\r
-               );\r
+    Status                   = ScsiDiskAsyncReadSectors (\r
+                                 ScsiDiskDevice,\r
+                                 Buffer,\r
+                                 Lba,\r
+                                 NumberOfBlocks,\r
+                                 Token\r
+                                 );\r
   } else {\r
     Status = ScsiDiskReadSectors (\r
                ScsiDiskDevice,\r
@@ -1126,12 +1190,12 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskWriteBlocksEx (\r
-  IN     EFI_BLOCK_IO2_PROTOCOL *This,\r
-  IN     UINT32                 MediaId,\r
-  IN     EFI_LBA                Lba,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,\r
-  IN     UINTN                  BufferSize,\r
-  IN     VOID                   *Buffer\r
+  IN     EFI_BLOCK_IO2_PROTOCOL  *This,\r
+  IN     UINT32                  MediaId,\r
+  IN     EFI_LBA                 Lba,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN     *Token,\r
+  IN     UINTN                   BufferSize,\r
+  IN     VOID                    *Buffer\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -1147,8 +1211,7 @@ ScsiDiskWriteBlocksEx (
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);\r
   Media          = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
-\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -1157,11 +1220,11 @@ ScsiDiskWriteBlocksEx (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -1176,33 +1239,37 @@ ScsiDiskWriteBlocksEx (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
+\r
   //\r
   // Get the intrinsic block size\r
   //\r
-  BlockSize       = Media->BlockSize;\r
+  BlockSize = Media->BlockSize;\r
 \r
   if (BlockSize == 0) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
 \r
   if (!(Media->MediaPresent)) {\r
     Status = EFI_NO_MEDIA;\r
@@ -1249,7 +1316,7 @@ ScsiDiskWriteBlocksEx (
     goto Done;\r
   }\r
 \r
-  if ((Media->IoAlign > 1) && (((UINTN) Buffer & (Media->IoAlign - 1)) != 0)) {\r
+  if ((Media->IoAlign > 1) && (((UINTN)Buffer & (Media->IoAlign - 1)) != 0)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
@@ -1260,13 +1327,13 @@ ScsiDiskWriteBlocksEx (
   //\r
   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Token->TransactionStatus = EFI_SUCCESS;\r
-    Status = ScsiDiskAsyncWriteSectors (\r
-               ScsiDiskDevice,\r
-               Buffer,\r
-               Lba,\r
-               NumberOfBlocks,\r
-               Token\r
-               );\r
+    Status                   = ScsiDiskAsyncWriteSectors (\r
+                                 ScsiDiskDevice,\r
+                                 Buffer,\r
+                                 Lba,\r
+                                 NumberOfBlocks,\r
+                                 Token\r
+                                 );\r
   } else {\r
     Status = ScsiDiskWriteSectors (\r
                ScsiDiskDevice,\r
@@ -1313,8 +1380,7 @@ ScsiDiskFlushBlocksEx (
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);\r
   Media          = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
-\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -1323,11 +1389,11 @@ ScsiDiskFlushBlocksEx (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -1342,19 +1408,22 @@ ScsiDiskFlushBlocksEx (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
@@ -1372,7 +1441,8 @@ ScsiDiskFlushBlocksEx (
   //\r
   // Wait for the BlockIo2 requests queue to become empty\r
   //\r
-  while (!IsListEmpty (&ScsiDiskDevice->AsyncTaskQueue));\r
+  while (!IsListEmpty (&ScsiDiskDevice->AsyncTaskQueue)) {\r
+  }\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1389,7 +1459,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Internal helper notify function which process the result of an asynchronous\r
   SCSI UNMAP Command and signal the event passed from EraseBlocks.\r
@@ -1412,15 +1481,15 @@ ScsiDiskAsyncUnmapNotify (
 \r
   gBS->CloseEvent (Event);\r
 \r
-  EraseBlkReq              = (SCSI_ERASEBLK_REQUEST *) Context;\r
+  EraseBlkReq              = (SCSI_ERASEBLK_REQUEST *)Context;\r
   CommandPacket            = &EraseBlkReq->CommandPacket;\r
   Token                    = EraseBlkReq->Token;\r
   Token->TransactionStatus = EFI_SUCCESS;\r
 \r
   Status = CheckHostAdapterStatus (CommandPacket->HostAdapterStatus);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((\r
-      EFI_D_ERROR,\r
+      DEBUG_ERROR,\r
       "ScsiDiskAsyncUnmapNotify: Host adapter indicating error status 0x%x.\n",\r
       CommandPacket->HostAdapterStatus\r
       ));\r
@@ -1430,9 +1499,9 @@ ScsiDiskAsyncUnmapNotify (
   }\r
 \r
   Status = CheckTargetStatus (CommandPacket->TargetStatus);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((\r
-      EFI_D_ERROR,\r
+      DEBUG_ERROR,\r
       "ScsiDiskAsyncUnmapNotify: Target indicating error status 0x%x.\n",\r
       CommandPacket->HostAdapterStatus\r
       ));\r
@@ -1465,10 +1534,10 @@ Done:
 **/\r
 EFI_STATUS\r
 ScsiDiskUnmap (\r
-  IN SCSI_DISK_DEV                 *ScsiDiskDevice,\r
-  IN UINT64                        Lba,\r
-  IN UINTN                         Blocks,\r
-  IN EFI_ERASE_BLOCK_TOKEN         *Token            OPTIONAL\r
+  IN SCSI_DISK_DEV          *ScsiDiskDevice,\r
+  IN UINT64                 Lba,\r
+  IN UINTN                  Blocks,\r
+  IN EFI_ERASE_BLOCK_TOKEN  *Token            OPTIONAL\r
   )\r
 {\r
   EFI_SCSI_IO_PROTOCOL             *ScsiIo;\r
@@ -1494,7 +1563,7 @@ ScsiDiskUnmap (
   AsyncUnmapEvent = NULL;\r
   ReturnStatus    = EFI_SUCCESS;\r
 \r
-  if (Blocks / (UINTN) MaxLbaCnt > MaxBlkDespCnt) {\r
+  if (Blocks / (UINTN)MaxLbaCnt > MaxBlkDespCnt) {\r
     ReturnStatus = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -1511,10 +1580,10 @@ ScsiDiskUnmap (
     goto Done;\r
   }\r
 \r
-  BlkDespCnt        = (UINT32) ((Blocks - 1) / MaxLbaCnt + 1);\r
-  UnmapParamListLen = (UINT16) (sizeof (EFI_SCSI_DISK_UNMAP_PARAM_LIST_HEADER)\r
-                      + BlkDespCnt * sizeof (EFI_SCSI_DISK_UNMAP_BLOCK_DESP));\r
-  UnmapParamList    = AllocateZeroPool (UnmapParamListLen);\r
+  BlkDespCnt        = (UINT32)((Blocks - 1) / MaxLbaCnt + 1);\r
+  UnmapParamListLen = (UINT16)(sizeof (EFI_SCSI_DISK_UNMAP_PARAM_LIST_HEADER)\r
+                               + BlkDespCnt * sizeof (EFI_SCSI_DISK_UNMAP_BLOCK_DESP));\r
+  UnmapParamList = AllocateZeroPool (UnmapParamListLen);\r
   if (UnmapParamList == NULL) {\r
     ReturnStatus = EFI_DEVICE_ERROR;\r
     goto Done;\r
@@ -1528,12 +1597,12 @@ ScsiDiskUnmap (
     if (Blocks > MaxLbaCnt) {\r
       *(UINT64 *)(&BlkDespPtr->Lba)      = SwapBytes64 (Lba);\r
       *(UINT32 *)(&BlkDespPtr->BlockNum) = SwapBytes32 (MaxLbaCnt);\r
-      Blocks -= MaxLbaCnt;\r
-      Lba    += MaxLbaCnt;\r
+      Blocks                            -= MaxLbaCnt;\r
+      Lba                               += MaxLbaCnt;\r
     } else {\r
       *(UINT64 *)(&BlkDespPtr->Lba)      = SwapBytes64 (Lba);\r
-      *(UINT32 *)(&BlkDespPtr->BlockNum) = SwapBytes32 ((UINT32) Blocks);\r
-      Blocks = 0;\r
+      *(UINT32 *)(&BlkDespPtr->BlockNum) = SwapBytes32 ((UINT32)Blocks);\r
+      Blocks                             = 0;\r
     }\r
 \r
     BlkDespPtr++;\r
@@ -1563,7 +1632,7 @@ ScsiDiskUnmap (
                     EraseBlkReq,\r
                     &AsyncUnmapEvent\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       ReturnStatus = EFI_DEVICE_ERROR;\r
       goto Done;\r
     }\r
@@ -1579,7 +1648,7 @@ ScsiDiskUnmap (
                        CommandPacket,\r
                        AsyncUnmapEvent\r
                        );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       ReturnStatus = EFI_DEVICE_ERROR;\r
 \r
       OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
@@ -1602,7 +1671,7 @@ ScsiDiskUnmap (
                        CommandPacket,\r
                        NULL\r
                        );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       ReturnStatus = EFI_DEVICE_ERROR;\r
       goto Done;\r
     }\r
@@ -1612,9 +1681,9 @@ ScsiDiskUnmap (
   // Only blocking UNMAP request will reach here.\r
   //\r
   Status = CheckHostAdapterStatus (CommandPacket->HostAdapterStatus);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((\r
-      EFI_D_ERROR,\r
+      DEBUG_ERROR,\r
       "ScsiDiskUnmap: Host adapter indicating error status 0x%x.\n",\r
       CommandPacket->HostAdapterStatus\r
       ));\r
@@ -1624,9 +1693,9 @@ ScsiDiskUnmap (
   }\r
 \r
   Status = CheckTargetStatus (CommandPacket->TargetStatus);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((\r
-      EFI_D_ERROR,\r
+      DEBUG_ERROR,\r
       "ScsiDiskUnmap: Target indicating error status 0x%x.\n",\r
       CommandPacket->HostAdapterStatus\r
       ));\r
@@ -1640,6 +1709,7 @@ Done:
     if (EraseBlkReq->CommandPacket.Cdb != NULL) {\r
       FreePool (EraseBlkReq->CommandPacket.Cdb);\r
     }\r
+\r
     FreePool (EraseBlkReq);\r
   }\r
 \r
@@ -1684,11 +1754,11 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskEraseBlocks (\r
-  IN     EFI_ERASE_BLOCK_PROTOCOL      *This,\r
-  IN     UINT32                        MediaId,\r
-  IN     EFI_LBA                       Lba,\r
-  IN OUT EFI_ERASE_BLOCK_TOKEN         *Token,\r
-  IN     UINTN                         Size\r
+  IN     EFI_ERASE_BLOCK_PROTOCOL  *This,\r
+  IN     UINT32                    MediaId,\r
+  IN     EFI_LBA                   Lba,\r
+  IN OUT EFI_ERASE_BLOCK_TOKEN     *Token,\r
+  IN     UINTN                     Size\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -1703,7 +1773,7 @@ ScsiDiskEraseBlocks (
   OldTpl         = gBS->RaiseTPL (TPL_CALLBACK);\r
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_ERASEBLK (This);\r
 \r
-  if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
+  if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
     if (EFI_ERROR (Status)) {\r
       Status = EFI_DEVICE_ERROR;\r
@@ -1712,11 +1782,11 @@ ScsiDiskEraseBlocks (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -1731,18 +1801,21 @@ ScsiDiskEraseBlocks (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       Status = EFI_MEDIA_CHANGED;\r
       goto Done;\r
     }\r
   }\r
+\r
   //\r
   // Get the intrinsic block size\r
   //\r
@@ -1768,6 +1841,7 @@ ScsiDiskEraseBlocks (
       Token->TransactionStatus = EFI_SUCCESS;\r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     Status = EFI_SUCCESS;\r
     goto Done;\r
   }\r
@@ -1862,14 +1936,14 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskReceiveData (\r
-  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN UINT32                                   MediaId   OPTIONAL,\r
-  IN UINT64                                   Timeout,\r
-  IN UINT8                                    SecurityProtocolId,\r
-  IN UINT16                                   SecurityProtocolSpecificData,\r
-  IN UINTN                                    PayloadBufferSize,\r
-  OUT VOID                                    *PayloadBuffer,\r
-  OUT UINTN                                   *PayloadTransferSize\r
+  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN UINT32                                 MediaId   OPTIONAL,\r
+  IN UINT64                                 Timeout,\r
+  IN UINT8                                  SecurityProtocolId,\r
+  IN UINT16                                 SecurityProtocolSpecificData,\r
+  IN UINTN                                  PayloadBufferSize,\r
+  OUT VOID                                  *PayloadBuffer,\r
+  OUT UINTN                                 *PayloadTransferSize\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -1883,14 +1957,14 @@ ScsiDiskReceiveData (
   VOID                *AlignedBuffer;\r
   BOOLEAN             AlignedBufferAllocated;\r
 \r
-  AlignedBuffer           = NULL;\r
-  MediaChange             = FALSE;\r
-  AlignedBufferAllocated  = FALSE;\r
-  OldTpl                  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  ScsiDiskDevice          = SCSI_DISK_DEV_FROM_STORSEC (This);\r
-  Media                   = ScsiDiskDevice->BlkIo.Media;\r
+  AlignedBuffer          = NULL;\r
+  MediaChange            = FALSE;\r
+  AlignedBufferAllocated = FALSE;\r
+  OldTpl                 = gBS->RaiseTPL (TPL_CALLBACK);\r
+  ScsiDiskDevice         = SCSI_DISK_DEV_FROM_STORSEC (This);\r
+  Media                  = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  SenseDataLength = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
 \r
   if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
@@ -1901,11 +1975,11 @@ ScsiDiskReceiveData (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -1920,19 +1994,22 @@ ScsiDiskReceiveData (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
@@ -1962,6 +2039,7 @@ ScsiDiskReceiveData (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r
+\r
       ZeroMem (AlignedBuffer, PayloadBufferSize);\r
       AlignedBufferAllocated = TRUE;\r
     } else {\r
@@ -1970,19 +2048,19 @@ ScsiDiskReceiveData (
   }\r
 \r
   Status = ScsiSecurityProtocolInCommand (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            ScsiDiskDevice->SenseData,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            SecurityProtocolId,\r
-            SecurityProtocolSpecificData,\r
-            FALSE,\r
-            PayloadBufferSize,\r
-            AlignedBuffer,\r
-            PayloadTransferSize\r
-          );\r
+             ScsiDiskDevice->ScsiIo,\r
+             Timeout,\r
+             ScsiDiskDevice->SenseData,\r
+             &SenseDataLength,\r
+             &HostAdapterStatus,\r
+             &TargetStatus,\r
+             SecurityProtocolId,\r
+             SecurityProtocolSpecificData,\r
+             FALSE,\r
+             PayloadBufferSize,\r
+             AlignedBuffer,\r
+             PayloadTransferSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -2011,6 +2089,7 @@ Done:
     ZeroMem (AlignedBuffer, PayloadBufferSize);\r
     FreeAlignedBuffer (AlignedBuffer, PayloadBufferSize);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
@@ -2073,13 +2152,13 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskSendData (\r
-  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN UINT32                                   MediaId   OPTIONAL,\r
-  IN UINT64                                   Timeout,\r
-  IN UINT8                                    SecurityProtocolId,\r
-  IN UINT16                                   SecurityProtocolSpecificData,\r
-  IN UINTN                                    PayloadBufferSize,\r
-  OUT VOID                                    *PayloadBuffer\r
+  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN UINT32                                 MediaId   OPTIONAL,\r
+  IN UINT64                                 Timeout,\r
+  IN UINT8                                  SecurityProtocolId,\r
+  IN UINT16                                 SecurityProtocolSpecificData,\r
+  IN UINTN                                  PayloadBufferSize,\r
+  OUT VOID                                  *PayloadBuffer\r
   )\r
 {\r
   SCSI_DISK_DEV       *ScsiDiskDevice;\r
@@ -2093,14 +2172,14 @@ ScsiDiskSendData (
   VOID                *AlignedBuffer;\r
   BOOLEAN             AlignedBufferAllocated;\r
 \r
-  AlignedBuffer           = NULL;\r
-  MediaChange             = FALSE;\r
-  AlignedBufferAllocated  = FALSE;\r
-  OldTpl                  = gBS->RaiseTPL (TPL_CALLBACK);\r
-  ScsiDiskDevice          = SCSI_DISK_DEV_FROM_STORSEC (This);\r
-  Media                   = ScsiDiskDevice->BlkIo.Media;\r
+  AlignedBuffer          = NULL;\r
+  MediaChange            = FALSE;\r
+  AlignedBufferAllocated = FALSE;\r
+  OldTpl                 = gBS->RaiseTPL (TPL_CALLBACK);\r
+  ScsiDiskDevice         = SCSI_DISK_DEV_FROM_STORSEC (This);\r
+  Media                  = ScsiDiskDevice->BlkIo.Media;\r
 \r
-  SenseDataLength = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
 \r
   if (!IS_DEVICE_FIXED (ScsiDiskDevice)) {\r
     Status = ScsiDiskDetectMedia (ScsiDiskDevice, FALSE, &MediaChange);\r
@@ -2111,11 +2190,11 @@ ScsiDiskSendData (
 \r
     if (MediaChange) {\r
       gBS->ReinstallProtocolInterface (\r
-            ScsiDiskDevice->Handle,\r
-            &gEfiBlockIoProtocolGuid,\r
-            &ScsiDiskDevice->BlkIo,\r
-            &ScsiDiskDevice->BlkIo\r
-            );\r
+             ScsiDiskDevice->Handle,\r
+             &gEfiBlockIoProtocolGuid,\r
+             &ScsiDiskDevice->BlkIo,\r
+             &ScsiDiskDevice->BlkIo\r
+             );\r
       gBS->ReinstallProtocolInterface (\r
              ScsiDiskDevice->Handle,\r
              &gEfiBlockIo2ProtocolGuid,\r
@@ -2130,19 +2209,22 @@ ScsiDiskSendData (
                &ScsiDiskDevice->EraseBlock\r
                );\r
       }\r
+\r
       if (DetermineInstallStorageSecurity (ScsiDiskDevice, ScsiDiskDevice->Handle)) {\r
         gBS->ReinstallProtocolInterface (\r
-                ScsiDiskDevice->Handle,\r
-                &gEfiStorageSecurityCommandProtocolGuid,\r
-                &ScsiDiskDevice->StorageSecurity,\r
-                &ScsiDiskDevice->StorageSecurity\r
-                );\r
+               ScsiDiskDevice->Handle,\r
+               &gEfiStorageSecurityCommandProtocolGuid,\r
+               &ScsiDiskDevice->StorageSecurity,\r
+               &ScsiDiskDevice->StorageSecurity\r
+               );\r
       }\r
+\r
       if (Media->MediaPresent) {\r
         Status = EFI_MEDIA_CHANGED;\r
       } else {\r
         Status = EFI_NO_MEDIA;\r
       }\r
+\r
       goto Done;\r
     }\r
   }\r
@@ -2177,6 +2259,7 @@ ScsiDiskSendData (
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r
+\r
       CopyMem (AlignedBuffer, PayloadBuffer, PayloadBufferSize);\r
       AlignedBufferAllocated = TRUE;\r
     } else {\r
@@ -2185,18 +2268,18 @@ ScsiDiskSendData (
   }\r
 \r
   Status = ScsiSecurityProtocolOutCommand (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            ScsiDiskDevice->SenseData,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            SecurityProtocolId,\r
-            SecurityProtocolSpecificData,\r
-            FALSE,\r
-            PayloadBufferSize,\r
-            AlignedBuffer\r
-          );\r
+             ScsiDiskDevice->ScsiIo,\r
+             Timeout,\r
+             ScsiDiskDevice->SenseData,\r
+             &SenseDataLength,\r
+             &HostAdapterStatus,\r
+             &TargetStatus,\r
+             SecurityProtocolId,\r
+             SecurityProtocolSpecificData,\r
+             FALSE,\r
+             PayloadBufferSize,\r
+             AlignedBuffer\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -2216,11 +2299,11 @@ Done:
     ZeroMem (AlignedBuffer, PayloadBufferSize);\r
     FreeAlignedBuffer (AlignedBuffer, PayloadBufferSize);\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Detect Device and read out capacity ,if error occurs, parse the sense key.\r
 \r
@@ -2234,31 +2317,31 @@ Done:
 **/\r
 EFI_STATUS\r
 ScsiDiskDetectMedia (\r
-  IN   SCSI_DISK_DEV   *ScsiDiskDevice,\r
-  IN   BOOLEAN         MustReadCapacity,\r
-  OUT  BOOLEAN         *MediaChange\r
+  IN   SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN   BOOLEAN        MustReadCapacity,\r
+  OUT  BOOLEAN        *MediaChange\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_SCSI_SENSE_DATA *SenseData;\r
-  UINTN               NumberOfSenseKeys;\r
-  BOOLEAN             NeedRetry;\r
-  BOOLEAN             NeedReadCapacity;\r
-  UINT8               Retry;\r
-  UINT8               MaxRetry;\r
-  EFI_BLOCK_IO_MEDIA  OldMedia;\r
-  UINTN               Action;\r
-  EFI_EVENT           TimeoutEvt;\r
-\r
-  Status              = EFI_SUCCESS;\r
-  SenseData           = NULL;\r
-  NumberOfSenseKeys   = 0;\r
-  Retry               = 0;\r
-  MaxRetry            = 3;\r
-  Action              = ACTION_NO_ACTION;\r
-  NeedReadCapacity    = FALSE;\r
-  *MediaChange        = FALSE;\r
-  TimeoutEvt          = NULL;\r
+  EFI_STATUS           Status;\r
+  EFI_SCSI_SENSE_DATA  *SenseData;\r
+  UINTN                NumberOfSenseKeys;\r
+  BOOLEAN              NeedRetry;\r
+  BOOLEAN              NeedReadCapacity;\r
+  UINT8                Retry;\r
+  UINT8                MaxRetry;\r
+  EFI_BLOCK_IO_MEDIA   OldMedia;\r
+  UINTN                Action;\r
+  EFI_EVENT            TimeoutEvt;\r
+\r
+  Status            = EFI_SUCCESS;\r
+  SenseData         = NULL;\r
+  NumberOfSenseKeys = 0;\r
+  Retry             = 0;\r
+  MaxRetry          = 3;\r
+  Action            = ACTION_NO_ACTION;\r
+  NeedReadCapacity  = FALSE;\r
+  *MediaChange      = FALSE;\r
+  TimeoutEvt        = NULL;\r
 \r
   CopyMem (&OldMedia, ScsiDiskDevice->BlkIo.Media, sizeof (OldMedia));\r
 \r
@@ -2273,7 +2356,7 @@ ScsiDiskDetectMedia (
     return Status;\r
   }\r
 \r
-  Status = gBS->SetTimer (TimeoutEvt, TimerRelative, EFI_TIMER_PERIOD_SECONDS(120));\r
+  Status = gBS->SetTimer (TimeoutEvt, TimerRelative, EFI_TIMER_PERIOD_SECONDS (120));\r
   if (EFI_ERROR (Status)) {\r
     goto EXIT;\r
   }\r
@@ -2285,11 +2368,11 @@ ScsiDiskDetectMedia (
   //\r
   while (EFI_ERROR (gBS->CheckEvent (TimeoutEvt))) {\r
     Status = ScsiDiskTestUnitReady (\r
-              ScsiDiskDevice,\r
-              &NeedRetry,\r
-              &SenseData,\r
-              &NumberOfSenseKeys\r
-              );\r
+               ScsiDiskDevice,\r
+               &NeedRetry,\r
+               &SenseData,\r
+               &NumberOfSenseKeys\r
+               );\r
     if (!EFI_ERROR (Status)) {\r
       Status = DetectMediaParsingSenseKeys (\r
                  ScsiDiskDevice,\r
@@ -2328,8 +2411,8 @@ ScsiDiskDetectMedia (
   // READ_CAPACITY command is not supported by any of the UFS WLUNs.\r
   //\r
   if (ScsiDiskDevice->DeviceType == EFI_SCSI_TYPE_WLUN) {\r
-    NeedReadCapacity = FALSE;\r
-    MustReadCapacity = FALSE;\r
+    NeedReadCapacity                          = FALSE;\r
+    MustReadCapacity                          = FALSE;\r
     ScsiDiskDevice->BlkIo.Media->MediaPresent = TRUE;\r
   }\r
 \r
@@ -2391,17 +2474,17 @@ ScsiDiskDetectMedia (
   }\r
 \r
   if (ScsiDiskDevice->BlkIo.Media->ReadOnly != OldMedia.ReadOnly) {\r
-    *MediaChange = TRUE;\r
+    *MediaChange                          = TRUE;\r
     ScsiDiskDevice->BlkIo.Media->MediaId += 1;\r
   }\r
 \r
   if (ScsiDiskDevice->BlkIo.Media->BlockSize != OldMedia.BlockSize) {\r
-    *MediaChange = TRUE;\r
+    *MediaChange                          = TRUE;\r
     ScsiDiskDevice->BlkIo.Media->MediaId += 1;\r
   }\r
 \r
   if (ScsiDiskDevice->BlkIo.Media->LastBlock != OldMedia.LastBlock) {\r
-    *MediaChange = TRUE;\r
+    *MediaChange                          = TRUE;\r
     ScsiDiskDevice->BlkIo.Media->MediaId += 1;\r
   }\r
 \r
@@ -2425,10 +2508,10 @@ EXIT:
   if (TimeoutEvt != NULL) {\r
     gBS->CloseEvent (TimeoutEvt);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Send out Inquiry command to Device.\r
 \r
@@ -2441,40 +2524,40 @@ EXIT:
 **/\r
 EFI_STATUS\r
 ScsiDiskInquiryDevice (\r
-  IN OUT  SCSI_DISK_DEV   *ScsiDiskDevice,\r
-     OUT  BOOLEAN         *NeedRetry\r
+  IN OUT  SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT  BOOLEAN           *NeedRetry\r
   )\r
 {\r
-  UINT32                                InquiryDataLength;\r
-  UINT8                                 SenseDataLength;\r
-  UINT8                                 HostAdapterStatus;\r
-  UINT8                                 TargetStatus;\r
-  EFI_SCSI_SENSE_DATA                   *SenseDataArray;\r
-  UINTN                                 NumberOfSenseKeys;\r
-  EFI_STATUS                            Status;\r
-  UINT8                                 MaxRetry;\r
-  UINT8                                 Index;\r
-  EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE *SupportedVpdPages;\r
-  EFI_SCSI_BLOCK_LIMITS_VPD_PAGE        *BlockLimits;\r
-  UINTN                                 PageLength;\r
+  UINT32                                 InquiryDataLength;\r
+  UINT8                                  SenseDataLength;\r
+  UINT8                                  HostAdapterStatus;\r
+  UINT8                                  TargetStatus;\r
+  EFI_SCSI_SENSE_DATA                    *SenseDataArray;\r
+  UINTN                                  NumberOfSenseKeys;\r
+  EFI_STATUS                             Status;\r
+  UINT8                                  MaxRetry;\r
+  UINT8                                  Index;\r
+  EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE  *SupportedVpdPages;\r
+  EFI_SCSI_BLOCK_LIMITS_VPD_PAGE         *BlockLimits;\r
+  UINTN                                  PageLength;\r
 \r
   InquiryDataLength = sizeof (EFI_SCSI_INQUIRY_DATA);\r
   SenseDataLength   = 0;\r
 \r
   Status = ScsiInquiryCommand (\r
-            ScsiDiskDevice->ScsiIo,\r
-            SCSI_DISK_TIMEOUT,\r
-            NULL,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            (VOID *) &(ScsiDiskDevice->InquiryData),\r
-            &InquiryDataLength,\r
-            FALSE\r
-            );\r
-    //\r
-    // no need to check HostAdapterStatus and TargetStatus\r
-    //\r
+             ScsiDiskDevice->ScsiIo,\r
+             SCSI_DISK_TIMEOUT,\r
+             NULL,\r
+             &SenseDataLength,\r
+             &HostAdapterStatus,\r
+             &TargetStatus,\r
+             (VOID *)&(ScsiDiskDevice->InquiryData),\r
+             &InquiryDataLength,\r
+             FALSE\r
+             );\r
+  //\r
+  // no need to check HostAdapterStatus and TargetStatus\r
+  //\r
   if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
     ParseInquiryData (ScsiDiskDevice);\r
 \r
@@ -2487,41 +2570,49 @@ ScsiDiskInquiryDevice (
         *NeedRetry = FALSE;\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       ZeroMem (SupportedVpdPages, sizeof (EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE));\r
       InquiryDataLength = sizeof (EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE);\r
       SenseDataLength   = 0;\r
-      Status = ScsiInquiryCommandEx (\r
-                 ScsiDiskDevice->ScsiIo,\r
-                 SCSI_DISK_TIMEOUT,\r
-                 NULL,\r
-                 &SenseDataLength,\r
-                 &HostAdapterStatus,\r
-                 &TargetStatus,\r
-                 (VOID *) SupportedVpdPages,\r
-                 &InquiryDataLength,\r
-                 TRUE,\r
-                 EFI_SCSI_PAGE_CODE_SUPPORTED_VPD\r
-                 );\r
+      Status            = ScsiInquiryCommandEx (\r
+                            ScsiDiskDevice->ScsiIo,\r
+                            SCSI_DISK_TIMEOUT,\r
+                            NULL,\r
+                            &SenseDataLength,\r
+                            &HostAdapterStatus,\r
+                            &TargetStatus,\r
+                            (VOID *)SupportedVpdPages,\r
+                            &InquiryDataLength,\r
+                            TRUE,\r
+                            EFI_SCSI_PAGE_CODE_SUPPORTED_VPD\r
+                            );\r
       if (!EFI_ERROR (Status)) {\r
         PageLength = (SupportedVpdPages->PageLength2 << 8)\r
-                   |  SupportedVpdPages->PageLength1;\r
+                     |  SupportedVpdPages->PageLength1;\r
 \r
         //\r
         // Sanity checks for coping with broken devices\r
         //\r
         if (PageLength > sizeof SupportedVpdPages->SupportedVpdPageList) {\r
-          DEBUG ((EFI_D_WARN,\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
             "%a: invalid PageLength (%u) in Supported VPD Pages page\n",\r
-            __FUNCTION__, (UINT32)PageLength));\r
+            __FUNCTION__,\r
+            (UINT32)PageLength\r
+            ));\r
           PageLength = 0;\r
         }\r
 \r
         if ((PageLength > 0) &&\r
             (SupportedVpdPages->SupportedVpdPageList[0] !=\r
-             EFI_SCSI_PAGE_CODE_SUPPORTED_VPD)) {\r
-          DEBUG ((EFI_D_WARN,\r
+             EFI_SCSI_PAGE_CODE_SUPPORTED_VPD))\r
+        {\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
             "%a: Supported VPD Pages page doesn't start with code 0x%02x\n",\r
-            __FUNCTION__, EFI_SCSI_PAGE_CODE_SUPPORTED_VPD));\r
+            __FUNCTION__,\r
+            EFI_SCSI_PAGE_CODE_SUPPORTED_VPD\r
+            ));\r
           PageLength = 0;\r
         }\r
 \r
@@ -2534,11 +2625,15 @@ ScsiDiskInquiryDevice (
           //\r
           if ((Index > 0) &&\r
               (SupportedVpdPages->SupportedVpdPageList[Index] <=\r
-               SupportedVpdPages->SupportedVpdPageList[Index - 1])) {\r
-            DEBUG ((EFI_D_WARN,\r
+               SupportedVpdPages->SupportedVpdPageList[Index - 1]))\r
+          {\r
+            DEBUG ((\r
+              DEBUG_WARN,\r
               "%a: non-ascending code in Supported VPD Pages page @ %u\n",\r
-              __FUNCTION__, Index));\r
-            Index = 0;\r
+              __FUNCTION__,\r
+              Index\r
+              ));\r
+            Index      = 0;\r
             PageLength = 0;\r
             break;\r
           }\r
@@ -2558,25 +2653,26 @@ ScsiDiskInquiryDevice (
             *NeedRetry = FALSE;\r
             return EFI_DEVICE_ERROR;\r
           }\r
+\r
           ZeroMem (BlockLimits, sizeof (EFI_SCSI_BLOCK_LIMITS_VPD_PAGE));\r
           InquiryDataLength = sizeof (EFI_SCSI_BLOCK_LIMITS_VPD_PAGE);\r
           SenseDataLength   = 0;\r
-          Status = ScsiInquiryCommandEx (\r
-                     ScsiDiskDevice->ScsiIo,\r
-                     SCSI_DISK_TIMEOUT,\r
-                     NULL,\r
-                     &SenseDataLength,\r
-                     &HostAdapterStatus,\r
-                     &TargetStatus,\r
-                     (VOID *) BlockLimits,\r
-                     &InquiryDataLength,\r
-                     TRUE,\r
-                     EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD\r
-                     );\r
+          Status            = ScsiInquiryCommandEx (\r
+                                ScsiDiskDevice->ScsiIo,\r
+                                SCSI_DISK_TIMEOUT,\r
+                                NULL,\r
+                                &SenseDataLength,\r
+                                &HostAdapterStatus,\r
+                                &TargetStatus,\r
+                                (VOID *)BlockLimits,\r
+                                &InquiryDataLength,\r
+                                TRUE,\r
+                                EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD\r
+                                );\r
           if (!EFI_ERROR (Status)) {\r
             ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity =\r
               (BlockLimits->OptimalTransferLengthGranularity2 << 8) |\r
-               BlockLimits->OptimalTransferLengthGranularity1;\r
+              BlockLimits->OptimalTransferLengthGranularity1;\r
 \r
             ScsiDiskDevice->UnmapInfo.MaxLbaCnt =\r
               (BlockLimits->MaximumUnmapLbaCount4 << 24) |\r
@@ -2622,15 +2718,14 @@ ScsiDiskInquiryDevice (
 \r
   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
-\r
   } else if (Status == EFI_NOT_READY) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // go ahead to check HostAdapterStatus and TargetStatus\r
   // (EFI_TIMEOUT, EFI_DEVICE_ERROR)\r
@@ -2641,9 +2736,9 @@ ScsiDiskInquiryDevice (
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
-      //\r
-      // reset the scsi channel\r
-      //\r
+    //\r
+    // reset the scsi channel\r
+    //\r
     ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
@@ -2657,7 +2752,6 @@ ScsiDiskInquiryDevice (
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
@@ -2671,12 +2765,12 @@ ScsiDiskInquiryDevice (
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
     Status = ScsiDiskRequestSenseKeys (\r
-              ScsiDiskDevice,\r
-              NeedRetry,\r
-              &SenseDataArray,\r
-              &NumberOfSenseKeys,\r
-              TRUE\r
-              );\r
+               ScsiDiskDevice,\r
+               NeedRetry,\r
+               &SenseDataArray,\r
+               &NumberOfSenseKeys,\r
+               TRUE\r
+               );\r
     if (!EFI_ERROR (Status)) {\r
       *NeedRetry = TRUE;\r
       return EFI_DEVICE_ERROR;\r
@@ -2686,6 +2780,7 @@ ScsiDiskInquiryDevice (
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
+\r
   //\r
   // ScsiDiskRequestSenseKeys() failed after several rounds of retry.\r
   // set *NeedRetry = FALSE to avoid the outside caller try again.\r
@@ -2712,10 +2807,10 @@ ScsiDiskInquiryDevice (
 **/\r
 EFI_STATUS\r
 ScsiDiskTestUnitReady (\r
-  IN  SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  OUT BOOLEAN               *NeedRetry,\r
-  OUT EFI_SCSI_SENSE_DATA   **SenseDataArray,\r
-  OUT UINTN                 *NumberOfSenseKeys\r
+  IN  SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  OUT BOOLEAN              *NeedRetry,\r
+  OUT EFI_SCSI_SENSE_DATA  **SenseDataArray,\r
+  OUT UINTN                *NumberOfSenseKeys\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -2725,31 +2820,31 @@ ScsiDiskTestUnitReady (
   UINT8       Index;\r
   UINT8       MaxRetry;\r
 \r
-  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
-  *NumberOfSenseKeys  = 0;\r
+  SenseDataLength    = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  *NumberOfSenseKeys = 0;\r
 \r
   //\r
   // Parameter 3 and 4: do not require sense data, retrieve it when needed.\r
   //\r
   Status = ScsiTestUnitReadyCommand (\r
-            ScsiDiskDevice->ScsiIo,\r
-            SCSI_DISK_TIMEOUT,\r
-            ScsiDiskDevice->SenseData,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus\r
-            );\r
+             ScsiDiskDevice->ScsiIo,\r
+             SCSI_DISK_TIMEOUT,\r
+             ScsiDiskDevice->SenseData,\r
+             &SenseDataLength,\r
+             &HostAdapterStatus,\r
+             &TargetStatus\r
+             );\r
   //\r
   // no need to check HostAdapterStatus and TargetStatus\r
   //\r
   if (Status == EFI_NOT_READY) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // go ahead to check HostAdapterStatus and TargetStatus(in case of EFI_DEVICE_ERROR)\r
   //\r
@@ -2758,7 +2853,6 @@ ScsiDiskTestUnitReady (
   if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
@@ -2776,7 +2870,6 @@ ScsiDiskTestUnitReady (
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
@@ -2791,12 +2884,12 @@ ScsiDiskTestUnitReady (
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
     Status = ScsiDiskRequestSenseKeys (\r
-              ScsiDiskDevice,\r
-              NeedRetry,\r
-              SenseDataArray,\r
-              NumberOfSenseKeys,\r
-              FALSE\r
-              );\r
+               ScsiDiskDevice,\r
+               NeedRetry,\r
+               SenseDataArray,\r
+               NumberOfSenseKeys,\r
+               FALSE\r
+               );\r
     if (!EFI_ERROR (Status)) {\r
       return EFI_SUCCESS;\r
     }\r
@@ -2805,6 +2898,7 @@ ScsiDiskTestUnitReady (
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
+\r
   //\r
   // ScsiDiskRequestSenseKeys() failed after several rounds of retry.\r
   // set *NeedRetry = FALSE to avoid the outside caller try again.\r
@@ -2827,13 +2921,13 @@ ScsiDiskTestUnitReady (
 **/\r
 EFI_STATUS\r
 DetectMediaParsingSenseKeys (\r
-  OUT  SCSI_DISK_DEV           *ScsiDiskDevice,\r
-  IN   EFI_SCSI_SENSE_DATA     *SenseData,\r
-  IN   UINTN                   NumberOfSenseKeys,\r
-  OUT  UINTN                   *Action\r
+  OUT  SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN   EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN   UINTN                NumberOfSenseKeys,\r
+  OUT  UINTN                *Action\r
   )\r
 {\r
-  BOOLEAN RetryLater;\r
+  BOOLEAN  RetryLater;\r
 \r
   //\r
   // Default is to read capacity, unless..\r
@@ -2844,6 +2938,7 @@ DetectMediaParsingSenseKeys (
     if (ScsiDiskDevice->BlkIo.Media->MediaPresent == TRUE) {\r
       *Action = ACTION_NO_ACTION;\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -2854,37 +2949,38 @@ DetectMediaParsingSenseKeys (
     if (ScsiDiskDevice->BlkIo.Media->MediaPresent == TRUE) {\r
       *Action = ACTION_NO_ACTION;\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (ScsiDiskIsNoMedia (SenseData, NumberOfSenseKeys)) {\r
     ScsiDiskDevice->BlkIo.Media->MediaPresent = FALSE;\r
     ScsiDiskDevice->BlkIo.Media->LastBlock    = 0;\r
-    *Action = ACTION_NO_ACTION;\r
-    DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsNoMedia\n"));\r
+    *Action                                   = ACTION_NO_ACTION;\r
+    DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsNoMedia\n"));\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (ScsiDiskIsMediaChange (SenseData, NumberOfSenseKeys)) {\r
     ScsiDiskDevice->BlkIo.Media->MediaId++;\r
-    DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsMediaChange!\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsMediaChange!\n"));\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (ScsiDiskIsResetBefore (SenseData, NumberOfSenseKeys)) {\r
     *Action = ACTION_RETRY_COMMAND_LATER;\r
-    DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsResetBefore!\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsResetBefore!\n"));\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (ScsiDiskIsMediaError (SenseData, NumberOfSenseKeys)) {\r
-    DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsMediaError\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsMediaError\n"));\r
     *Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   if (ScsiDiskIsHardwareError (SenseData, NumberOfSenseKeys)) {\r
-    DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskIsHardwareError\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskIsHardwareError\n"));\r
     *Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -2892,19 +2988,19 @@ DetectMediaParsingSenseKeys (
   if (!ScsiDiskIsDriveReady (SenseData, NumberOfSenseKeys, &RetryLater)) {\r
     if (RetryLater) {\r
       *Action = ACTION_RETRY_COMMAND_LATER;\r
-      DEBUG ((EFI_D_VERBOSE, "ScsiDisk: ScsiDiskDriveNotReady!\n"));\r
+      DEBUG ((DEBUG_VERBOSE, "ScsiDisk: ScsiDiskDriveNotReady!\n"));\r
       return EFI_SUCCESS;\r
     }\r
+\r
     *Action = ACTION_NO_ACTION;\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   *Action = ACTION_RETRY_WITH_BACKOFF_ALGO;\r
-  DEBUG ((EFI_D_VERBOSE, "ScsiDisk: Sense Key = 0x%x ASC = 0x%x!\n", SenseData->Sense_Key, SenseData->Addnl_Sense_Code));\r
+  DEBUG ((DEBUG_VERBOSE, "ScsiDisk: Sense Key = 0x%x ASC = 0x%x!\n", SenseData->Sense_Key, SenseData->Addnl_Sense_Code));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Send read capacity command to device and get the device parameter.\r
 \r
@@ -2919,29 +3015,30 @@ DetectMediaParsingSenseKeys (
 **/\r
 EFI_STATUS\r
 ScsiDiskReadCapacity (\r
-  IN  OUT  SCSI_DISK_DEV           *ScsiDiskDevice,\r
-      OUT  BOOLEAN                 *NeedRetry,\r
-      OUT  EFI_SCSI_SENSE_DATA     **SenseDataArray,\r
-      OUT  UINTN                   *NumberOfSenseKeys\r
+  IN  OUT  SCSI_DISK_DEV    *ScsiDiskDevice,\r
+  OUT  BOOLEAN              *NeedRetry,\r
+  OUT  EFI_SCSI_SENSE_DATA  **SenseDataArray,\r
+  OUT  UINTN                *NumberOfSenseKeys\r
   )\r
 {\r
-  UINT8                         HostAdapterStatus;\r
-  UINT8                         TargetStatus;\r
-  EFI_STATUS                    CommandStatus;\r
-  EFI_STATUS                    Status;\r
-  UINT8                         Index;\r
-  UINT8                         MaxRetry;\r
-  UINT8                         SenseDataLength;\r
-  UINT32                        DataLength10;\r
-  UINT32                        DataLength16;\r
-  EFI_SCSI_DISK_CAPACITY_DATA   *CapacityData10;\r
-  EFI_SCSI_DISK_CAPACITY_DATA16 *CapacityData16;\r
+  UINT8                          HostAdapterStatus;\r
+  UINT8                          TargetStatus;\r
+  EFI_STATUS                     CommandStatus;\r
+  EFI_STATUS                     Status;\r
+  UINT8                          Index;\r
+  UINT8                          MaxRetry;\r
+  UINT8                          SenseDataLength;\r
+  UINT32                         DataLength10;\r
+  UINT32                         DataLength16;\r
+  EFI_SCSI_DISK_CAPACITY_DATA    *CapacityData10;\r
+  EFI_SCSI_DISK_CAPACITY_DATA16  *CapacityData16;\r
 \r
   CapacityData10 = AllocateAlignedBuffer (ScsiDiskDevice, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
   if (CapacityData10 == NULL) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   CapacityData16 = AllocateAlignedBuffer (ScsiDiskDevice, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
   if (CapacityData16 == NULL) {\r
     FreeAlignedBuffer (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
@@ -2949,14 +3046,14 @@ ScsiDiskReadCapacity (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  SenseDataLength       = 0;\r
-  DataLength10          = sizeof (EFI_SCSI_DISK_CAPACITY_DATA);\r
-  DataLength16          = sizeof (EFI_SCSI_DISK_CAPACITY_DATA16);\r
+  SenseDataLength = 0;\r
+  DataLength10    = sizeof (EFI_SCSI_DISK_CAPACITY_DATA);\r
+  DataLength16    = sizeof (EFI_SCSI_DISK_CAPACITY_DATA16);\r
   ZeroMem (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
   ZeroMem (CapacityData16, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
 \r
-  *NumberOfSenseKeys  = 0;\r
-  *NeedRetry          = FALSE;\r
+  *NumberOfSenseKeys = 0;\r
+  *NeedRetry         = FALSE;\r
 \r
   //\r
   // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh,\r
@@ -2969,14 +3066,15 @@ ScsiDiskReadCapacity (
                     &SenseDataLength,\r
                     &HostAdapterStatus,\r
                     &TargetStatus,\r
-                    (VOID *) CapacityData10,\r
+                    (VOID *)CapacityData10,\r
                     &DataLength10,\r
                     FALSE\r
                     );\r
 \r
   ScsiDiskDevice->Cdb16Byte = FALSE;\r
   if ((!EFI_ERROR (CommandStatus)) && (CapacityData10->LastLba3 == 0xff) && (CapacityData10->LastLba2 == 0xff) &&\r
-      (CapacityData10->LastLba1 == 0xff) && (CapacityData10->LastLba0 == 0xff)) {\r
+      (CapacityData10->LastLba1 == 0xff) && (CapacityData10->LastLba0 == 0xff))\r
+  {\r
     //\r
     // use Read Capacity (16), Read (16) and Write (16) next when hard disk size > 2TB\r
     //\r
@@ -2992,44 +3090,43 @@ ScsiDiskReadCapacity (
                       &SenseDataLength,\r
                       &HostAdapterStatus,\r
                       &TargetStatus,\r
-                      (VOID *) CapacityData16,\r
+                      (VOID *)CapacityData16,\r
                       &DataLength16,\r
                       FALSE\r
                       );\r
   }\r
 \r
-    //\r
-    // no need to check HostAdapterStatus and TargetStatus\r
-    //\r
-   if (CommandStatus == EFI_SUCCESS) {\r
-     GetMediaInfo (ScsiDiskDevice, CapacityData10, CapacityData16);\r
-     FreeAlignedBuffer (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
-     FreeAlignedBuffer (CapacityData16, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
-     return EFI_SUCCESS;\r
-   }\r
-\r
-   FreeAlignedBuffer (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
-   FreeAlignedBuffer (CapacityData16, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
-\r
-   if (CommandStatus == EFI_NOT_READY) {\r
-     *NeedRetry = TRUE;\r
-     return EFI_DEVICE_ERROR;\r
-   } else if ((CommandStatus == EFI_INVALID_PARAMETER) || (CommandStatus == EFI_UNSUPPORTED)) {\r
-     *NeedRetry = FALSE;\r
-     return EFI_DEVICE_ERROR;\r
-   }\r
-\r
-   //\r
-   // go ahead to check HostAdapterStatus and TargetStatus\r
-   // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
-   //\r
-\r
-   Status = CheckHostAdapterStatus (HostAdapterStatus);\r
-   if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
-     *NeedRetry = TRUE;\r
-     return EFI_DEVICE_ERROR;\r
-\r
-   } else if (Status == EFI_DEVICE_ERROR) {\r
+  //\r
+  // no need to check HostAdapterStatus and TargetStatus\r
+  //\r
+  if (CommandStatus == EFI_SUCCESS) {\r
+    GetMediaInfo (ScsiDiskDevice, CapacityData10, CapacityData16);\r
+    FreeAlignedBuffer (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
+    FreeAlignedBuffer (CapacityData16, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  FreeAlignedBuffer (CapacityData10, sizeof (EFI_SCSI_DISK_CAPACITY_DATA));\r
+  FreeAlignedBuffer (CapacityData16, sizeof (EFI_SCSI_DISK_CAPACITY_DATA16));\r
+\r
+  if (CommandStatus == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if ((CommandStatus == EFI_INVALID_PARAMETER) || (CommandStatus == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
+  //\r
+\r
+  Status = CheckHostAdapterStatus (HostAdapterStatus);\r
+  if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
     //\r
@@ -3046,7 +3143,6 @@ ScsiDiskReadCapacity (
     ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
-\r
   } else if (Status == EFI_DEVICE_ERROR) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
@@ -3059,14 +3155,13 @@ ScsiDiskReadCapacity (
   //\r
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
-\r
     Status = ScsiDiskRequestSenseKeys (\r
-              ScsiDiskDevice,\r
-              NeedRetry,\r
-              SenseDataArray,\r
-              NumberOfSenseKeys,\r
-              TRUE\r
-              );\r
+               ScsiDiskDevice,\r
+               NeedRetry,\r
+               SenseDataArray,\r
+               NumberOfSenseKeys,\r
+               TRUE\r
+               );\r
     if (!EFI_ERROR (Status)) {\r
       return EFI_SUCCESS;\r
     }\r
@@ -3075,6 +3170,7 @@ ScsiDiskReadCapacity (
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
+\r
   //\r
   // ScsiDiskRequestSenseKeys() failed after several rounds of retry.\r
   // set *NeedRetry = FALSE to avoid the outside caller try again.\r
@@ -3096,35 +3192,34 @@ ScsiDiskReadCapacity (
 **/\r
 EFI_STATUS\r
 CheckHostAdapterStatus (\r
-  IN UINT8   HostAdapterStatus\r
+  IN UINT8  HostAdapterStatus\r
   )\r
 {\r
   switch (HostAdapterStatus) {\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK:\r
-    return EFI_SUCCESS;\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK:\r
+      return EFI_SUCCESS;\r
 \r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND:\r
-    return EFI_TIMEOUT;\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND:\r
+      return EFI_TIMEOUT;\r
 \r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PARITY_ERROR:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET:\r
-    return EFI_NOT_READY;\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PARITY_ERROR:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET:\r
+      return EFI_NOT_READY;\r
 \r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_FREE:\r
-  case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PHASE_ERROR:\r
-    return EFI_DEVICE_ERROR;\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_FREE:\r
+    case EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PHASE_ERROR:\r
+      return EFI_DEVICE_ERROR;\r
 \r
-  default:\r
-    return EFI_SUCCESS;\r
+    default:\r
+      return EFI_SUCCESS;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Check the target status and re-interpret it in EFI_STATUS.\r
 \r
@@ -3137,36 +3232,35 @@ CheckHostAdapterStatus (
 **/\r
 EFI_STATUS\r
 CheckTargetStatus (\r
-  IN  UINT8   TargetStatus\r
+  IN  UINT8  TargetStatus\r
   )\r
 {\r
   switch (TargetStatus) {\r
-  case EFI_EXT_SCSI_STATUS_TARGET_GOOD:\r
-  case EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION:\r
-  case EFI_EXT_SCSI_STATUS_TARGET_CONDITION_MET:\r
-    return EFI_SUCCESS;\r
+    case EFI_EXT_SCSI_STATUS_TARGET_GOOD:\r
+    case EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION:\r
+    case EFI_EXT_SCSI_STATUS_TARGET_CONDITION_MET:\r
+      return EFI_SUCCESS;\r
 \r
-  case EFI_EXT_SCSI_STATUS_TARGET_INTERMEDIATE:\r
-  case EFI_EXT_SCSI_STATUS_TARGET_INTERMEDIATE_CONDITION_MET:\r
-  case EFI_EXT_SCSI_STATUS_TARGET_BUSY:\r
-  case EFI_EXT_SCSI_STATUS_TARGET_TASK_SET_FULL:\r
-    return EFI_NOT_READY;\r
+    case EFI_EXT_SCSI_STATUS_TARGET_INTERMEDIATE:\r
+    case EFI_EXT_SCSI_STATUS_TARGET_INTERMEDIATE_CONDITION_MET:\r
+    case EFI_EXT_SCSI_STATUS_TARGET_BUSY:\r
+    case EFI_EXT_SCSI_STATUS_TARGET_TASK_SET_FULL:\r
+      return EFI_NOT_READY;\r
 \r
-  case EFI_EXT_SCSI_STATUS_TARGET_RESERVATION_CONFLICT:\r
-    return EFI_DEVICE_ERROR;\r
+    case EFI_EXT_SCSI_STATUS_TARGET_RESERVATION_CONFLICT:\r
+      return EFI_DEVICE_ERROR;\r
 \r
-  default:\r
-    return EFI_SUCCESS;\r
+    default:\r
+      return EFI_SUCCESS;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Retrieve all sense keys from the device.\r
 \r
   When encountering error during the process, if retrieve sense keys before\r
   error encountered, it returns the sense keys with return status set to EFI_SUCCESS,\r
-  and NeedRetry set to FALSE; otherwize, return the proper return status.\r
+  and NeedRetry set to FALSE; otherwise, return the proper return status.\r
 \r
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV\r
   @param  NeedRetry          The pointer of flag indicates if need a retry\r
@@ -3180,33 +3274,33 @@ CheckTargetStatus (
 **/\r
 EFI_STATUS\r
 ScsiDiskRequestSenseKeys (\r
-  IN  OUT  SCSI_DISK_DEV           *ScsiDiskDevice,\r
-      OUT  BOOLEAN                 *NeedRetry,\r
-      OUT  EFI_SCSI_SENSE_DATA     **SenseDataArray,\r
-      OUT  UINTN                   *NumberOfSenseKeys,\r
-  IN       BOOLEAN                 AskResetIfError\r
+  IN  OUT  SCSI_DISK_DEV    *ScsiDiskDevice,\r
+  OUT  BOOLEAN              *NeedRetry,\r
+  OUT  EFI_SCSI_SENSE_DATA  **SenseDataArray,\r
+  OUT  UINTN                *NumberOfSenseKeys,\r
+  IN       BOOLEAN          AskResetIfError\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *PtrSenseData;\r
-  UINT8               SenseDataLength;\r
-  BOOLEAN             SenseReq;\r
-  EFI_STATUS          Status;\r
-  EFI_STATUS          FallStatus;\r
-  UINT8               HostAdapterStatus;\r
-  UINT8               TargetStatus;\r
+  EFI_SCSI_SENSE_DATA  *PtrSenseData;\r
+  UINT8                SenseDataLength;\r
+  BOOLEAN              SenseReq;\r
+  EFI_STATUS           Status;\r
+  EFI_STATUS           FallStatus;\r
+  UINT8                HostAdapterStatus;\r
+  UINT8                TargetStatus;\r
 \r
   FallStatus      = EFI_SUCCESS;\r
-  SenseDataLength = (UINT8) sizeof (EFI_SCSI_SENSE_DATA);\r
+  SenseDataLength = (UINT8)sizeof (EFI_SCSI_SENSE_DATA);\r
 \r
   ZeroMem (\r
     ScsiDiskDevice->SenseData,\r
     sizeof (EFI_SCSI_SENSE_DATA) * (ScsiDiskDevice->SenseDataNumber)\r
     );\r
 \r
-  *NumberOfSenseKeys  = 0;\r
-  *SenseDataArray     = ScsiDiskDevice->SenseData;\r
-  Status              = EFI_SUCCESS;\r
-  PtrSenseData        = AllocateAlignedBuffer (ScsiDiskDevice, sizeof (EFI_SCSI_SENSE_DATA));\r
+  *NumberOfSenseKeys = 0;\r
+  *SenseDataArray    = ScsiDiskDevice->SenseData;\r
+  Status             = EFI_SUCCESS;\r
+  PtrSenseData       = AllocateAlignedBuffer (ScsiDiskDevice, sizeof (EFI_SCSI_SENSE_DATA));\r
   if (PtrSenseData == NULL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -3214,36 +3308,33 @@ ScsiDiskRequestSenseKeys (
   for (SenseReq = TRUE; SenseReq;) {\r
     ZeroMem (PtrSenseData, sizeof (EFI_SCSI_SENSE_DATA));\r
     Status = ScsiRequestSenseCommand (\r
-              ScsiDiskDevice->ScsiIo,\r
-              SCSI_DISK_TIMEOUT,\r
-              PtrSenseData,\r
-              &SenseDataLength,\r
-              &HostAdapterStatus,\r
-              &TargetStatus\r
-              );\r
-     if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
-        FallStatus = EFI_SUCCESS;\r
-\r
-     } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
-       *NeedRetry  = TRUE;\r
-       FallStatus  = EFI_DEVICE_ERROR;\r
-\r
-     } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
-       *NeedRetry  = FALSE;\r
-       FallStatus  = EFI_DEVICE_ERROR;\r
-\r
-     } else if (Status == EFI_DEVICE_ERROR) {\r
-        if (AskResetIfError) {\r
-          ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
-        }\r
+               ScsiDiskDevice->ScsiIo,\r
+               SCSI_DISK_TIMEOUT,\r
+               PtrSenseData,\r
+               &SenseDataLength,\r
+               &HostAdapterStatus,\r
+               &TargetStatus\r
+               );\r
+    if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
+      FallStatus = EFI_SUCCESS;\r
+    } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
+      *NeedRetry = TRUE;\r
+      FallStatus = EFI_DEVICE_ERROR;\r
+    } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+      *NeedRetry = FALSE;\r
+      FallStatus = EFI_DEVICE_ERROR;\r
+    } else if (Status == EFI_DEVICE_ERROR) {\r
+      if (AskResetIfError) {\r
+        ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+      }\r
 \r
-        FallStatus = EFI_DEVICE_ERROR;\r
+      FallStatus = EFI_DEVICE_ERROR;\r
     }\r
 \r
     if (EFI_ERROR (FallStatus)) {\r
       if (*NumberOfSenseKeys != 0) {\r
         *NeedRetry = FALSE;\r
-        Status = EFI_SUCCESS;\r
+        Status     = EFI_SUCCESS;\r
         goto EXIT;\r
       } else {\r
         Status = EFI_DEVICE_ERROR;\r
@@ -3259,7 +3350,8 @@ ScsiDiskRequestSenseKeys (
     // skip the loop.\r
     //\r
     if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) ||\r
-        (*NumberOfSenseKeys == ScsiDiskDevice->SenseDataNumber)) {\r
+        (*NumberOfSenseKeys == ScsiDiskDevice->SenseDataNumber))\r
+    {\r
       SenseReq = FALSE;\r
     }\r
   }\r
@@ -3269,7 +3361,6 @@ EXIT:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Get information from media read capacity command.\r
 \r
@@ -3285,25 +3376,25 @@ GetMediaInfo (
   IN     EFI_SCSI_DISK_CAPACITY_DATA16  *Capacity16\r
   )\r
 {\r
-  UINT8       *Ptr;\r
+  UINT8  *Ptr;\r
 \r
   if (!ScsiDiskDevice->Cdb16Byte) {\r
-    ScsiDiskDevice->BlkIo.Media->LastBlock =  ((UINT32) Capacity10->LastLba3 << 24) |\r
-                                              (Capacity10->LastLba2 << 16) |\r
-                                              (Capacity10->LastLba1 << 8)  |\r
-                                               Capacity10->LastLba0;\r
+    ScsiDiskDevice->BlkIo.Media->LastBlock =  ((UINT32)Capacity10->LastLba3 << 24) |\r
+                                             (Capacity10->LastLba2 << 16) |\r
+                                             (Capacity10->LastLba1 << 8)  |\r
+                                             Capacity10->LastLba0;\r
 \r
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity10->BlockSize3 << 24) |\r
                                              (Capacity10->BlockSize2 << 16) |\r
                                              (Capacity10->BlockSize1 << 8)  |\r
-                                              Capacity10->BlockSize0;\r
-    ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;\r
-    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = 0;\r
+                                             Capacity10->BlockSize0;\r
+    ScsiDiskDevice->BlkIo.Media->LowestAlignedLba              = 0;\r
+    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock = 0;\r
     if (!ScsiDiskDevice->BlockLimitsVpdSupported) {\r
-      ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32) ScsiDiskDevice->BlkIo.Media->LastBlock;\r
+      ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32)ScsiDiskDevice->BlkIo.Media->LastBlock;\r
     }\r
   } else {\r
-    Ptr = (UINT8*)&ScsiDiskDevice->BlkIo.Media->LastBlock;\r
+    Ptr    = (UINT8 *)&ScsiDiskDevice->BlkIo.Media->LastBlock;\r
     *Ptr++ = Capacity16->LastLba0;\r
     *Ptr++ = Capacity16->LastLba1;\r
     *Ptr++ = Capacity16->LastLba2;\r
@@ -3316,16 +3407,16 @@ GetMediaInfo (
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |\r
                                              (Capacity16->BlockSize2 << 16) |\r
                                              (Capacity16->BlockSize1 << 8)  |\r
-                                              Capacity16->BlockSize0;\r
+                                             Capacity16->BlockSize0;\r
 \r
     ScsiDiskDevice->BlkIo.Media->LowestAlignedLba = (Capacity16->LowestAlignLogic2 << 8) |\r
-                                                     Capacity16->LowestAlignLogic1;\r
-    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = (1 << Capacity16->LogicPerPhysical);\r
+                                                    Capacity16->LowestAlignLogic1;\r
+    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock = (1 << Capacity16->LogicPerPhysical);\r
     if (!ScsiDiskDevice->BlockLimitsVpdSupported) {\r
-      if (ScsiDiskDevice->BlkIo.Media->LastBlock > (UINT32) -1) {\r
-        ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32) -1;\r
+      if (ScsiDiskDevice->BlkIo.Media->LastBlock > (UINT32)-1) {\r
+        ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32)-1;\r
       } else {\r
-        ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32) ScsiDiskDevice->BlkIo.Media->LastBlock;\r
+        ScsiDiskDevice->UnmapInfo.MaxLbaCnt = (UINT32)ScsiDiskDevice->BlkIo.Media->LastBlock;\r
       }\r
     }\r
   }\r
@@ -3341,11 +3432,11 @@ GetMediaInfo (
 **/\r
 VOID\r
 ParseInquiryData (\r
-  IN OUT SCSI_DISK_DEV   *ScsiDiskDevice\r
+  IN OUT SCSI_DISK_DEV  *ScsiDiskDevice\r
   )\r
 {\r
-  ScsiDiskDevice->FixedDevice               = (BOOLEAN) ((ScsiDiskDevice->InquiryData.Rmb == 1) ? 0 : 1);\r
-  ScsiDiskDevice->BlkIoMedia.RemovableMedia = (BOOLEAN) (!ScsiDiskDevice->FixedDevice);\r
+  ScsiDiskDevice->FixedDevice               = (BOOLEAN)((ScsiDiskDevice->InquiryData.Rmb == 1) ? 0 : 1);\r
+  ScsiDiskDevice->BlkIoMedia.RemovableMedia = (BOOLEAN)(!ScsiDiskDevice->FixedDevice);\r
 }\r
 \r
 /**\r
@@ -3362,48 +3453,47 @@ ParseInquiryData (
 **/\r
 EFI_STATUS\r
 ScsiDiskReadSectors (\r
-  IN   SCSI_DISK_DEV     *ScsiDiskDevice,\r
-  OUT  VOID              *Buffer,\r
-  IN   EFI_LBA           Lba,\r
-  IN   UINTN             NumberOfBlocks\r
+  IN   SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT  VOID           *Buffer,\r
+  IN   EFI_LBA        Lba,\r
+  IN   UINTN          NumberOfBlocks\r
   )\r
 {\r
-  UINTN               BlocksRemaining;\r
-  UINT8               *PtrBuffer;\r
-  UINT32              BlockSize;\r
-  UINT32              ByteCount;\r
-  UINT32              MaxBlock;\r
-  UINT32              SectorCount;\r
-  UINT32              NextSectorCount;\r
-  UINT64              Timeout;\r
-  EFI_STATUS          Status;\r
-  UINT8               Index;\r
-  UINT8               MaxRetry;\r
-  BOOLEAN             NeedRetry;\r
+  UINTN       BlocksRemaining;\r
+  UINT8       *PtrBuffer;\r
+  UINT32      BlockSize;\r
+  UINT32      ByteCount;\r
+  UINT32      MaxBlock;\r
+  UINT32      SectorCount;\r
+  UINT32      NextSectorCount;\r
+  UINT64      Timeout;\r
+  EFI_STATUS  Status;\r
+  UINT8       Index;\r
+  UINT8       MaxRetry;\r
+  BOOLEAN     NeedRetry;\r
 \r
-  Status            = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  BlocksRemaining   = NumberOfBlocks;\r
-  BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+  BlocksRemaining = NumberOfBlocks;\r
+  BlockSize       = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
 \r
   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r
   if (!ScsiDiskDevice->Cdb16Byte) {\r
-    MaxBlock         = 0xFFFF;\r
+    MaxBlock = 0xFFFF;\r
   } else {\r
-    MaxBlock         = 0xFFFFFFFF;\r
+    MaxBlock = 0xFFFFFFFF;\r
   }\r
 \r
   PtrBuffer = Buffer;\r
 \r
   while (BlocksRemaining > 0) {\r
-\r
     if (BlocksRemaining <= MaxBlock) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
-        SectorCount = (UINT16) BlocksRemaining;\r
+        SectorCount = (UINT16)BlocksRemaining;\r
       } else {\r
-        SectorCount = (UINT32) BlocksRemaining;\r
+        SectorCount = (UINT32)BlocksRemaining;\r
       }\r
     } else {\r
       SectorCount = MaxBlock;\r
@@ -3438,35 +3528,36 @@ ScsiDiskReadSectors (
     // As ScsiDisk and ScsiBus driver are used to manage SCSI or ATAPI devices, we have to use\r
     // the lowest transfer rate to calculate the possible maximum timeout value for each operation.\r
     // From the above table, we could know 2.1Mbytes per second is lowest one.\r
-    // The timout value is rounded up to nearest integar and here an additional 30s is added\r
+    // The timeout value is rounded up to nearest integer and here an additional 30s is added\r
     // to follow ATA spec in which it mentioned that the device may take up to 30s to respond\r
     // commands in the Standby/Idle mode.\r
     //\r
-    Timeout   = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
+    Timeout = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
 \r
-    MaxRetry  = 2;\r
+    MaxRetry = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
         Status = ScsiDiskRead10 (\r
-                  ScsiDiskDevice,\r
-                  &NeedRetry,\r
-                  Timeout,\r
-                  PtrBuffer,\r
-                  &ByteCount,\r
-                  (UINT32) Lba,\r
-                  SectorCount\r
-                  );\r
+                   ScsiDiskDevice,\r
+                   &NeedRetry,\r
+                   Timeout,\r
+                   PtrBuffer,\r
+                   &ByteCount,\r
+                   (UINT32)Lba,\r
+                   SectorCount\r
+                   );\r
       } else {\r
         Status = ScsiDiskRead16 (\r
-                  ScsiDiskDevice,\r
-                  &NeedRetry,\r
-                  Timeout,\r
-                  PtrBuffer,\r
-                  &ByteCount,\r
-                  Lba,\r
-                  SectorCount\r
-                  );\r
+                   ScsiDiskDevice,\r
+                   &NeedRetry,\r
+                   Timeout,\r
+                   PtrBuffer,\r
+                   &ByteCount,\r
+                   Lba,\r
+                   SectorCount\r
+                   );\r
       }\r
+\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
       }\r
@@ -3482,7 +3573,7 @@ ScsiDiskReadSectors (
       // it is invalid to request more sectors in the CDB than the entire\r
       // transfer (ie. ByteCount) can carry.\r
       //\r
-      // In addition, ByteCount is only expected to go down, or stay unchaged.\r
+      // In addition, ByteCount is only expected to go down, or stay unchanged.\r
       // Therefore we don't need to update Timeout: the original timeout should\r
       // accommodate shorter transfers too.\r
       //\r
@@ -3505,8 +3596,8 @@ ScsiDiskReadSectors (
     //\r
     SectorCount = ByteCount / BlockSize;\r
 \r
-    Lba += SectorCount;\r
-    PtrBuffer = PtrBuffer + SectorCount * BlockSize;\r
+    Lba             += SectorCount;\r
+    PtrBuffer        = PtrBuffer + SectorCount * BlockSize;\r
     BlocksRemaining -= SectorCount;\r
   }\r
 \r
@@ -3527,48 +3618,47 @@ ScsiDiskReadSectors (
 **/\r
 EFI_STATUS\r
 ScsiDiskWriteSectors (\r
-  IN  SCSI_DISK_DEV     *ScsiDiskDevice,\r
-  IN  VOID              *Buffer,\r
-  IN  EFI_LBA           Lba,\r
-  IN  UINTN             NumberOfBlocks\r
+  IN  SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN  VOID           *Buffer,\r
+  IN  EFI_LBA        Lba,\r
+  IN  UINTN          NumberOfBlocks\r
   )\r
 {\r
-  UINTN               BlocksRemaining;\r
-  UINT8               *PtrBuffer;\r
-  UINT32              BlockSize;\r
-  UINT32              ByteCount;\r
-  UINT32              MaxBlock;\r
-  UINT32              SectorCount;\r
-  UINT32              NextSectorCount;\r
-  UINT64              Timeout;\r
-  EFI_STATUS          Status;\r
-  UINT8               Index;\r
-  UINT8               MaxRetry;\r
-  BOOLEAN             NeedRetry;\r
+  UINTN       BlocksRemaining;\r
+  UINT8       *PtrBuffer;\r
+  UINT32      BlockSize;\r
+  UINT32      ByteCount;\r
+  UINT32      MaxBlock;\r
+  UINT32      SectorCount;\r
+  UINT32      NextSectorCount;\r
+  UINT64      Timeout;\r
+  EFI_STATUS  Status;\r
+  UINT8       Index;\r
+  UINT8       MaxRetry;\r
+  BOOLEAN     NeedRetry;\r
 \r
-  Status            = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  BlocksRemaining   = NumberOfBlocks;\r
-  BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+  BlocksRemaining = NumberOfBlocks;\r
+  BlockSize       = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
 \r
   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r
   if (!ScsiDiskDevice->Cdb16Byte) {\r
-    MaxBlock         = 0xFFFF;\r
+    MaxBlock = 0xFFFF;\r
   } else {\r
-    MaxBlock         = 0xFFFFFFFF;\r
+    MaxBlock = 0xFFFFFFFF;\r
   }\r
 \r
   PtrBuffer = Buffer;\r
 \r
   while (BlocksRemaining > 0) {\r
-\r
     if (BlocksRemaining <= MaxBlock) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
-        SectorCount = (UINT16) BlocksRemaining;\r
+        SectorCount = (UINT16)BlocksRemaining;\r
       } else {\r
-        SectorCount = (UINT32) BlocksRemaining;\r
+        SectorCount = (UINT32)BlocksRemaining;\r
       }\r
     } else {\r
       SectorCount = MaxBlock;\r
@@ -3603,34 +3693,35 @@ ScsiDiskWriteSectors (
     // As ScsiDisk and ScsiBus driver are used to manage SCSI or ATAPI devices, we have to use\r
     // the lowest transfer rate to calculate the possible maximum timeout value for each operation.\r
     // From the above table, we could know 2.1Mbytes per second is lowest one.\r
-    // The timout value is rounded up to nearest integar and here an additional 30s is added\r
+    // The timeout value is rounded up to nearest integer and here an additional 30s is added\r
     // to follow ATA spec in which it mentioned that the device may take up to 30s to respond\r
     // commands in the Standby/Idle mode.\r
     //\r
-    Timeout   = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
-    MaxRetry  = 2;\r
+    Timeout  = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
+    MaxRetry = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
         Status = ScsiDiskWrite10 (\r
-                  ScsiDiskDevice,\r
-                  &NeedRetry,\r
-                  Timeout,\r
-                  PtrBuffer,\r
-                  &ByteCount,\r
-                  (UINT32) Lba,\r
-                  SectorCount\r
-                  );\r
+                   ScsiDiskDevice,\r
+                   &NeedRetry,\r
+                   Timeout,\r
+                   PtrBuffer,\r
+                   &ByteCount,\r
+                   (UINT32)Lba,\r
+                   SectorCount\r
+                   );\r
       } else {\r
         Status = ScsiDiskWrite16 (\r
-                  ScsiDiskDevice,\r
-                  &NeedRetry,\r
-                  Timeout,\r
-                  PtrBuffer,\r
-                  &ByteCount,\r
-                  Lba,\r
-                  SectorCount\r
-                  );\r
-        }\r
+                   ScsiDiskDevice,\r
+                   &NeedRetry,\r
+                   Timeout,\r
+                   PtrBuffer,\r
+                   &ByteCount,\r
+                   Lba,\r
+                   SectorCount\r
+                   );\r
+      }\r
+\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
       }\r
@@ -3646,7 +3737,7 @@ ScsiDiskWriteSectors (
       // it is invalid to request more sectors in the CDB than the entire\r
       // transfer (ie. ByteCount) can carry.\r
       //\r
-      // In addition, ByteCount is only expected to go down, or stay unchaged.\r
+      // In addition, ByteCount is only expected to go down, or stay unchanged.\r
       // Therefore we don't need to update Timeout: the original timeout should\r
       // accommodate shorter transfers too.\r
       //\r
@@ -3663,13 +3754,14 @@ ScsiDiskWriteSectors (
     if ((Index == MaxRetry) && (Status != EFI_SUCCESS)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
+\r
     //\r
     // actual transferred sectors\r
     //\r
     SectorCount = ByteCount / BlockSize;\r
 \r
-    Lba += SectorCount;\r
-    PtrBuffer = PtrBuffer + SectorCount * BlockSize;\r
+    Lba             += SectorCount;\r
+    PtrBuffer        = PtrBuffer + SectorCount * BlockSize;\r
     BlocksRemaining -= SectorCount;\r
   }\r
 \r
@@ -3693,23 +3785,23 @@ ScsiDiskWriteSectors (
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncReadSectors (\r
-  IN   SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  OUT  VOID                  *Buffer,\r
-  IN   EFI_LBA               Lba,\r
-  IN   UINTN                 NumberOfBlocks,\r
-  IN   EFI_BLOCK_IO2_TOKEN   *Token\r
+  IN   SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  OUT  VOID                 *Buffer,\r
+  IN   EFI_LBA              Lba,\r
+  IN   UINTN                NumberOfBlocks,\r
+  IN   EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  UINTN                 BlocksRemaining;\r
-  UINT8                 *PtrBuffer;\r
-  UINT32                BlockSize;\r
-  UINT32                ByteCount;\r
-  UINT32                MaxBlock;\r
-  UINT32                SectorCount;\r
-  UINT64                Timeout;\r
-  SCSI_BLKIO2_REQUEST   *BlkIo2Req;\r
-  EFI_STATUS            Status;\r
-  EFI_TPL               OldTpl;\r
+  UINTN                BlocksRemaining;\r
+  UINT8                *PtrBuffer;\r
+  UINT32               BlockSize;\r
+  UINT32               ByteCount;\r
+  UINT32               MaxBlock;\r
+  UINT32               SectorCount;\r
+  UINT64               Timeout;\r
+  SCSI_BLKIO2_REQUEST  *BlkIo2Req;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
 \r
   if ((Token == NULL) || (Token->Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -3720,7 +3812,7 @@ ScsiDiskAsyncReadSectors (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  BlkIo2Req->Token  = Token;\r
+  BlkIo2Req->Token = Token;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   InsertTailList (&ScsiDiskDevice->AsyncTaskQueue, &BlkIo2Req->Link);\r
@@ -3728,30 +3820,29 @@ ScsiDiskAsyncReadSectors (
 \r
   InitializeListHead (&BlkIo2Req->ScsiRWQueue);\r
 \r
-  Status            = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  BlocksRemaining   = NumberOfBlocks;\r
-  BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+  BlocksRemaining = NumberOfBlocks;\r
+  BlockSize       = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
 \r
   //\r
   // Limit the data bytes that can be transferred by one Read(10) or Read(16)\r
   // Command\r
   //\r
   if (!ScsiDiskDevice->Cdb16Byte) {\r
-    MaxBlock         = 0xFFFF;\r
+    MaxBlock = 0xFFFF;\r
   } else {\r
-    MaxBlock         = 0xFFFFFFFF;\r
+    MaxBlock = 0xFFFFFFFF;\r
   }\r
 \r
   PtrBuffer = Buffer;\r
 \r
   while (BlocksRemaining > 0) {\r
-\r
     if (BlocksRemaining <= MaxBlock) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
-        SectorCount = (UINT16) BlocksRemaining;\r
+        SectorCount = (UINT16)BlocksRemaining;\r
       } else {\r
-        SectorCount = (UINT32) BlocksRemaining;\r
+        SectorCount = (UINT32)BlocksRemaining;\r
       }\r
     } else {\r
       SectorCount = MaxBlock;\r
@@ -3787,11 +3878,11 @@ ScsiDiskAsyncReadSectors (
     // we have to use the lowest transfer rate to calculate the possible\r
     // maximum timeout value for each operation.\r
     // From the above table, we could know 2.1Mbytes per second is lowest one.\r
-    // The timout value is rounded up to nearest integar and here an additional\r
+    // The timeout value is rounded up to nearest integer and here an additional\r
     // 30s is added to follow ATA spec in which it mentioned that the device\r
     // may take up to 30s to respond commands in the Standby/Idle mode.\r
     //\r
-    Timeout   = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
+    Timeout = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
 \r
     if (!ScsiDiskDevice->Cdb16Byte) {\r
       Status = ScsiDiskAsyncRead10 (\r
@@ -3800,7 +3891,7 @@ ScsiDiskAsyncReadSectors (
                  0,\r
                  PtrBuffer,\r
                  ByteCount,\r
-                 (UINT32) Lba,\r
+                 (UINT32)Lba,\r
                  SectorCount,\r
                  BlkIo2Req,\r
                  Token\r
@@ -3818,6 +3909,7 @@ ScsiDiskAsyncReadSectors (
                  Token\r
                  );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Some devices will return EFI_DEVICE_ERROR or EFI_TIMEOUT when the data\r
@@ -3868,8 +3960,8 @@ ScsiDiskAsyncReadSectors (
     //\r
     SectorCount = ByteCount / BlockSize;\r
 \r
-    Lba += SectorCount;\r
-    PtrBuffer = PtrBuffer + SectorCount * BlockSize;\r
+    Lba             += SectorCount;\r
+    PtrBuffer        = PtrBuffer + SectorCount * BlockSize;\r
     BlocksRemaining -= SectorCount;\r
   }\r
 \r
@@ -3887,6 +3979,7 @@ Done:
 \r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     gBS->RestoreTPL (OldTpl);\r
   }\r
 \r
@@ -3910,23 +4003,23 @@ Done:
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncWriteSectors (\r
-  IN  SCSI_DISK_DEV          *ScsiDiskDevice,\r
-  IN  VOID                   *Buffer,\r
-  IN  EFI_LBA                Lba,\r
-  IN  UINTN                  NumberOfBlocks,\r
-  IN  EFI_BLOCK_IO2_TOKEN    *Token\r
+  IN  SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN  VOID                 *Buffer,\r
+  IN  EFI_LBA              Lba,\r
+  IN  UINTN                NumberOfBlocks,\r
+  IN  EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  UINTN                 BlocksRemaining;\r
-  UINT8                 *PtrBuffer;\r
-  UINT32                BlockSize;\r
-  UINT32                ByteCount;\r
-  UINT32                MaxBlock;\r
-  UINT32                SectorCount;\r
-  UINT64                Timeout;\r
-  SCSI_BLKIO2_REQUEST   *BlkIo2Req;\r
-  EFI_STATUS            Status;\r
-  EFI_TPL               OldTpl;\r
+  UINTN                BlocksRemaining;\r
+  UINT8                *PtrBuffer;\r
+  UINT32               BlockSize;\r
+  UINT32               ByteCount;\r
+  UINT32               MaxBlock;\r
+  UINT32               SectorCount;\r
+  UINT64               Timeout;\r
+  SCSI_BLKIO2_REQUEST  *BlkIo2Req;\r
+  EFI_STATUS           Status;\r
+  EFI_TPL              OldTpl;\r
 \r
   if ((Token == NULL) || (Token->Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -3937,7 +4030,7 @@ ScsiDiskAsyncWriteSectors (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  BlkIo2Req->Token  = Token;\r
+  BlkIo2Req->Token = Token;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   InsertTailList (&ScsiDiskDevice->AsyncTaskQueue, &BlkIo2Req->Link);\r
@@ -3945,30 +4038,29 @@ ScsiDiskAsyncWriteSectors (
 \r
   InitializeListHead (&BlkIo2Req->ScsiRWQueue);\r
 \r
-  Status            = EFI_SUCCESS;\r
+  Status = EFI_SUCCESS;\r
 \r
-  BlocksRemaining   = NumberOfBlocks;\r
-  BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+  BlocksRemaining = NumberOfBlocks;\r
+  BlockSize       = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
 \r
   //\r
   // Limit the data bytes that can be transferred by one Read(10) or Read(16)\r
   // Command\r
   //\r
   if (!ScsiDiskDevice->Cdb16Byte) {\r
-    MaxBlock         = 0xFFFF;\r
+    MaxBlock = 0xFFFF;\r
   } else {\r
-    MaxBlock         = 0xFFFFFFFF;\r
+    MaxBlock = 0xFFFFFFFF;\r
   }\r
 \r
   PtrBuffer = Buffer;\r
 \r
   while (BlocksRemaining > 0) {\r
-\r
     if (BlocksRemaining <= MaxBlock) {\r
       if (!ScsiDiskDevice->Cdb16Byte) {\r
-        SectorCount = (UINT16) BlocksRemaining;\r
+        SectorCount = (UINT16)BlocksRemaining;\r
       } else {\r
-        SectorCount = (UINT32) BlocksRemaining;\r
+        SectorCount = (UINT32)BlocksRemaining;\r
       }\r
     } else {\r
       SectorCount = MaxBlock;\r
@@ -4004,11 +4096,11 @@ ScsiDiskAsyncWriteSectors (
     // we have to use the lowest transfer rate to calculate the possible\r
     // maximum timeout value for each operation.\r
     // From the above table, we could know 2.1Mbytes per second is lowest one.\r
-    // The timout value is rounded up to nearest integar and here an additional\r
+    // The timeout value is rounded up to nearest integer and here an additional\r
     // 30s is added to follow ATA spec in which it mentioned that the device\r
     // may take up to 30s to respond commands in the Standby/Idle mode.\r
     //\r
-    Timeout   = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
+    Timeout = EFI_TIMER_PERIOD_SECONDS (ByteCount / 2100000 + 31);\r
 \r
     if (!ScsiDiskDevice->Cdb16Byte) {\r
       Status = ScsiDiskAsyncWrite10 (\r
@@ -4017,7 +4109,7 @@ ScsiDiskAsyncWriteSectors (
                  0,\r
                  PtrBuffer,\r
                  ByteCount,\r
-                 (UINT32) Lba,\r
+                 (UINT32)Lba,\r
                  SectorCount,\r
                  BlkIo2Req,\r
                  Token\r
@@ -4035,6 +4127,7 @@ ScsiDiskAsyncWriteSectors (
                  Token\r
                  );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Some devices will return EFI_DEVICE_ERROR or EFI_TIMEOUT when the data\r
@@ -4085,8 +4178,8 @@ ScsiDiskAsyncWriteSectors (
     //\r
     SectorCount = ByteCount / BlockSize;\r
 \r
-    Lba += SectorCount;\r
-    PtrBuffer = PtrBuffer + SectorCount * BlockSize;\r
+    Lba             += SectorCount;\r
+    PtrBuffer        = PtrBuffer + SectorCount * BlockSize;\r
     BlocksRemaining -= SectorCount;\r
   }\r
 \r
@@ -4104,13 +4197,13 @@ Done:
 \r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     gBS->RestoreTPL (OldTpl);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Submit Read(10) command.\r
 \r
@@ -4126,13 +4219,13 @@ Done:
 **/\r
 EFI_STATUS\r
 ScsiDiskRead10 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-     OUT BOOLEAN               *NeedRetry,\r
-  IN     UINT64                Timeout,\r
-     OUT UINT8                 *DataBuffer,\r
-  IN OUT UINT32                *DataLength,\r
-  IN     UINT32                StartLba,\r
-  IN     UINT32                SectorCount\r
+  IN     SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT BOOLEAN           *NeedRetry,\r
+  IN     UINT64         Timeout,\r
+  OUT UINT8             *DataBuffer,\r
+  IN OUT UINT32         *DataLength,\r
+  IN     UINT32         StartLba,\r
+  IN     UINT32         SectorCount\r
   )\r
 {\r
   UINT8       SenseDataLength;\r
@@ -4143,31 +4236,31 @@ ScsiDiskRead10 (
   UINTN       Action;\r
 \r
   //\r
-  // Implement a backoff algorithem to resolve some compatibility issues that\r
+  // Implement a backoff algorithm to resolve some compatibility issues that\r
   // some SCSI targets or ATAPI devices couldn't correctly response reading/writing\r
   // big data in a single operation.\r
-  // This algorithem will at first try to execute original request. If the request fails\r
+  // This algorithm will at first try to execute original request. If the request fails\r
   // with media error sense data or else, it will reduce the transfer length to half and\r
   // try again till the operation succeeds or fails with one sector transfer length.\r
   //\r
 BackOff:\r
-  *NeedRetry          = FALSE;\r
-  Action              = ACTION_NO_ACTION;\r
-  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
-  ReturnStatus = ScsiRead10Command (\r
-                   ScsiDiskDevice->ScsiIo,\r
-                   Timeout,\r
-                   ScsiDiskDevice->SenseData,\r
-                   &SenseDataLength,\r
-                   &HostAdapterStatus,\r
-                   &TargetStatus,\r
-                   DataBuffer,\r
-                   DataLength,\r
-                   StartLba,\r
-                   SectorCount\r
-                   );\r
+  *NeedRetry      = FALSE;\r
+  Action          = ACTION_NO_ACTION;\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus    = ScsiRead10Command (\r
+                      ScsiDiskDevice->ScsiIo,\r
+                      Timeout,\r
+                      ScsiDiskDevice->SenseData,\r
+                      &SenseDataLength,\r
+                      &HostAdapterStatus,\r
+                      &TargetStatus,\r
+                      DataBuffer,\r
+                      DataLength,\r
+                      StartLba,\r
+                      SectorCount\r
+                      );\r
 \r
-  if (ReturnStatus == EFI_NOT_READY || ReturnStatus == EFI_BAD_BUFFER_SIZE) {\r
+  if ((ReturnStatus == EFI_NOT_READY) || (ReturnStatus == EFI_BAD_BUFFER_SIZE)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
@@ -4206,8 +4299,8 @@ BackOff:
   }\r
 \r
   if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
-    DEBUG ((EFI_D_ERROR, "ScsiDiskRead10: Check Condition happened!\n"));\r
-    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    DEBUG ((DEBUG_ERROR, "ScsiDiskRead10: Check Condition happened!\n"));\r
+    DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
     if (Action == ACTION_RETRY_COMMAND_LATER) {\r
       *NeedRetry = TRUE;\r
       return EFI_DEVICE_ERROR;\r
@@ -4219,11 +4312,12 @@ BackOff:
         *NeedRetry = FALSE;\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       //\r
       // Try again with half length if the sense data shows we need to retry.\r
       //\r
       SectorCount >>= 1;\r
-      *DataLength = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+      *DataLength   = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
       goto BackOff;\r
     } else {\r
       *NeedRetry = FALSE;\r
@@ -4234,7 +4328,6 @@ BackOff:
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Submit Write(10) Command.\r
 \r
@@ -4251,13 +4344,13 @@ BackOff:
 **/\r
 EFI_STATUS\r
 ScsiDiskWrite10 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-     OUT BOOLEAN               *NeedRetry,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 *DataBuffer,\r
-  IN OUT UINT32                *DataLength,\r
-  IN     UINT32                StartLba,\r
-  IN     UINT32                SectorCount\r
+  IN     SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT BOOLEAN           *NeedRetry,\r
+  IN     UINT64         Timeout,\r
+  IN     UINT8          *DataBuffer,\r
+  IN OUT UINT32         *DataLength,\r
+  IN     UINT32         StartLba,\r
+  IN     UINT32         SectorCount\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -4268,30 +4361,30 @@ ScsiDiskWrite10 (
   UINTN       Action;\r
 \r
   //\r
-  // Implement a backoff algorithem to resolve some compatibility issues that\r
+  // Implement a backoff algorithm to resolve some compatibility issues that\r
   // some SCSI targets or ATAPI devices couldn't correctly response reading/writing\r
   // big data in a single operation.\r
-  // This algorithem will at first try to execute original request. If the request fails\r
+  // This algorithm will at first try to execute original request. If the request fails\r
   // with media error sense data or else, it will reduce the transfer length to half and\r
   // try again till the operation succeeds or fails with one sector transfer length.\r
   //\r
 BackOff:\r
-  *NeedRetry          = FALSE;\r
-  Action              = ACTION_NO_ACTION;\r
-  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
-  ReturnStatus = ScsiWrite10Command (\r
-                   ScsiDiskDevice->ScsiIo,\r
-                   Timeout,\r
-                   ScsiDiskDevice->SenseData,\r
-                   &SenseDataLength,\r
-                   &HostAdapterStatus,\r
-                   &TargetStatus,\r
-                   DataBuffer,\r
-                   DataLength,\r
-                   StartLba,\r
-                   SectorCount\r
-                   );\r
-  if (ReturnStatus == EFI_NOT_READY || ReturnStatus == EFI_BAD_BUFFER_SIZE) {\r
+  *NeedRetry      = FALSE;\r
+  Action          = ACTION_NO_ACTION;\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus    = ScsiWrite10Command (\r
+                      ScsiDiskDevice->ScsiIo,\r
+                      Timeout,\r
+                      ScsiDiskDevice->SenseData,\r
+                      &SenseDataLength,\r
+                      &HostAdapterStatus,\r
+                      &TargetStatus,\r
+                      DataBuffer,\r
+                      DataLength,\r
+                      StartLba,\r
+                      SectorCount\r
+                      );\r
+  if ((ReturnStatus == EFI_NOT_READY) || (ReturnStatus == EFI_BAD_BUFFER_SIZE)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
@@ -4330,8 +4423,8 @@ BackOff:
   }\r
 \r
   if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
-    DEBUG ((EFI_D_ERROR, "ScsiDiskWrite10: Check Condition happened!\n"));\r
-    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    DEBUG ((DEBUG_ERROR, "ScsiDiskWrite10: Check Condition happened!\n"));\r
+    DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
     if (Action == ACTION_RETRY_COMMAND_LATER) {\r
       *NeedRetry = TRUE;\r
       return EFI_DEVICE_ERROR;\r
@@ -4343,11 +4436,12 @@ BackOff:
         *NeedRetry = FALSE;\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       //\r
       // Try again with half length if the sense data shows we need to retry.\r
       //\r
       SectorCount >>= 1;\r
-      *DataLength = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+      *DataLength   = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
       goto BackOff;\r
     } else {\r
       *NeedRetry = FALSE;\r
@@ -4358,7 +4452,6 @@ BackOff:
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Submit Read(16) command.\r
 \r
@@ -4374,13 +4467,13 @@ BackOff:
 **/\r
 EFI_STATUS\r
 ScsiDiskRead16 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-     OUT BOOLEAN               *NeedRetry,\r
-  IN     UINT64                Timeout,\r
-     OUT UINT8                 *DataBuffer,\r
-  IN OUT UINT32                *DataLength,\r
-  IN     UINT64                StartLba,\r
-  IN     UINT32                SectorCount\r
+  IN     SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT BOOLEAN           *NeedRetry,\r
+  IN     UINT64         Timeout,\r
+  OUT UINT8             *DataBuffer,\r
+  IN OUT UINT32         *DataLength,\r
+  IN     UINT64         StartLba,\r
+  IN     UINT32         SectorCount\r
   )\r
 {\r
   UINT8       SenseDataLength;\r
@@ -4391,30 +4484,30 @@ ScsiDiskRead16 (
   UINTN       Action;\r
 \r
   //\r
-  // Implement a backoff algorithem to resolve some compatibility issues that\r
+  // Implement a backoff algorithm to resolve some compatibility issues that\r
   // some SCSI targets or ATAPI devices couldn't correctly response reading/writing\r
   // big data in a single operation.\r
-  // This algorithem will at first try to execute original request. If the request fails\r
+  // This algorithm will at first try to execute original request. If the request fails\r
   // with media error sense data or else, it will reduce the transfer length to half and\r
   // try again till the operation succeeds or fails with one sector transfer length.\r
   //\r
 BackOff:\r
-  *NeedRetry          = FALSE;\r
-  Action              = ACTION_NO_ACTION;\r
-  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
-  ReturnStatus = ScsiRead16Command (\r
-                   ScsiDiskDevice->ScsiIo,\r
-                   Timeout,\r
-                   ScsiDiskDevice->SenseData,\r
-                   &SenseDataLength,\r
-                   &HostAdapterStatus,\r
-                   &TargetStatus,\r
-                   DataBuffer,\r
-                   DataLength,\r
-                   StartLba,\r
-                   SectorCount\r
-                   );\r
-  if (ReturnStatus == EFI_NOT_READY || ReturnStatus == EFI_BAD_BUFFER_SIZE) {\r
+  *NeedRetry      = FALSE;\r
+  Action          = ACTION_NO_ACTION;\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus    = ScsiRead16Command (\r
+                      ScsiDiskDevice->ScsiIo,\r
+                      Timeout,\r
+                      ScsiDiskDevice->SenseData,\r
+                      &SenseDataLength,\r
+                      &HostAdapterStatus,\r
+                      &TargetStatus,\r
+                      DataBuffer,\r
+                      DataLength,\r
+                      StartLba,\r
+                      SectorCount\r
+                      );\r
+  if ((ReturnStatus == EFI_NOT_READY) || (ReturnStatus == EFI_BAD_BUFFER_SIZE)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
@@ -4453,8 +4546,8 @@ BackOff:
   }\r
 \r
   if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
-    DEBUG ((EFI_D_ERROR, "ScsiDiskRead16: Check Condition happened!\n"));\r
-    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    DEBUG ((DEBUG_ERROR, "ScsiDiskRead16: Check Condition happened!\n"));\r
+    DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
     if (Action == ACTION_RETRY_COMMAND_LATER) {\r
       *NeedRetry = TRUE;\r
       return EFI_DEVICE_ERROR;\r
@@ -4466,11 +4559,12 @@ BackOff:
         *NeedRetry = FALSE;\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       //\r
       // Try again with half length if the sense data shows we need to retry.\r
       //\r
       SectorCount >>= 1;\r
-      *DataLength = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+      *DataLength   = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
       goto BackOff;\r
     } else {\r
       *NeedRetry = FALSE;\r
@@ -4481,7 +4575,6 @@ BackOff:
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Submit Write(16) Command.\r
 \r
@@ -4498,13 +4591,13 @@ BackOff:
 **/\r
 EFI_STATUS\r
 ScsiDiskWrite16 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-     OUT BOOLEAN               *NeedRetry,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 *DataBuffer,\r
-  IN OUT UINT32                *DataLength,\r
-  IN     UINT64                StartLba,\r
-  IN     UINT32                SectorCount\r
+  IN     SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  OUT BOOLEAN           *NeedRetry,\r
+  IN     UINT64         Timeout,\r
+  IN     UINT8          *DataBuffer,\r
+  IN OUT UINT32         *DataLength,\r
+  IN     UINT64         StartLba,\r
+  IN     UINT32         SectorCount\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -4515,30 +4608,30 @@ ScsiDiskWrite16 (
   UINTN       Action;\r
 \r
   //\r
-  // Implement a backoff algorithem to resolve some compatibility issues that\r
+  // Implement a backoff algorithm to resolve some compatibility issues that\r
   // some SCSI targets or ATAPI devices couldn't correctly response reading/writing\r
   // big data in a single operation.\r
-  // This algorithem will at first try to execute original request. If the request fails\r
+  // This algorithm will at first try to execute original request. If the request fails\r
   // with media error sense data or else, it will reduce the transfer length to half and\r
   // try again till the operation succeeds or fails with one sector transfer length.\r
   //\r
 BackOff:\r
-  *NeedRetry          = FALSE;\r
-  Action              = ACTION_NO_ACTION;\r
-  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
-  ReturnStatus = ScsiWrite16Command (\r
-                   ScsiDiskDevice->ScsiIo,\r
-                   Timeout,\r
-                   ScsiDiskDevice->SenseData,\r
-                   &SenseDataLength,\r
-                   &HostAdapterStatus,\r
-                   &TargetStatus,\r
-                   DataBuffer,\r
-                   DataLength,\r
-                   StartLba,\r
-                   SectorCount\r
-                   );\r
-  if (ReturnStatus == EFI_NOT_READY || ReturnStatus == EFI_BAD_BUFFER_SIZE) {\r
+  *NeedRetry      = FALSE;\r
+  Action          = ACTION_NO_ACTION;\r
+  SenseDataLength = (UINT8)(ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus    = ScsiWrite16Command (\r
+                      ScsiDiskDevice->ScsiIo,\r
+                      Timeout,\r
+                      ScsiDiskDevice->SenseData,\r
+                      &SenseDataLength,\r
+                      &HostAdapterStatus,\r
+                      &TargetStatus,\r
+                      DataBuffer,\r
+                      DataLength,\r
+                      StartLba,\r
+                      SectorCount\r
+                      );\r
+  if ((ReturnStatus == EFI_NOT_READY) || (ReturnStatus == EFI_BAD_BUFFER_SIZE)) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
@@ -4577,8 +4670,8 @@ BackOff:
   }\r
 \r
   if ((TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) || (EFI_ERROR (ReturnStatus))) {\r
-    DEBUG ((EFI_D_ERROR, "ScsiDiskWrite16: Check Condition happened!\n"));\r
-    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    DEBUG ((DEBUG_ERROR, "ScsiDiskWrite16: Check Condition happened!\n"));\r
+    DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
     if (Action == ACTION_RETRY_COMMAND_LATER) {\r
       *NeedRetry = TRUE;\r
       return EFI_DEVICE_ERROR;\r
@@ -4590,11 +4683,12 @@ BackOff:
         *NeedRetry = FALSE;\r
         return EFI_DEVICE_ERROR;\r
       }\r
+\r
       //\r
       // Try again with half length if the sense data shows we need to retry.\r
       //\r
       SectorCount >>= 1;\r
-      *DataLength = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+      *DataLength   = SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
       goto BackOff;\r
     } else {\r
       *NeedRetry = FALSE;\r
@@ -4605,7 +4699,6 @@ BackOff:
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Internal helper notify function in which determine whether retry of a SCSI\r
   Read/Write command is needed and signal the event passed from Block I/O(2) if\r
@@ -4622,23 +4715,23 @@ ScsiDiskNotify (
   IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  SCSI_ASYNC_RW_REQUEST            *Request;\r
-  SCSI_DISK_DEV                    *ScsiDiskDevice;\r
-  EFI_BLOCK_IO2_TOKEN              *Token;\r
-  UINTN                            Action;\r
-  UINT32                           OldDataLength;\r
-  UINT32                           OldSectorCount;\r
-  UINT8                            MaxRetry;\r
+  EFI_STATUS             Status;\r
+  SCSI_ASYNC_RW_REQUEST  *Request;\r
+  SCSI_DISK_DEV          *ScsiDiskDevice;\r
+  EFI_BLOCK_IO2_TOKEN    *Token;\r
+  UINTN                  Action;\r
+  UINT32                 OldDataLength;\r
+  UINT32                 OldSectorCount;\r
+  UINT8                  MaxRetry;\r
 \r
   gBS->CloseEvent (Event);\r
 \r
-  Request         = (SCSI_ASYNC_RW_REQUEST *) Context;\r
-  ScsiDiskDevice  = Request->ScsiDiskDevice;\r
-  Token           = Request->BlkIo2Req->Token;\r
-  OldDataLength   = Request->DataLength;\r
-  OldSectorCount  = Request->SectorCount;\r
-  MaxRetry        = 2;\r
+  Request        = (SCSI_ASYNC_RW_REQUEST *)Context;\r
+  ScsiDiskDevice = Request->ScsiDiskDevice;\r
+  Token          = Request->BlkIo2Req->Token;\r
+  OldDataLength  = Request->DataLength;\r
+  OldSectorCount = Request->SectorCount;\r
+  MaxRetry       = 2;\r
 \r
   //\r
   // If previous sub-tasks already fails, no need to process this sub-task.\r
@@ -4686,14 +4779,14 @@ ScsiDiskNotify (
   }\r
 \r
   if (Request->TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
-    DEBUG ((EFI_D_ERROR, "ScsiDiskNotify: Check Condition happened!\n"));\r
-\r
-    Status = DetectMediaParsingSenseKeys (\r
-               ScsiDiskDevice,\r
-               Request->SenseData,\r
-               Request->SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA),\r
-               &Action\r
-               );\r
+    DEBUG ((DEBUG_ERROR, "ScsiDiskNotify: Check Condition happened!\n"));\r
+\r
+    DetectMediaParsingSenseKeys (\r
+      ScsiDiskDevice,\r
+      Request->SenseData,\r
+      Request->SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA),\r
+      &Action\r
+      );\r
     if (Action == ACTION_RETRY_COMMAND_LATER) {\r
       if (++Request->TimesRetry > MaxRetry) {\r
         Token->TransactionStatus = EFI_DEVICE_ERROR;\r
@@ -4710,13 +4803,14 @@ ScsiDiskNotify (
         Token->TransactionStatus = EFI_DEVICE_ERROR;\r
         goto Exit;\r
       }\r
+\r
       //\r
       // Try again with two half length request if the sense data shows we need\r
       // to retry.\r
       //\r
       Request->SectorCount >>= 1;\r
-      Request->DataLength = Request->SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
-      Request->TimesRetry  = 0;\r
+      Request->DataLength    = Request->SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize;\r
+      Request->TimesRetry    = 0;\r
 \r
       goto Retry;\r
     } else {\r
@@ -4742,7 +4836,7 @@ Retry:
                  Request->TimesRetry,\r
                  Request->InBuffer,\r
                  Request->DataLength,\r
-                 (UINT32) Request->StartLba,\r
+                 (UINT32)Request->StartLba,\r
                  Request->SectorCount,\r
                  Request->BlkIo2Req,\r
                  Token\r
@@ -4776,7 +4870,7 @@ Retry:
                    0,\r
                    Request->InBuffer + Request->SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize,\r
                    OldDataLength - Request->DataLength,\r
-                   (UINT32) Request->StartLba + Request->SectorCount,\r
+                   (UINT32)Request->StartLba + Request->SectorCount,\r
                    OldSectorCount - Request->SectorCount,\r
                    Request->BlkIo2Req,\r
                    Token\r
@@ -4794,6 +4888,7 @@ Retry:
                    Token\r
                    );\r
       }\r
+\r
       if (EFI_ERROR (Status)) {\r
         Token->TransactionStatus = EFI_DEVICE_ERROR;\r
         goto Exit;\r
@@ -4810,7 +4905,7 @@ Retry:
                  Request->TimesRetry,\r
                  Request->OutBuffer,\r
                  Request->DataLength,\r
-                 (UINT32) Request->StartLba,\r
+                 (UINT32)Request->StartLba,\r
                  Request->SectorCount,\r
                  Request->BlkIo2Req,\r
                  Token\r
@@ -4844,7 +4939,7 @@ Retry:
                    0,\r
                    Request->OutBuffer + Request->SectorCount * ScsiDiskDevice->BlkIo.Media->BlockSize,\r
                    OldDataLength - Request->DataLength,\r
-                   (UINT32) Request->StartLba + Request->SectorCount,\r
+                   (UINT32)Request->StartLba + Request->SectorCount,\r
                    OldSectorCount - Request->SectorCount,\r
                    Request->BlkIo2Req,\r
                    Token\r
@@ -4862,6 +4957,7 @@ Retry:
                    Token\r
                    );\r
       }\r
+\r
       if (EFI_ERROR (Status)) {\r
         Token->TransactionStatus = EFI_DEVICE_ERROR;\r
         goto Exit;\r
@@ -4872,7 +4968,8 @@ Retry:
 Exit:\r
   RemoveEntryList (&Request->Link);\r
   if ((IsListEmpty (&Request->BlkIo2Req->ScsiRWQueue)) &&\r
-      (Request->BlkIo2Req->LastScsiRW)) {\r
+      (Request->BlkIo2Req->LastScsiRW))\r
+  {\r
     //\r
     // The last SCSI R/W command of a BlockIo2 request completes\r
     //\r
@@ -4885,7 +4982,6 @@ Exit:
   FreePool (Request);\r
 }\r
 \r
-\r
 /**\r
   Submit Async Read(10) command.\r
 \r
@@ -4908,21 +5004,21 @@ Exit:
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncRead10 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 TimesRetry,\r
-     OUT UINT8                 *DataBuffer,\r
-  IN     UINT32                DataLength,\r
-  IN     UINT32                StartLba,\r
-  IN     UINT32                SectorCount,\r
-  IN OUT SCSI_BLKIO2_REQUEST   *BlkIo2Req,\r
-  IN     EFI_BLOCK_IO2_TOKEN   *Token\r
+  IN     SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN     UINT64               Timeout,\r
+  IN     UINT8                TimesRetry,\r
+  OUT UINT8                   *DataBuffer,\r
+  IN     UINT32               DataLength,\r
+  IN     UINT32               StartLba,\r
+  IN     UINT32               SectorCount,\r
+  IN OUT SCSI_BLKIO2_REQUEST  *BlkIo2Req,\r
+  IN     EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  SCSI_ASYNC_RW_REQUEST        *Request;\r
-  EFI_EVENT                    AsyncIoEvent;\r
-  EFI_TPL                      OldTpl;\r
+  EFI_STATUS             Status;\r
+  SCSI_ASYNC_RW_REQUEST  *Request;\r
+  EFI_EVENT              AsyncIoEvent;\r
+  EFI_TPL                OldTpl;\r
 \r
   AsyncIoEvent = NULL;\r
 \r
@@ -4935,21 +5031,21 @@ ScsiDiskAsyncRead10 (
   InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);\r
   gBS->RestoreTPL (OldTpl);\r
 \r
-  Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));\r
+  Request->SenseDataLength = (UINT8)(6 * sizeof (EFI_SCSI_SENSE_DATA));\r
   Request->SenseData       = AllocateZeroPool (Request->SenseDataLength);\r
   if (Request->SenseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
 \r
-  Request->ScsiDiskDevice  = ScsiDiskDevice;\r
-  Request->Timeout         = Timeout;\r
-  Request->TimesRetry      = TimesRetry;\r
-  Request->InBuffer        = DataBuffer;\r
-  Request->DataLength      = DataLength;\r
-  Request->StartLba        = StartLba;\r
-  Request->SectorCount     = SectorCount;\r
-  Request->BlkIo2Req       = BlkIo2Req;\r
+  Request->ScsiDiskDevice = ScsiDiskDevice;\r
+  Request->Timeout        = Timeout;\r
+  Request->TimesRetry     = TimesRetry;\r
+  Request->InBuffer       = DataBuffer;\r
+  Request->DataLength     = DataLength;\r
+  Request->StartLba       = StartLba;\r
+  Request->SectorCount    = SectorCount;\r
+  Request->BlkIo2Req      = BlkIo2Req;\r
 \r
   //\r
   // Create Event\r
@@ -4961,7 +5057,7 @@ ScsiDiskAsyncRead10 (
                   Request,\r
                   &AsyncIoEvent\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -4974,11 +5070,11 @@ ScsiDiskAsyncRead10 (
              &Request->TargetStatus,\r
              Request->InBuffer,\r
              &Request->DataLength,\r
-             (UINT32) Request->StartLba,\r
+             (UINT32)Request->StartLba,\r
              Request->SectorCount,\r
              AsyncIoEvent\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5004,7 +5100,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Submit Async Write(10) command.\r
 \r
@@ -5027,21 +5122,21 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncWrite10 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 TimesRetry,\r
-  IN     UINT8                 *DataBuffer,\r
-  IN     UINT32                DataLength,\r
-  IN     UINT32                StartLba,\r
-  IN     UINT32                SectorCount,\r
-  IN OUT SCSI_BLKIO2_REQUEST   *BlkIo2Req,\r
-  IN     EFI_BLOCK_IO2_TOKEN   *Token\r
+  IN     SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN     UINT64               Timeout,\r
+  IN     UINT8                TimesRetry,\r
+  IN     UINT8                *DataBuffer,\r
+  IN     UINT32               DataLength,\r
+  IN     UINT32               StartLba,\r
+  IN     UINT32               SectorCount,\r
+  IN OUT SCSI_BLKIO2_REQUEST  *BlkIo2Req,\r
+  IN     EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  SCSI_ASYNC_RW_REQUEST        *Request;\r
-  EFI_EVENT                    AsyncIoEvent;\r
-  EFI_TPL                      OldTpl;\r
+  EFI_STATUS             Status;\r
+  SCSI_ASYNC_RW_REQUEST  *Request;\r
+  EFI_EVENT              AsyncIoEvent;\r
+  EFI_TPL                OldTpl;\r
 \r
   AsyncIoEvent = NULL;\r
 \r
@@ -5054,21 +5149,21 @@ ScsiDiskAsyncWrite10 (
   InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);\r
   gBS->RestoreTPL (OldTpl);\r
 \r
-  Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));\r
+  Request->SenseDataLength = (UINT8)(6 * sizeof (EFI_SCSI_SENSE_DATA));\r
   Request->SenseData       = AllocateZeroPool (Request->SenseDataLength);\r
   if (Request->SenseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
 \r
-  Request->ScsiDiskDevice  = ScsiDiskDevice;\r
-  Request->Timeout         = Timeout;\r
-  Request->TimesRetry      = TimesRetry;\r
-  Request->OutBuffer       = DataBuffer;\r
-  Request->DataLength      = DataLength;\r
-  Request->StartLba        = StartLba;\r
-  Request->SectorCount     = SectorCount;\r
-  Request->BlkIo2Req       = BlkIo2Req;\r
+  Request->ScsiDiskDevice = ScsiDiskDevice;\r
+  Request->Timeout        = Timeout;\r
+  Request->TimesRetry     = TimesRetry;\r
+  Request->OutBuffer      = DataBuffer;\r
+  Request->DataLength     = DataLength;\r
+  Request->StartLba       = StartLba;\r
+  Request->SectorCount    = SectorCount;\r
+  Request->BlkIo2Req      = BlkIo2Req;\r
 \r
   //\r
   // Create Event\r
@@ -5080,7 +5175,7 @@ ScsiDiskAsyncWrite10 (
                   Request,\r
                   &AsyncIoEvent\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5093,11 +5188,11 @@ ScsiDiskAsyncWrite10 (
              &Request->TargetStatus,\r
              Request->OutBuffer,\r
              &Request->DataLength,\r
-             (UINT32) Request->StartLba,\r
+             (UINT32)Request->StartLba,\r
              Request->SectorCount,\r
              AsyncIoEvent\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5123,7 +5218,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Submit Async Read(16) command.\r
 \r
@@ -5146,21 +5240,21 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncRead16 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 TimesRetry,\r
-     OUT UINT8                 *DataBuffer,\r
-  IN     UINT32                DataLength,\r
-  IN     UINT64                StartLba,\r
-  IN     UINT32                SectorCount,\r
-  IN OUT SCSI_BLKIO2_REQUEST   *BlkIo2Req,\r
-  IN     EFI_BLOCK_IO2_TOKEN   *Token\r
+  IN     SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN     UINT64               Timeout,\r
+  IN     UINT8                TimesRetry,\r
+  OUT UINT8                   *DataBuffer,\r
+  IN     UINT32               DataLength,\r
+  IN     UINT64               StartLba,\r
+  IN     UINT32               SectorCount,\r
+  IN OUT SCSI_BLKIO2_REQUEST  *BlkIo2Req,\r
+  IN     EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  SCSI_ASYNC_RW_REQUEST        *Request;\r
-  EFI_EVENT                    AsyncIoEvent;\r
-  EFI_TPL                      OldTpl;\r
+  EFI_STATUS             Status;\r
+  SCSI_ASYNC_RW_REQUEST  *Request;\r
+  EFI_EVENT              AsyncIoEvent;\r
+  EFI_TPL                OldTpl;\r
 \r
   AsyncIoEvent = NULL;\r
 \r
@@ -5173,21 +5267,21 @@ ScsiDiskAsyncRead16 (
   InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);\r
   gBS->RestoreTPL (OldTpl);\r
 \r
-  Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));\r
+  Request->SenseDataLength = (UINT8)(6 * sizeof (EFI_SCSI_SENSE_DATA));\r
   Request->SenseData       = AllocateZeroPool (Request->SenseDataLength);\r
   if (Request->SenseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
 \r
-  Request->ScsiDiskDevice  = ScsiDiskDevice;\r
-  Request->Timeout         = Timeout;\r
-  Request->TimesRetry      = TimesRetry;\r
-  Request->InBuffer        = DataBuffer;\r
-  Request->DataLength      = DataLength;\r
-  Request->StartLba        = StartLba;\r
-  Request->SectorCount     = SectorCount;\r
-  Request->BlkIo2Req       = BlkIo2Req;\r
+  Request->ScsiDiskDevice = ScsiDiskDevice;\r
+  Request->Timeout        = Timeout;\r
+  Request->TimesRetry     = TimesRetry;\r
+  Request->InBuffer       = DataBuffer;\r
+  Request->DataLength     = DataLength;\r
+  Request->StartLba       = StartLba;\r
+  Request->SectorCount    = SectorCount;\r
+  Request->BlkIo2Req      = BlkIo2Req;\r
 \r
   //\r
   // Create Event\r
@@ -5199,7 +5293,7 @@ ScsiDiskAsyncRead16 (
                   Request,\r
                   &AsyncIoEvent\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5216,7 +5310,7 @@ ScsiDiskAsyncRead16 (
              Request->SectorCount,\r
              AsyncIoEvent\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5242,7 +5336,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Submit Async Write(16) command.\r
 \r
@@ -5265,21 +5358,21 @@ ErrorExit:
 **/\r
 EFI_STATUS\r
 ScsiDiskAsyncWrite16 (\r
-  IN     SCSI_DISK_DEV         *ScsiDiskDevice,\r
-  IN     UINT64                Timeout,\r
-  IN     UINT8                 TimesRetry,\r
-  IN     UINT8                 *DataBuffer,\r
-  IN     UINT32                DataLength,\r
-  IN     UINT64                StartLba,\r
-  IN     UINT32                SectorCount,\r
-  IN OUT SCSI_BLKIO2_REQUEST   *BlkIo2Req,\r
-  IN     EFI_BLOCK_IO2_TOKEN   *Token\r
+  IN     SCSI_DISK_DEV        *ScsiDiskDevice,\r
+  IN     UINT64               Timeout,\r
+  IN     UINT8                TimesRetry,\r
+  IN     UINT8                *DataBuffer,\r
+  IN     UINT32               DataLength,\r
+  IN     UINT64               StartLba,\r
+  IN     UINT32               SectorCount,\r
+  IN OUT SCSI_BLKIO2_REQUEST  *BlkIo2Req,\r
+  IN     EFI_BLOCK_IO2_TOKEN  *Token\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  SCSI_ASYNC_RW_REQUEST        *Request;\r
-  EFI_EVENT                    AsyncIoEvent;\r
-  EFI_TPL                      OldTpl;\r
+  EFI_STATUS             Status;\r
+  SCSI_ASYNC_RW_REQUEST  *Request;\r
+  EFI_EVENT              AsyncIoEvent;\r
+  EFI_TPL                OldTpl;\r
 \r
   AsyncIoEvent = NULL;\r
 \r
@@ -5292,21 +5385,21 @@ ScsiDiskAsyncWrite16 (
   InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);\r
   gBS->RestoreTPL (OldTpl);\r
 \r
-  Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));\r
+  Request->SenseDataLength = (UINT8)(6 * sizeof (EFI_SCSI_SENSE_DATA));\r
   Request->SenseData       = AllocateZeroPool (Request->SenseDataLength);\r
   if (Request->SenseData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
 \r
-  Request->ScsiDiskDevice  = ScsiDiskDevice;\r
-  Request->Timeout         = Timeout;\r
-  Request->TimesRetry      = TimesRetry;\r
-  Request->OutBuffer       = DataBuffer;\r
-  Request->DataLength      = DataLength;\r
-  Request->StartLba        = StartLba;\r
-  Request->SectorCount     = SectorCount;\r
-  Request->BlkIo2Req       = BlkIo2Req;\r
+  Request->ScsiDiskDevice = ScsiDiskDevice;\r
+  Request->Timeout        = Timeout;\r
+  Request->TimesRetry     = TimesRetry;\r
+  Request->OutBuffer      = DataBuffer;\r
+  Request->DataLength     = DataLength;\r
+  Request->StartLba       = StartLba;\r
+  Request->SectorCount    = SectorCount;\r
+  Request->BlkIo2Req      = BlkIo2Req;\r
 \r
   //\r
   // Create Event\r
@@ -5318,7 +5411,7 @@ ScsiDiskAsyncWrite16 (
                   Request,\r
                   &AsyncIoEvent\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5335,7 +5428,7 @@ ScsiDiskAsyncWrite16 (
              Request->SectorCount,\r
              AsyncIoEvent\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ErrorExit;\r
   }\r
 \r
@@ -5361,7 +5454,6 @@ ErrorExit:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check sense key to find if media presents.\r
 \r
@@ -5373,13 +5465,13 @@ ErrorExit:
 **/\r
 BOOLEAN\r
 ScsiDiskIsNoMedia (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsNoMedia;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsNoMedia;\r
 \r
   IsNoMedia = FALSE;\r
   SensePtr  = SenseData;\r
@@ -5390,16 +5482,17 @@ ScsiDiskIsNoMedia (
     // Additional Sense Code is ASC_NO_MEDIA (0x3A)\r
     //\r
     if ((SensePtr->Sense_Key == EFI_SCSI_SK_NOT_READY) &&\r
-        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_NO_MEDIA)) {\r
+        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_NO_MEDIA))\r
+    {\r
       IsNoMedia = TRUE;\r
     }\r
+\r
     SensePtr++;\r
   }\r
 \r
   return IsNoMedia;\r
 }\r
 \r
-\r
 /**\r
   Parse sense key.\r
 \r
@@ -5412,70 +5505,68 @@ ScsiDiskIsNoMedia (
 **/\r
 BOOLEAN\r
 ScsiDiskIsMediaError (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsError;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsError;\r
 \r
-  IsError   = FALSE;\r
-  SensePtr  = SenseData;\r
+  IsError  = FALSE;\r
+  SensePtr = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
-\r
     switch (SensePtr->Sense_Key) {\r
+      case EFI_SCSI_SK_MEDIUM_ERROR:\r
+        //\r
+        // Sense Key is EFI_SCSI_SK_MEDIUM_ERROR (0x3)\r
+        //\r
+        switch (SensePtr->Addnl_Sense_Code) {\r
+          //\r
+          // fall through\r
+          //\r
+          case EFI_SCSI_ASC_MEDIA_ERR1:\r
 \r
-    case EFI_SCSI_SK_MEDIUM_ERROR:\r
-      //\r
-      // Sense Key is EFI_SCSI_SK_MEDIUM_ERROR (0x3)\r
-      //\r
-      switch (SensePtr->Addnl_Sense_Code) {\r
+          //\r
+          // fall through\r
+          //\r
+          case EFI_SCSI_ASC_MEDIA_ERR2:\r
 \r
-      //\r
-      // fall through\r
-      //\r
-      case EFI_SCSI_ASC_MEDIA_ERR1:\r
+          //\r
+          // fall through\r
+          //\r
+          case EFI_SCSI_ASC_MEDIA_ERR3:\r
+          case EFI_SCSI_ASC_MEDIA_ERR4:\r
+            IsError = TRUE;\r
+            break;\r
 \r
-      //\r
-      // fall through\r
-      //\r
-      case EFI_SCSI_ASC_MEDIA_ERR2:\r
+          default:\r
+            break;\r
+        }\r
 \r
-      //\r
-      // fall through\r
-      //\r
-      case EFI_SCSI_ASC_MEDIA_ERR3:\r
-      case EFI_SCSI_ASC_MEDIA_ERR4:\r
-        IsError = TRUE;\r
         break;\r
 \r
-      default:\r
-        break;\r
-      }\r
+      case EFI_SCSI_SK_NOT_READY:\r
+        //\r
+        // Sense Key is EFI_SCSI_SK_NOT_READY (0x2)\r
+        //\r
+        switch (SensePtr->Addnl_Sense_Code) {\r
+          //\r
+          // Additional Sense Code is ASC_MEDIA_UPSIDE_DOWN (0x6)\r
+          //\r
+          case EFI_SCSI_ASC_MEDIA_UPSIDE_DOWN:\r
+            IsError = TRUE;\r
+            break;\r
 \r
-      break;\r
+          default:\r
+            break;\r
+        }\r
 \r
-    case EFI_SCSI_SK_NOT_READY:\r
-      //\r
-      // Sense Key is EFI_SCSI_SK_NOT_READY (0x2)\r
-      //\r
-      switch (SensePtr->Addnl_Sense_Code) {\r
-      //\r
-      // Additional Sense Code is ASC_MEDIA_UPSIDE_DOWN (0x6)\r
-      //\r
-      case EFI_SCSI_ASC_MEDIA_UPSIDE_DOWN:\r
-        IsError = TRUE;\r
         break;\r
 \r
       default:\r
         break;\r
-      }\r
-      break;\r
-\r
-    default:\r
-      break;\r
     }\r
 \r
     SensePtr++;\r
@@ -5484,7 +5575,6 @@ ScsiDiskIsMediaError (
   return IsError;\r
 }\r
 \r
-\r
 /**\r
   Check sense key to find if hardware error happens.\r
 \r
@@ -5497,19 +5587,18 @@ ScsiDiskIsMediaError (
 **/\r
 BOOLEAN\r
 ScsiDiskIsHardwareError (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsError;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsError;\r
 \r
-  IsError   = FALSE;\r
-  SensePtr  = SenseData;\r
+  IsError  = FALSE;\r
+  SensePtr = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
-\r
     //\r
     // Sense Key is EFI_SCSI_SK_HARDWARE_ERROR (0x4)\r
     //\r
@@ -5523,7 +5612,6 @@ ScsiDiskIsHardwareError (
   return IsError;\r
 }\r
 \r
-\r
 /**\r
   Check sense key to find if media has changed.\r
 \r
@@ -5535,16 +5623,16 @@ ScsiDiskIsHardwareError (
 **/\r
 BOOLEAN\r
 ScsiDiskIsMediaChange (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsMediaChanged;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsMediaChanged;\r
 \r
-  IsMediaChanged  = FALSE;\r
-  SensePtr        = SenseData;\r
+  IsMediaChanged = FALSE;\r
+  SensePtr       = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
     //\r
@@ -5552,7 +5640,8 @@ ScsiDiskIsMediaChange (
     // Additional sense code is EFI_SCSI_ASC_MEDIA_CHANGE (0x28)\r
     //\r
     if ((SensePtr->Sense_Key == EFI_SCSI_SK_UNIT_ATTENTION) &&\r
-        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_MEDIA_CHANGE)) {\r
+        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_MEDIA_CHANGE))\r
+    {\r
       IsMediaChanged = TRUE;\r
     }\r
 \r
@@ -5574,25 +5663,25 @@ ScsiDiskIsMediaChange (
 **/\r
 BOOLEAN\r
 ScsiDiskIsResetBefore (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsResetBefore;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsResetBefore;\r
 \r
   IsResetBefore = FALSE;\r
   SensePtr      = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
-\r
     //\r
     // Sense Key is EFI_SCSI_SK_UNIT_ATTENTION (0x6)\r
     // Additional Sense Code is EFI_SCSI_ASC_RESET (0x29)\r
     //\r
     if ((SensePtr->Sense_Key == EFI_SCSI_SK_UNIT_ATTENTION) &&\r
-        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_RESET)) {\r
+        (SensePtr->Addnl_Sense_Code == EFI_SCSI_ASC_RESET))\r
+    {\r
       IsResetBefore = TRUE;\r
     }\r
 \r
@@ -5615,56 +5704,56 @@ ScsiDiskIsResetBefore (
 **/\r
 BOOLEAN\r
 ScsiDiskIsDriveReady (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts,\r
-  OUT BOOLEAN               *RetryLater\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts,\r
+  OUT BOOLEAN              *RetryLater\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             IsReady;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              IsReady;\r
 \r
   IsReady     = TRUE;\r
   *RetryLater = FALSE;\r
   SensePtr    = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
-\r
     switch (SensePtr->Sense_Key) {\r
-\r
-    case EFI_SCSI_SK_NOT_READY:\r
-      //\r
-      // Sense Key is EFI_SCSI_SK_NOT_READY (0x2)\r
-      //\r
-      switch (SensePtr->Addnl_Sense_Code) {\r
-      case EFI_SCSI_ASC_NOT_READY:\r
+      case EFI_SCSI_SK_NOT_READY:\r
         //\r
-        // Additional Sense Code is EFI_SCSI_ASC_NOT_READY (0x4)\r
+        // Sense Key is EFI_SCSI_SK_NOT_READY (0x2)\r
         //\r
-        switch (SensePtr->Addnl_Sense_Code_Qualifier) {\r
-        case EFI_SCSI_ASCQ_IN_PROGRESS:\r
-          //\r
-          // Additional Sense Code Qualifier is\r
-          // EFI_SCSI_ASCQ_IN_PROGRESS (0x1)\r
-          //\r
-          IsReady     = FALSE;\r
-          *RetryLater = TRUE;\r
-          break;\r
+        switch (SensePtr->Addnl_Sense_Code) {\r
+          case EFI_SCSI_ASC_NOT_READY:\r
+            //\r
+            // Additional Sense Code is EFI_SCSI_ASC_NOT_READY (0x4)\r
+            //\r
+            switch (SensePtr->Addnl_Sense_Code_Qualifier) {\r
+              case EFI_SCSI_ASCQ_IN_PROGRESS:\r
+                //\r
+                // Additional Sense Code Qualifier is\r
+                // EFI_SCSI_ASCQ_IN_PROGRESS (0x1)\r
+                //\r
+                IsReady     = FALSE;\r
+                *RetryLater = TRUE;\r
+                break;\r
+\r
+              default:\r
+                IsReady     = FALSE;\r
+                *RetryLater = FALSE;\r
+                break;\r
+            }\r
 \r
-        default:\r
-          IsReady     = FALSE;\r
-          *RetryLater = FALSE;\r
-          break;\r
+            break;\r
+\r
+          default:\r
+            break;\r
         }\r
+\r
         break;\r
 \r
       default:\r
         break;\r
-      }\r
-      break;\r
-\r
-    default:\r
-      break;\r
     }\r
 \r
     SensePtr++;\r
@@ -5685,13 +5774,13 @@ ScsiDiskIsDriveReady (
 **/\r
 BOOLEAN\r
 ScsiDiskHaveSenseKey (\r
-  IN  EFI_SCSI_SENSE_DATA   *SenseData,\r
-  IN  UINTN                 SenseCounts\r
+  IN  EFI_SCSI_SENSE_DATA  *SenseData,\r
+  IN  UINTN                SenseCounts\r
   )\r
 {\r
-  EFI_SCSI_SENSE_DATA *SensePtr;\r
-  UINTN               Index;\r
-  BOOLEAN             HaveSenseKey;\r
+  EFI_SCSI_SENSE_DATA  *SensePtr;\r
+  UINTN                Index;\r
+  BOOLEAN              HaveSenseKey;\r
 \r
   if (SenseCounts == 0) {\r
     HaveSenseKey = FALSE;\r
@@ -5702,12 +5791,12 @@ ScsiDiskHaveSenseKey (
   SensePtr = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
-\r
     //\r
     // Sense Key is SK_NO_SENSE (0x0)\r
     //\r
     if ((SensePtr->Sense_Key == EFI_SCSI_SK_NO_SENSE) &&\r
-        (Index == 0)) {\r
+        (Index == 0))\r
+    {\r
       HaveSenseKey = FALSE;\r
     }\r
 \r
@@ -5725,11 +5814,11 @@ ScsiDiskHaveSenseKey (
 **/\r
 VOID\r
 ReleaseScsiDiskDeviceResources (\r
-  IN  SCSI_DISK_DEV   *ScsiDiskDevice\r
+  IN  SCSI_DISK_DEV  *ScsiDiskDevice\r
   )\r
 {\r
   if (ScsiDiskDevice == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   if (ScsiDiskDevice->SenseData != NULL) {\r
@@ -5759,11 +5848,11 @@ ReleaseScsiDiskDeviceResources (
 **/\r
 BOOLEAN\r
 DetermineInstallBlockIo (\r
-  IN  EFI_HANDLE      ChildHandle\r
+  IN  EFI_HANDLE  ChildHandle\r
   )\r
 {\r
-  EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiPassThru;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiPassThru;\r
+  EFI_SCSI_PASS_THRU_PROTOCOL      *ScsiPassThru;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *ExtScsiPassThru;\r
 \r
   //\r
   // Firstly, check if ExtScsiPassThru Protocol parent handle exists. If existence,\r
@@ -5805,15 +5894,15 @@ DetermineInstallBlockIo (
 VOID *\r
 EFIAPI\r
 GetParentProtocol (\r
-  IN  EFI_GUID                          *ProtocolGuid,\r
-  IN  EFI_HANDLE                        ChildHandle\r
+  IN  EFI_GUID    *ProtocolGuid,\r
+  IN  EFI_HANDLE  ChildHandle\r
   )\r
 {\r
-  UINTN                                 Index;\r
-  UINTN                                 HandleCount;\r
-  VOID                                  *Interface;\r
-  EFI_STATUS                            Status;\r
-  EFI_HANDLE                            *HandleBuffer;\r
+  UINTN       Index;\r
+  UINTN       HandleCount;\r
+  VOID        *Interface;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  *HandleBuffer;\r
 \r
   //\r
   // Retrieve the list of all handles from the handle database\r
@@ -5860,20 +5949,20 @@ GetParentProtocol (
 **/\r
 BOOLEAN\r
 DetermineInstallEraseBlock (\r
-  IN  SCSI_DISK_DEV          *ScsiDiskDevice,\r
-  IN  EFI_HANDLE             ChildHandle\r
+  IN  SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN  EFI_HANDLE     ChildHandle\r
   )\r
 {\r
-  UINT8                           HostAdapterStatus;\r
-  UINT8                           TargetStatus;\r
-  EFI_STATUS                      CommandStatus;\r
-  EFI_STATUS                      Status;\r
-  BOOLEAN                         UfsDevice;\r
-  BOOLEAN                         RetVal;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePathNode;\r
-  UINT8                           SenseDataLength;\r
-  UINT32                          DataLength16;\r
-  EFI_SCSI_DISK_CAPACITY_DATA16   *CapacityData16;\r
+  UINT8                          HostAdapterStatus;\r
+  UINT8                          TargetStatus;\r
+  EFI_STATUS                     CommandStatus;\r
+  EFI_STATUS                     Status;\r
+  BOOLEAN                        UfsDevice;\r
+  BOOLEAN                        RetVal;\r
+  EFI_DEVICE_PATH_PROTOCOL       *DevicePathNode;\r
+  UINT8                          SenseDataLength;\r
+  UINT32                         DataLength16;\r
+  EFI_SCSI_DISK_CAPACITY_DATA16  *CapacityData16;\r
 \r
   UfsDevice      = FALSE;\r
   RetVal         = TRUE;\r
@@ -5890,7 +5979,7 @@ DetermineInstallEraseBlock (
   Status = gBS->HandleProtocol (\r
                   ChildHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePathNode\r
+                  (VOID **)&DevicePathNode\r
                   );\r
   //\r
   // Device Path protocol must be installed on the device handle.\r
@@ -5902,13 +5991,15 @@ DetermineInstallEraseBlock (
     // For now, only support Erase Block Protocol on UFS devices.\r
     //\r
     if ((DevicePathNode->Type == MESSAGING_DEVICE_PATH) &&\r
-        (DevicePathNode->SubType == MSG_UFS_DP)) {\r
+        (DevicePathNode->SubType == MSG_UFS_DP))\r
+    {\r
       UfsDevice = TRUE;\r
       break;\r
     }\r
 \r
     DevicePathNode = NextDevicePathNode (DevicePathNode);\r
   }\r
+\r
   if (!UfsDevice) {\r
     RetVal = FALSE;\r
     goto Done;\r
@@ -5934,7 +6025,7 @@ DetermineInstallEraseBlock (
                     &SenseDataLength,\r
                     &HostAdapterStatus,\r
                     &TargetStatus,\r
-                    (VOID *) CapacityData16,\r
+                    (VOID *)CapacityData16,\r
                     &DataLength16,\r
                     FALSE\r
                     );\r
@@ -5946,9 +6037,10 @@ DetermineInstallEraseBlock (
     // Bits TPE and TPRZ should both be set to enable the erase feature on UFS.\r
     //\r
     if (((CapacityData16->LowestAlignLogic2 & BIT7) == 0) ||\r
-        ((CapacityData16->LowestAlignLogic2 & BIT6) == 0)) {\r
+        ((CapacityData16->LowestAlignLogic2 & BIT6) == 0))\r
+    {\r
       DEBUG ((\r
-        EFI_D_VERBOSE,\r
+        DEBUG_VERBOSE,\r
         "ScsiDisk EraseBlock: Either TPE or TPRZ is not set: 0x%x.\n",\r
         CapacityData16->LowestAlignLogic2\r
         ));\r
@@ -5958,7 +6050,7 @@ DetermineInstallEraseBlock (
     }\r
   } else {\r
     DEBUG ((\r
-      EFI_D_VERBOSE,\r
+      DEBUG_VERBOSE,\r
       "ScsiDisk EraseBlock: ReadCapacity16 failed with status %r.\n",\r
       CommandStatus\r
       ));\r
@@ -5971,9 +6063,10 @@ DetermineInstallEraseBlock (
   // Check whether the UFS device server implements the UNMAP command.\r
   //\r
   if ((ScsiDiskDevice->UnmapInfo.MaxLbaCnt == 0) ||\r
-      (ScsiDiskDevice->UnmapInfo.MaxBlkDespCnt == 0)) {\r
+      (ScsiDiskDevice->UnmapInfo.MaxBlkDespCnt == 0))\r
+  {\r
     DEBUG ((\r
-      EFI_D_VERBOSE,\r
+      DEBUG_VERBOSE,\r
       "ScsiDisk EraseBlock: The device server does not implement the UNMAP command.\n"\r
       ));\r
 \r
@@ -6001,22 +6094,22 @@ Done:
 **/\r
 BOOLEAN\r
 DetermineInstallStorageSecurity (\r
-  IN  SCSI_DISK_DEV          *ScsiDiskDevice,\r
-  IN  EFI_HANDLE             ChildHandle\r
+  IN  SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN  EFI_HANDLE     ChildHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UFS_DEVICE_PATH                 *UfsDevice;\r
-  BOOLEAN                         RetVal;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePathNode;\r
+  EFI_STATUS                Status;\r
+  UFS_DEVICE_PATH           *UfsDevice;\r
+  BOOLEAN                   RetVal;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode;\r
 \r
-  UfsDevice      = NULL;\r
-  RetVal         = TRUE;\r
+  UfsDevice = NULL;\r
+  RetVal    = TRUE;\r
 \r
   Status = gBS->HandleProtocol (\r
                   ChildHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePathNode\r
+                  (VOID **)&DevicePathNode\r
                   );\r
   //\r
   // Device Path protocol must be installed on the device handle.\r
@@ -6028,13 +6121,15 @@ DetermineInstallStorageSecurity (
     // For now, only support Storage Security Command Protocol on UFS devices.\r
     //\r
     if ((DevicePathNode->Type == MESSAGING_DEVICE_PATH) &&\r
-        (DevicePathNode->SubType == MSG_UFS_DP)) {\r
-      UfsDevice = (UFS_DEVICE_PATH *) DevicePathNode;\r
+        (DevicePathNode->SubType == MSG_UFS_DP))\r
+    {\r
+      UfsDevice = (UFS_DEVICE_PATH *)DevicePathNode;\r
       break;\r
     }\r
 \r
     DevicePathNode = NextDevicePathNode (DevicePathNode);\r
   }\r
+\r
   if (UfsDevice == NULL) {\r
     RetVal = FALSE;\r
     goto Done;\r
@@ -6067,26 +6162,26 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskInfoInquiry (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *InquiryData,\r
-  IN OUT UINT32                   *InquiryDataSize\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *InquiryData,\r
+  IN OUT UINT32                  *InquiryDataSize\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  SCSI_DISK_DEV   *ScsiDiskDevice;\r
+  EFI_STATUS     Status;\r
+  SCSI_DISK_DEV  *ScsiDiskDevice;\r
 \r
-  ScsiDiskDevice  = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
+  ScsiDiskDevice = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
 \r
   Status = EFI_BUFFER_TOO_SMALL;\r
   if (*InquiryDataSize >= sizeof (ScsiDiskDevice->InquiryData)) {\r
     Status = EFI_SUCCESS;\r
     CopyMem (InquiryData, &ScsiDiskDevice->InquiryData, sizeof (ScsiDiskDevice->InquiryData));\r
   }\r
+\r
   *InquiryDataSize = sizeof (ScsiDiskDevice->InquiryData);\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Provides identify information for the controller type.\r
 \r
@@ -6108,13 +6203,13 @@ ScsiDiskInfoInquiry (
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskInfoIdentify (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *IdentifyData,\r
-  IN OUT UINT32                   *IdentifyDataSize\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *IdentifyData,\r
+  IN OUT UINT32                  *IdentifyDataSize\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  SCSI_DISK_DEV   *ScsiDiskDevice;\r
+  EFI_STATUS     Status;\r
+  SCSI_DISK_DEV  *ScsiDiskDevice;\r
 \r
   if (CompareGuid (&This->Interface, &gEfiDiskInfoScsiInterfaceGuid) || CompareGuid (&This->Interface, &gEfiDiskInfoUfsInterfaceGuid)) {\r
     //\r
@@ -6123,13 +6218,14 @@ ScsiDiskInfoIdentify (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  ScsiDiskDevice  = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
+  ScsiDiskDevice = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
 \r
   Status = EFI_BUFFER_TOO_SMALL;\r
   if (*IdentifyDataSize >= sizeof (ScsiDiskDevice->IdentifyData)) {\r
     Status = EFI_SUCCESS;\r
     CopyMem (IdentifyData, &ScsiDiskDevice->IdentifyData, sizeof (ScsiDiskDevice->IdentifyData));\r
   }\r
+\r
   *IdentifyDataSize = sizeof (ScsiDiskDevice->IdentifyData);\r
   return Status;\r
 }\r
@@ -6154,16 +6250,15 @@ ScsiDiskInfoIdentify (
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskInfoSenseData (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *SenseData,\r
-  IN OUT UINT32                   *SenseDataSize,\r
-  OUT    UINT8                    *SenseDataNumber\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *SenseData,\r
+  IN OUT UINT32                  *SenseDataSize,\r
+  OUT    UINT8                   *SenseDataNumber\r
   )\r
 {\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r
@@ -6178,12 +6273,12 @@ ScsiDiskInfoSenseData (
 EFI_STATUS\r
 EFIAPI\r
 ScsiDiskInfoWhichIde (\r
-  IN  EFI_DISK_INFO_PROTOCOL   *This,\r
-  OUT UINT32                   *IdeChannel,\r
-  OUT UINT32                   *IdeDevice\r
+  IN  EFI_DISK_INFO_PROTOCOL  *This,\r
+  OUT UINT32                  *IdeChannel,\r
+  OUT UINT32                  *IdeDevice\r
   )\r
 {\r
-  SCSI_DISK_DEV   *ScsiDiskDevice;\r
+  SCSI_DISK_DEV  *ScsiDiskDevice;\r
 \r
   if (CompareGuid (&This->Interface, &gEfiDiskInfoScsiInterfaceGuid) || CompareGuid (&This->Interface, &gEfiDiskInfoUfsInterfaceGuid)) {\r
     //\r
@@ -6192,14 +6287,13 @@ ScsiDiskInfoWhichIde (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  ScsiDiskDevice  = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
-  *IdeChannel     = ScsiDiskDevice->Channel;\r
-  *IdeDevice      = ScsiDiskDevice->Device;\r
+  ScsiDiskDevice = SCSI_DISK_DEV_FROM_DISKINFO (This);\r
+  *IdeChannel    = ScsiDiskDevice->Channel;\r
+  *IdeDevice     = ScsiDiskDevice->Device;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Issues ATA IDENTIFY DEVICE command to identify ATAPI device.\r
 \r
@@ -6215,11 +6309,11 @@ ScsiDiskInfoWhichIde (
 **/\r
 EFI_STATUS\r
 AtapiIdentifyDevice (\r
-  IN OUT SCSI_DISK_DEV   *ScsiDiskDevice\r
+  IN OUT SCSI_DISK_DEV  *ScsiDiskDevice\r
   )\r
 {\r
-  EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT8                           Cdb[6];\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET  CommandPacket;\r
+  UINT8                            Cdb[6];\r
 \r
   //\r
   // Initialize SCSI REQUEST_PACKET and 6-byte Cdb\r
@@ -6227,17 +6321,16 @@ AtapiIdentifyDevice (
   ZeroMem (&CommandPacket, sizeof (CommandPacket));\r
   ZeroMem (Cdb, sizeof (Cdb));\r
 \r
-  Cdb[0] = ATA_CMD_IDENTIFY_DEVICE;\r
-  CommandPacket.Timeout = SCSI_DISK_TIMEOUT;\r
-  CommandPacket.Cdb = Cdb;\r
-  CommandPacket.CdbLength = (UINT8) sizeof (Cdb);\r
-  CommandPacket.InDataBuffer = &ScsiDiskDevice->IdentifyData;\r
+  Cdb[0]                         = ATA_CMD_IDENTIFY_DEVICE;\r
+  CommandPacket.Timeout          = SCSI_DISK_TIMEOUT;\r
+  CommandPacket.Cdb              = Cdb;\r
+  CommandPacket.CdbLength        = (UINT8)sizeof (Cdb);\r
+  CommandPacket.InDataBuffer     = &ScsiDiskDevice->IdentifyData;\r
   CommandPacket.InTransferLength = sizeof (ScsiDiskDevice->IdentifyData);\r
 \r
   return ScsiDiskDevice->ScsiIo->ExecuteScsiCommand (ScsiDiskDevice->ScsiIo, &CommandPacket, NULL);\r
 }\r
 \r
-\r
 /**\r
   Initialize the installation of DiskInfo protocol.\r
 \r
@@ -6252,8 +6345,8 @@ AtapiIdentifyDevice (
 **/\r
 VOID\r
 InitializeInstallDiskInfo (\r
-  IN  SCSI_DISK_DEV   *ScsiDiskDevice,\r
-  IN  EFI_HANDLE      ChildHandle\r
+  IN  SCSI_DISK_DEV  *ScsiDiskDevice,\r
+  IN  EFI_HANDLE     ChildHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -6263,7 +6356,7 @@ InitializeInstallDiskInfo (
   SATA_DEVICE_PATH          *SataDevicePath;\r
   UINTN                     IdentifyRetry;\r
 \r
-  Status = gBS->HandleProtocol (ChildHandle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePathNode);\r
+  Status = gBS->HandleProtocol (ChildHandle, &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathNode);\r
   //\r
   // Device Path protocol must be installed on the device handle.\r
   //\r
@@ -6278,9 +6371,9 @@ InitializeInstallDiskInfo (
     if ((DevicePathType (DevicePathNode) == HARDWARE_DEVICE_PATH) &&\r
         (DevicePathSubType (DevicePathNode) == HW_PCI_DP) &&\r
         (DevicePathType (ChildDevicePathNode) == MESSAGING_DEVICE_PATH) &&\r
-       ((DevicePathSubType (ChildDevicePathNode) == MSG_ATAPI_DP) ||\r
-        (DevicePathSubType (ChildDevicePathNode) == MSG_SATA_DP))) {\r
-\r
+        ((DevicePathSubType (ChildDevicePathNode) == MSG_ATAPI_DP) ||\r
+         (DevicePathSubType (ChildDevicePathNode) == MSG_SATA_DP)))\r
+    {\r
       IdentifyRetry = 3;\r
       do {\r
         //\r
@@ -6289,13 +6382,13 @@ InitializeInstallDiskInfo (
         //\r
         Status = AtapiIdentifyDevice (ScsiDiskDevice);\r
         if (!EFI_ERROR (Status)) {\r
-          if (DevicePathSubType(ChildDevicePathNode) == MSG_ATAPI_DP) {\r
+          if (DevicePathSubType (ChildDevicePathNode) == MSG_ATAPI_DP) {\r
             //\r
             // We find the valid ATAPI device path\r
             //\r
-            AtapiDevicePath = (ATAPI_DEVICE_PATH *) ChildDevicePathNode;\r
+            AtapiDevicePath         = (ATAPI_DEVICE_PATH *)ChildDevicePathNode;\r
             ScsiDiskDevice->Channel = AtapiDevicePath->PrimarySecondary;\r
-            ScsiDiskDevice->Device = AtapiDevicePath->SlaveMaster;\r
+            ScsiDiskDevice->Device  = AtapiDevicePath->SlaveMaster;\r
             //\r
             // Update the DiskInfo.Interface to IDE interface GUID for the physical ATAPI device.\r
             //\r
@@ -6304,22 +6397,25 @@ InitializeInstallDiskInfo (
             //\r
             // We find the valid SATA device path\r
             //\r
-            SataDevicePath = (SATA_DEVICE_PATH *) ChildDevicePathNode;\r
+            SataDevicePath          = (SATA_DEVICE_PATH *)ChildDevicePathNode;\r
             ScsiDiskDevice->Channel = SataDevicePath->HBAPortNumber;\r
-            ScsiDiskDevice->Device = SataDevicePath->PortMultiplierPortNumber;\r
+            ScsiDiskDevice->Device  = SataDevicePath->PortMultiplierPortNumber;\r
             //\r
             // Update the DiskInfo.Interface to AHCI interface GUID for the physical AHCI device.\r
             //\r
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoAhciInterfaceGuid);\r
           }\r
+\r
           return;\r
         }\r
       } while (--IdentifyRetry > 0);\r
     } else if ((DevicePathType (ChildDevicePathNode) == MESSAGING_DEVICE_PATH) &&\r
-       (DevicePathSubType (ChildDevicePathNode) == MSG_UFS_DP)) {\r
+               (DevicePathSubType (ChildDevicePathNode) == MSG_UFS_DP))\r
+    {\r
       CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoUfsInterfaceGuid);\r
       break;\r
     }\r
+\r
     DevicePathNode = ChildDevicePathNode;\r
   }\r
 \r