MdeModulePkg: Apply uncrustify changes

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressPei / NvmExpressPeiBlockIo.c

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
index a9bf4f8190bc0e047ab06b38dada27c13b75d415..576481dcee2aa0c4d815648f14b56be257539fc5 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPeiBlockIo.c
@@ -24,29 +24,29 @@
 **/\r
 EFI_STATUS\r
 ReadSectors (\r
-  IN  PEI_NVME_NAMESPACE_INFO    *NamespaceInfo,\r
-  OUT UINTN                      Buffer,\r
-  IN  UINT64                     Lba,\r
-  IN  UINT32                     Blocks\r
+  IN  PEI_NVME_NAMESPACE_INFO  *NamespaceInfo,\r
+  OUT UINTN                    Buffer,\r
+  IN  UINT64                   Lba,\r
+  IN  UINT32                   Blocks\r
   )\r
 {\r
-  EFI_STATUS                                        Status;\r
-  UINT32                                            BlockSize;\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA                  *Private;\r
-  UINT32                                            Bytes;\r
-  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET          CommandPacket;\r
-  EFI_NVM_EXPRESS_COMMAND                           Command;\r
-  EFI_NVM_EXPRESS_COMPLETION                        Completion;\r
-  EDKII_PEI_NVM_EXPRESS_PASS_THRU_PPI               *NvmePassThru;\r
-\r
-  Private   = NamespaceInfo->Controller;\r
+  EFI_STATUS                                Status;\r
+  UINT32                                    BlockSize;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA          *Private;\r
+  UINT32                                    Bytes;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET  CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                   Command;\r
+  EFI_NVM_EXPRESS_COMPLETION                Completion;\r
+  EDKII_PEI_NVM_EXPRESS_PASS_THRU_PPI       *NvmePassThru;\r
+\r
+  Private      = NamespaceInfo->Controller;\r
   NvmePassThru = &Private->NvmePassThruPpi;\r
-  BlockSize = NamespaceInfo->Media.BlockSize;\r
-  Bytes     = Blocks * BlockSize;\r
+  BlockSize    = NamespaceInfo->Media.BlockSize;\r
+  Bytes        = Blocks * BlockSize;\r
 \r
-  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+  ZeroMem (&CommandPacket, sizeof (EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof (EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof (EFI_NVM_EXPRESS_COMPLETION));\r
 \r
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
@@ -60,7 +60,7 @@ ReadSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64 (Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
@@ -88,18 +88,18 @@ ReadSectors (
 **/\r
 EFI_STATUS\r
 NvmeRead (\r
-  IN  PEI_NVME_NAMESPACE_INFO    *NamespaceInfo,\r
-  OUT UINTN                      Buffer,\r
-  IN  UINT64                     Lba,\r
-  IN  UINTN                      Blocks\r
+  IN  PEI_NVME_NAMESPACE_INFO  *NamespaceInfo,\r
+  OUT UINTN                    Buffer,\r
+  IN  UINT64                   Lba,\r
+  IN  UINTN                    Blocks\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  UINT32                              Retries;\r
-  UINT32                              BlockSize;\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
-  UINT32                              MaxTransferBlocks;\r
-  UINTN                               OrginalBlocks;\r
+  EFI_STATUS                        Status;\r
+  UINT32                            Retries;\r
+  UINT32                            BlockSize;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  UINT32                            MaxTransferBlocks;\r
+  UINTN                             OrginalBlocks;\r
 \r
   Status        = EFI_SUCCESS;\r
   Retries       = 0;\r
@@ -120,14 +120,15 @@ NvmeRead (
                Lba,\r
                Blocks > MaxTransferBlocks ? MaxTransferBlocks : (UINT32)Blocks\r
                );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       Retries++;\r
       MaxTransferBlocks = MaxTransferBlocks >> 1;\r
 \r
-      if (Retries > NVME_READ_MAX_RETRY || MaxTransferBlocks < 1) {\r
+      if ((Retries > NVME_READ_MAX_RETRY) || (MaxTransferBlocks < 1)) {\r
         DEBUG ((DEBUG_ERROR, "%a: ReadSectors fail, Status - %r\n", __FUNCTION__, Status));\r
         break;\r
       }\r
+\r
       DEBUG ((\r
         DEBUG_BLKIO,\r
         "%a: ReadSectors fail, retry with smaller transfer block number - 0x%x\n",\r
@@ -142,13 +143,21 @@ NvmeRead (
       Buffer += (MaxTransferBlocks * BlockSize);\r
       Lba    += MaxTransferBlocks;\r
     } else {\r
-      Blocks  = 0;\r
+      Blocks = 0;\r
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_BLKIO, "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
-    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n", __FUNCTION__, Lba,\r
-    (UINT64)OrginalBlocks, (UINT64)Blocks, BlockSize, Status));\r
+  DEBUG ((\r
+    DEBUG_BLKIO,\r
+    "%a: Lba = 0x%08Lx, Original = 0x%08Lx, "\r
+    "Remaining = 0x%08Lx, BlockSize = 0x%x, Status = %r\n",\r
+    __FUNCTION__,\r
+    Lba,\r
+    (UINT64)OrginalBlocks,\r
+    (UINT64)Blocks,\r
+    BlockSize,\r
+    Status\r
+    ));\r
   return Status;\r
 }\r
 \r
@@ -176,13 +185,13 @@ NvmeBlockIoPeimGetDeviceNo (
   OUT UINTN                          *NumberBlockDevices\r
   )\r
 {\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
 \r
-  if (This == NULL || NumberBlockDevices == NULL) {\r
+  if ((This == NULL) || (NumberBlockDevices == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Private = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO (This);\r
+  Private             = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO (This);\r
   *NumberBlockDevices = Private->ActiveNamespaceNum;\r
 \r
   return EFI_SUCCESS;\r
@@ -238,9 +247,9 @@ NvmeBlockIoPeimGetMediaInfo (
   OUT EFI_PEI_BLOCK_IO_MEDIA         *MediaInfo\r
   )\r
 {\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
 \r
-  if (This == NULL || MediaInfo == NULL) {\r
+  if ((This == NULL) || (MediaInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -250,7 +259,7 @@ NvmeBlockIoPeimGetMediaInfo (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  MediaInfo->DeviceType   = (EFI_PEI_BLOCK_DEVICE_TYPE) EDKII_PEI_BLOCK_DEVICE_TYPE_NVME;\r
+  MediaInfo->DeviceType   = (EFI_PEI_BLOCK_DEVICE_TYPE)EDKII_PEI_BLOCK_DEVICE_TYPE_NVME;\r
   MediaInfo->MediaPresent = TRUE;\r
   MediaInfo->LastBlock    = (UINTN)Private->NamespaceInfo[DeviceIndex-1].Media.LastBlock;\r
   MediaInfo->BlockSize    = Private->NamespaceInfo[DeviceIndex-1].Media.BlockSize;\r
@@ -303,17 +312,17 @@ NvmeBlockIoPeimReadBlocks (
   OUT VOID                           *Buffer\r
   )\r
 {\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
-  PEI_NVME_NAMESPACE_INFO             *NamespaceInfo;\r
-  UINT32                              BlockSize;\r
-  UINTN                               NumberOfBlocks;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  PEI_NVME_NAMESPACE_INFO           *NamespaceInfo;\r
+  UINT32                            BlockSize;\r
+  UINTN                             NumberOfBlocks;\r
 \r
   Private = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO (This);\r
 \r
   //\r
   // Check parameters\r
   //\r
-  if (This == NULL || Buffer == NULL) {\r
+  if ((This == NULL) || (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -329,7 +338,7 @@ NvmeBlockIoPeimReadBlocks (
   // Check BufferSize and StartLBA\r
   //\r
   NamespaceInfo = &(Private->NamespaceInfo[DeviceIndex - 1]);\r
-  BlockSize = NamespaceInfo->Media.BlockSize;\r
+  BlockSize     = NamespaceInfo->Media.BlockSize;\r
   if (BufferSize % BlockSize != 0) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
@@ -337,6 +346,7 @@ NvmeBlockIoPeimReadBlocks (
   if (StartLBA > NamespaceInfo->Media.LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   NumberOfBlocks = BufferSize / BlockSize;\r
   if (NumberOfBlocks - 1 > NamespaceInfo->Media.LastBlock - StartLBA) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -369,13 +379,13 @@ NvmeBlockIoPeimGetDeviceNo2 (
   OUT UINTN                           *NumberBlockDevices\r
   )\r
 {\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
 \r
-  if (This == NULL || NumberBlockDevices == NULL) {\r
+  if ((This == NULL) || (NumberBlockDevices == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Private = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO2 (This);\r
+  Private             = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO2 (This);\r
   *NumberBlockDevices = Private->ActiveNamespaceNum;\r
 \r
   return EFI_SUCCESS;\r
@@ -431,22 +441,22 @@ NvmeBlockIoPeimGetMediaInfo2 (
   OUT EFI_PEI_BLOCK_IO2_MEDIA         *MediaInfo\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
-  EFI_PEI_BLOCK_IO_MEDIA              Media;\r
+  EFI_STATUS                        Status;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
+  EFI_PEI_BLOCK_IO_MEDIA            Media;\r
 \r
-  if (This == NULL || MediaInfo == NULL) {\r
+  if ((This == NULL) || (MediaInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Private = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_BLKIO2 (This);\r
 \r
-  Status  = NvmeBlockIoPeimGetMediaInfo (\r
-              PeiServices,\r
-              &Private->BlkIoPpi,\r
-              DeviceIndex,\r
-              &Media\r
-              );\r
+  Status = NvmeBlockIoPeimGetMediaInfo (\r
+             PeiServices,\r
+             &Private->BlkIoPpi,\r
+             DeviceIndex,\r
+             &Media\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -505,7 +515,7 @@ NvmeBlockIoPeimReadBlocks2 (
   OUT VOID                            *Buffer\r
   )\r
 {\r
-  PEI_NVME_CONTROLLER_PRIVATE_DATA    *Private;\r
+  PEI_NVME_CONTROLLER_PRIVATE_DATA  *Private;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r