FatPkg: Apply uncrustify changes

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

diff --git a/FatPkg/FatPei/FatLiteLib.c b/FatPkg/FatPei/FatLiteLib.c
index 3d43e0b877edc6b71d3c38c324bb0106b0a4c466..ef71fe907e557ed0c0d5877b7a944a78d1e70649 100644 (file)
--- a/FatPkg/FatPei/FatLiteLib.c
+++ b/FatPkg/FatPei/FatLiteLib.c
@@ -9,10 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "FatLitePeim.h"\r
 \r
-\r
 #define CHAR_FAT_VALID  0x01\r
 \r
-\r
 /**\r
   Converts a union code character to upper case.\r
   This functions converts a unicode character to upper case.\r
@@ -26,17 +24,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 CHAR16\r
 ToUpper (\r
-  IN CHAR16                    Letter\r
+  IN CHAR16  Letter\r
   )\r
 {\r
-  if ('a' <= Letter && Letter <= 'z') {\r
-    Letter = (CHAR16) (Letter - 0x20);\r
+  if (('a' <= Letter) && (Letter <= 'z')) {\r
+    Letter = (CHAR16)(Letter - 0x20);\r
   }\r
 \r
   return Letter;\r
 }\r
 \r
-\r
 /**\r
   Reads a block of data from the block device by calling\r
   underlying Block I/O service.\r
@@ -55,11 +52,11 @@ ToUpper (
 **/\r
 EFI_STATUS\r
 FatReadBlock (\r
-  IN  PEI_FAT_PRIVATE_DATA   *PrivateData,\r
-  IN  UINTN                  BlockDeviceNo,\r
-  IN  EFI_PEI_LBA            Lba,\r
-  IN  UINTN                  BufferSize,\r
-  OUT VOID                   *Buffer\r
+  IN  PEI_FAT_PRIVATE_DATA  *PrivateData,\r
+  IN  UINTN                 BlockDeviceNo,\r
+  IN  EFI_PEI_LBA           Lba,\r
+  IN  UINTN                 BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -69,8 +66,8 @@ FatReadBlock (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  Status    = EFI_SUCCESS;\r
-  BlockDev  = &(PrivateData->BlockDevice[BlockDeviceNo]);\r
+  Status   = EFI_SUCCESS;\r
+  BlockDev = &(PrivateData->BlockDevice[BlockDeviceNo]);\r
 \r
   if (BufferSize > MultU64x32 (BlockDev->LastBlock - Lba + 1, BlockDev->BlockSize)) {\r
     return EFI_DEVICE_ERROR;\r
@@ -83,38 +80,36 @@ FatReadBlock (
     //\r
     if (BlockDev->BlockIo2 != NULL) {\r
       Status = BlockDev->BlockIo2->ReadBlocks (\r
-                                    (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                                    BlockDev->BlockIo2,\r
+                                     (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                                     BlockDev->BlockIo2,\r
+                                     BlockDev->PhysicalDevNo,\r
+                                     Lba,\r
+                                     BufferSize,\r
+                                     Buffer\r
+                                     );\r
+    } else {\r
+      Status = BlockDev->BlockIo->ReadBlocks (\r
+                                    (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),\r
+                                    BlockDev->BlockIo,\r
                                     BlockDev->PhysicalDevNo,\r
                                     Lba,\r
                                     BufferSize,\r
                                     Buffer\r
                                     );\r
-    } else {\r
-      Status = BlockDev->BlockIo->ReadBlocks (\r
-                                  (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
-                                  BlockDev->BlockIo,\r
-                                  BlockDev->PhysicalDevNo,\r
-                                  Lba,\r
-                                  BufferSize,\r
-                                  Buffer\r
-                                  );\r
     }\r
-\r
   } else {\r
     Status = FatReadDisk (\r
-              PrivateData,\r
-              BlockDev->ParentDevNo,\r
-              BlockDev->StartingPos + MultU64x32 (Lba, BlockDev->BlockSize),\r
-              BufferSize,\r
-              Buffer\r
-              );\r
+               PrivateData,\r
+               BlockDev->ParentDevNo,\r
+               BlockDev->StartingPos + MultU64x32 (Lba, BlockDev->BlockSize),\r
+               BufferSize,\r
+               Buffer\r
+               );\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Find a cache block designated to specific Block device and Lba.\r
   If not found, invalidate an oldest one and use it. (LRU cache)\r
@@ -150,15 +145,16 @@ FatGetCacheBlock (
   //\r
   for (Index = 0; Index < PEI_FAT_CACHE_SIZE; Index++) {\r
     CacheBuffer = &(PrivateData->CacheBuffer[Index]);\r
-    if (CacheBuffer->Valid && CacheBuffer->BlockDeviceNo == BlockDeviceNo && CacheBuffer->Lba == Lba) {\r
+    if (CacheBuffer->Valid && (CacheBuffer->BlockDeviceNo == BlockDeviceNo) && (CacheBuffer->Lba == Lba)) {\r
       break;\r
     }\r
   }\r
 \r
   if (Index < PEI_FAT_CACHE_SIZE) {\r
-    *CachePtr = (CHAR8 *) CacheBuffer->Buffer;\r
+    *CachePtr = (CHAR8 *)CacheBuffer->Buffer;\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // We have to find an invalid cache buffer\r
   //\r
@@ -167,6 +163,7 @@ FatGetCacheBlock (
       break;\r
     }\r
   }\r
+\r
   //\r
   // Use the cache buffer\r
   //\r
@@ -181,33 +178,32 @@ FatGetCacheBlock (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  CacheBuffer                 = &(PrivateData->CacheBuffer[Index]);\r
+  CacheBuffer = &(PrivateData->CacheBuffer[Index]);\r
 \r
-  CacheBuffer->BlockDeviceNo  = BlockDeviceNo;\r
-  CacheBuffer->Lba            = Lba;\r
-  CacheBuffer->Size           = PrivateData->BlockDevice[BlockDeviceNo].BlockSize;\r
+  CacheBuffer->BlockDeviceNo = BlockDeviceNo;\r
+  CacheBuffer->Lba           = Lba;\r
+  CacheBuffer->Size          = PrivateData->BlockDevice[BlockDeviceNo].BlockSize;\r
 \r
   //\r
   // Read in the data\r
   //\r
   Status = FatReadBlock (\r
-            PrivateData,\r
-            BlockDeviceNo,\r
-            Lba,\r
-            CacheBuffer->Size,\r
-            CacheBuffer->Buffer\r
-            );\r
+             PrivateData,\r
+             BlockDeviceNo,\r
+             Lba,\r
+             CacheBuffer->Size,\r
+             CacheBuffer->Buffer\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  CacheBuffer->Valid  = TRUE;\r
-  *CachePtr           = (CHAR8 *) CacheBuffer->Buffer;\r
+  CacheBuffer->Valid = TRUE;\r
+  *CachePtr          = (CHAR8 *)CacheBuffer->Buffer;\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Disk reading.\r
 \r
@@ -246,8 +242,8 @@ FatReadDisk (
   //\r
   // Read underrun\r
   //\r
-  Lba     = DivU64x32Remainder (StartingAddress, BlockSize, &Offset);\r
-  Status  = FatGetCacheBlock (PrivateData, BlockDeviceNo, Lba, &CachePtr);\r
+  Lba    = DivU64x32Remainder (StartingAddress, BlockSize, &Offset);\r
+  Status = FatGetCacheBlock (PrivateData, BlockDeviceNo, Lba, &CachePtr);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -259,17 +255,17 @@ FatReadDisk (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Size -= Amount;\r
-  BufferPtr += Amount;\r
+  Size            -= Amount;\r
+  BufferPtr       += Amount;\r
   StartingAddress += Amount;\r
-  Lba += 1;\r
+  Lba             += 1;\r
 \r
   //\r
   // Read aligned parts\r
   //\r
   OverRunLba = Lba + DivU64x32Remainder (Size, BlockSize, &Offset);\r
 \r
-  Size -= Offset;\r
+  Size  -= Offset;\r
   Status = FatReadBlock (PrivateData, BlockDeviceNo, Lba, Size, BufferPtr);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
@@ -292,7 +288,6 @@ FatReadDisk (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This version is different from the version in Unicode collation\r
   protocol in that this version strips off trailing blanks.\r
@@ -310,9 +305,9 @@ FatReadDisk (
 **/\r
 VOID\r
 EngFatToStr (\r
-  IN UINTN                            FatSize,\r
-  IN CHAR8                            *Fat,\r
-  OUT CHAR16                          *Str\r
+  IN UINTN    FatSize,\r
+  IN CHAR8    *Fat,\r
+  OUT CHAR16  *Str\r
   )\r
 {\r
   CHAR16  *String;\r
@@ -325,16 +320,16 @@ EngFatToStr (
     if (*Fat == ' ') {\r
       break;\r
     }\r
-    *String = *Fat;\r
-    String += 1;\r
-    Fat += 1;\r
+\r
+    *String  = *Fat;\r
+    String  += 1;\r
+    Fat     += 1;\r
     FatSize -= 1;\r
   }\r
 \r
   *String = 0;\r
 }\r
 \r
-\r
 /**\r
   Performs a case-insensitive comparison of two Null-terminated Unicode strings.\r
 \r
@@ -366,5 +361,5 @@ EngStriColl (
     UpperS2 = ToUpper (*Str2);\r
   }\r
 \r
-  return (BOOLEAN) ((*Str2 != 0) ? FALSE : TRUE);\r
+  return (BOOLEAN)((*Str2 != 0) ? FALSE : TRUE);\r
 }\r