OvmfPkg: Apply uncrustify changes

[mirror_edk2.git] / OvmfPkg / XenPvBlkDxe / BlockIo.c

diff --git a/OvmfPkg/XenPvBlkDxe/BlockIo.c b/OvmfPkg/XenPvBlkDxe/BlockIo.c
index c013fc80f0126660d31dd49a94e0d6e54b456233..63914751cfd9c909ed52fc37fb448d959f4a08af 100644 (file)
--- a/OvmfPkg/XenPvBlkDxe/BlockIo.c
+++ b/OvmfPkg/XenPvBlkDxe/BlockIo.c
@@ -46,9 +46,6 @@ EFI_BLOCK_IO_PROTOCOL  gXenPvBlkDxeBlockIo = {
   XenPvBlkDxeBlockIoFlushBlocks             // FlushBlocks\r
 };\r
 \r
-\r
-\r
-\r
 /**\r
   Read/Write BufferSize bytes from Lba into Buffer.\r
 \r
@@ -76,29 +73,38 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
   IN     BOOLEAN                IsWrite\r
   )\r
 {\r
-  XEN_BLOCK_FRONT_IO IoData;\r
-  EFI_BLOCK_IO_MEDIA *Media = This->Media;\r
-  UINTN Sector;\r
-  EFI_STATUS Status;\r
+  XEN_BLOCK_FRONT_IO  IoData;\r
+  EFI_BLOCK_IO_MEDIA  *Media = This->Media;\r
+  UINTN               Sector;\r
+  EFI_STATUS          Status;\r
 \r
   if (Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (BufferSize == 0) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (BufferSize % Media->BlockSize != 0) {\r
-    DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",\r
-      (UINT64)BufferSize));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",\r
+      (UINT64)BufferSize\r
+      ));\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  if (Lba > Media->LastBlock ||\r
-      (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {\r
-    DEBUG ((DEBUG_ERROR,\r
+  if ((Lba > Media->LastBlock) ||\r
+      ((BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",\r
-      IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));\r
+      IsWrite ? "Write" : "Read",\r
+      Lba,\r
+      (UINT64)BufferSize\r
+      ));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -111,54 +117,74 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
     // Grub2 does not appear to respect IoAlign of 512, so reallocate the\r
     // buffer here.\r
     //\r
-    VOID *NewBuffer;\r
+    VOID  *NewBuffer;\r
 \r
     //\r
     // Try again with a properly aligned buffer.\r
     //\r
-    NewBuffer = AllocateAlignedPages((BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,\r
-                                     Media->IoAlign);\r
+    NewBuffer = AllocateAlignedPages (\r
+                  (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,\r
+                  Media->IoAlign\r
+                  );\r
     if (!IsWrite) {\r
-      Status = XenPvBlkDxeBlockIoReadBlocks (This, MediaId,\r
-                                             Lba, BufferSize, NewBuffer);\r
+      Status = XenPvBlkDxeBlockIoReadBlocks (\r
+                 This,\r
+                 MediaId,\r
+                 Lba,\r
+                 BufferSize,\r
+                 NewBuffer\r
+                 );\r
       CopyMem (Buffer, NewBuffer, BufferSize);\r
     } else {\r
       CopyMem (NewBuffer, Buffer, BufferSize);\r
-      Status = XenPvBlkDxeBlockIoWriteBlocks (This, MediaId,\r
-                                              Lba, BufferSize, NewBuffer);\r
+      Status = XenPvBlkDxeBlockIoWriteBlocks (\r
+                 This,\r
+                 MediaId,\r
+                 Lba,\r
+                 BufferSize,\r
+                 NewBuffer\r
+                 );\r
     }\r
+\r
     FreeAlignedPages (NewBuffer, (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE);\r
     return Status;\r
   }\r
 \r
   IoData.Dev = XEN_BLOCK_FRONT_FROM_BLOCK_IO (This);\r
-  Sector = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);\r
+  Sector     = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);\r
 \r
   while (BufferSize > 0) {\r
     if (((UINTN)Buffer & EFI_PAGE_MASK) == 0) {\r
-      IoData.Size = MIN (BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,\r
-                         BufferSize);\r
+      IoData.Size = MIN (\r
+                      BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,\r
+                      BufferSize\r
+                      );\r
     } else {\r
-      IoData.Size = MIN ((BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,\r
-                         BufferSize);\r
+      IoData.Size = MIN (\r
+                      (BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,\r
+                      BufferSize\r
+                      );\r
     }\r
 \r
     IoData.Buffer = Buffer;\r
     IoData.Sector = Sector;\r
-    BufferSize -= IoData.Size;\r
-    Buffer = (VOID*) ((UINTN) Buffer + IoData.Size);\r
-    Sector += IoData.Size / 512;\r
-    Status = XenPvBlockIo (&IoData, IsWrite);\r
+    BufferSize   -= IoData.Size;\r
+    Buffer        = (VOID *)((UINTN)Buffer + IoData.Size);\r
+    Sector       += IoData.Size / 512;\r
+    Status        = XenPvBlockIo (&IoData, IsWrite);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Error during %a operation.\n",\r
-              IsWrite ? "write" : "read"));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenPvBlkDxe: Error during %a operation.\n",\r
+        IsWrite ? "write" : "read"\r
+        ));\r
       return Status;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r
 \r
@@ -181,15 +207,21 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReadBlocks (\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
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,\r
-      MediaId, Lba, BufferSize, Buffer, FALSE);\r
+  return XenPvBlkDxeBlockIoReadWriteBlocks (\r
+           This,\r
+           MediaId,\r
+           Lba,\r
+           BufferSize,\r
+           Buffer,\r
+           FALSE\r
+           );\r
 }\r
 \r
 /**\r
@@ -215,15 +247,21 @@ XenPvBlkDxeBlockIoReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoWriteBlocks (\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
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,\r
-      MediaId, Lba, BufferSize, Buffer, TRUE);\r
+  return XenPvBlkDxeBlockIoReadWriteBlocks (\r
+           This,\r
+           MediaId,\r
+           Lba,\r
+           BufferSize,\r
+           Buffer,\r
+           TRUE\r
+           );\r
 }\r
 \r
 /**\r
@@ -258,8 +296,8 @@ XenPvBlkDxeBlockIoFlushBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReset (\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
   //\r