FatPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the FatPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

1 files changed, 85 insertions, 108 deletions

diff --git a/FatPkg/FatPei/FatLitePeim.h b/FatPkg/FatPei/FatLitePeim.h
index 0c3c69853c..1f90ef885d 100644
--- a/FatPkg/FatPei/FatLitePeim.h
+++ b/FatPkg/FatPei/FatLitePeim.h
@@ -33,14 +33,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Definitions

 //

 

-#define PEI_FAT_CACHE_SIZE                            4

-#define PEI_FAT_MAX_BLOCK_SIZE                        8192

-#define FAT_MAX_FILE_NAME_LENGTH                      128

-#define PEI_FAT_MAX_BLOCK_DEVICE                      64

-#define PEI_FAT_MAX_BLOCK_IO_PPI                      32

-#define PEI_FAT_MAX_VOLUME                            64

+#define PEI_FAT_CACHE_SIZE        4

+#define PEI_FAT_MAX_BLOCK_SIZE    8192

+#define FAT_MAX_FILE_NAME_LENGTH  128

+#define PEI_FAT_MAX_BLOCK_DEVICE  64

+#define PEI_FAT_MAX_BLOCK_IO_PPI  32

+#define PEI_FAT_MAX_VOLUME        64

 

-#define PEI_FAT_MEMORY_PAGE_SIZE                      0x1000

+#define PEI_FAT_MEMORY_PAGE_SIZE  0x1000

 

 //

 // Data Structures

@@ -49,86 +49,79 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // The block device

 //

 typedef struct {

-

-  UINT32                        BlockSize;

-  UINT64                        LastBlock;

-  UINT32                        IoAlign;

-  BOOLEAN                       Logical;

-  BOOLEAN                       PartitionChecked;

+  UINT32                            BlockSize;

+  UINT64                            LastBlock;

+  UINT32                            IoAlign;

+  BOOLEAN                           Logical;

+  BOOLEAN                           PartitionChecked;

 

   //

   // Following fields only valid for logical device

   //

-  CHAR8                         PartitionFlag[8];

-  UINT64                        StartingPos;

-  UINTN                         ParentDevNo;

+  CHAR8                             PartitionFlag[8];

+  UINT64                            StartingPos;

+  UINTN                             ParentDevNo;

 

   //

   // Following fields only valid for physical device

   //

-  EFI_PEI_BLOCK_DEVICE_TYPE     DevType;

-  UINT8                         InterfaceType;

+  EFI_PEI_BLOCK_DEVICE_TYPE         DevType;

+  UINT8                             InterfaceType;

   //

   // EFI_PEI_READ_BLOCKS         ReadFunc;

   //

-  EFI_PEI_RECOVERY_BLOCK_IO_PPI  *BlockIo;

-  EFI_PEI_RECOVERY_BLOCK_IO2_PPI *BlockIo2;

-  UINT8                          PhysicalDevNo;

+  EFI_PEI_RECOVERY_BLOCK_IO_PPI     *BlockIo;

+  EFI_PEI_RECOVERY_BLOCK_IO2_PPI    *BlockIo2;

+  UINT8                             PhysicalDevNo;

 } PEI_FAT_BLOCK_DEVICE;

 

 //

 // the Volume structure

 //

 typedef struct {

-

-  UINTN         BlockDeviceNo;

-  UINTN         VolumeNo;

-  UINT64        VolumeSize;

-  UINTN         MaxCluster;

-  CHAR16        VolumeLabel[FAT_MAX_FILE_NAME_LENGTH];

-  PEI_FAT_TYPE  FatType;

-  UINT64        FatPos;

-  UINT32        SectorSize;

-  UINT32        ClusterSize;

-  UINT64        FirstClusterPos;

-  UINT64        RootDirPos;

-  UINT32        RootEntries;

-  UINT32        RootDirCluster;

-

+  UINTN           BlockDeviceNo;

+  UINTN           VolumeNo;

+  UINT64          VolumeSize;

+  UINTN           MaxCluster;

+  CHAR16          VolumeLabel[FAT_MAX_FILE_NAME_LENGTH];

+  PEI_FAT_TYPE    FatType;

+  UINT64          FatPos;

+  UINT32          SectorSize;

+  UINT32          ClusterSize;

+  UINT64          FirstClusterPos;

+  UINT64          RootDirPos;

+  UINT32          RootEntries;

+  UINT32          RootDirCluster;

 } PEI_FAT_VOLUME;

 

 //

 // File instance

 //

 typedef struct {

+  PEI_FAT_VOLUME    *Volume;

+  CHAR16            FileName[FAT_MAX_FILE_NAME_LENGTH];

 

-  PEI_FAT_VOLUME  *Volume;

-  CHAR16          FileName[FAT_MAX_FILE_NAME_LENGTH];

-

-  BOOLEAN         IsFixedRootDir;

+  BOOLEAN           IsFixedRootDir;

 

-  UINT32          StartingCluster;

-  UINT32          CurrentPos;

-  UINT32          StraightReadAmount;

-  UINT32          CurrentCluster;

-

-  UINT8           Attributes;

-  UINT32          FileSize;

+  UINT32            StartingCluster;

+  UINT32            CurrentPos;

+  UINT32            StraightReadAmount;

+  UINT32            CurrentCluster;

 

+  UINT8             Attributes;

+  UINT32            FileSize;

 } PEI_FAT_FILE;

 

 //

 // Cache Buffer

 //

 typedef struct {

-

-  BOOLEAN Valid;

-  UINTN   BlockDeviceNo;

-  UINT64  Lba;

-  UINT32  Lru;

-  UINT64  Buffer[PEI_FAT_MAX_BLOCK_SIZE / 8];

-  UINTN   Size;

-

+  BOOLEAN    Valid;

+  UINTN      BlockDeviceNo;

+  UINT64     Lba;

+  UINT32     Lru;

+  UINT64     Buffer[PEI_FAT_MAX_BLOCK_SIZE / 8];

+  UINTN      Size;

 } PEI_FAT_CACHE_BUFFER;

 

 //

@@ -142,25 +135,23 @@ typedef struct {
 #define PEI_FAT_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('p', 'f', 'a', 't')

 

 typedef struct {

-

-  UINTN                               Signature;

-  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  DeviceRecoveryPpi;

-  EFI_PEI_PPI_DESCRIPTOR              PpiDescriptor;

-  EFI_PEI_NOTIFY_DESCRIPTOR           NotifyDescriptor[2];

-

-  UINT8                               UnicodeCaseMap[0x300];

-  CHAR8                               *EngUpperMap;

-  CHAR8                               *EngLowerMap;

-  CHAR8                               *EngInfoMap;

-

-  UINT64                              BlockData[PEI_FAT_MAX_BLOCK_SIZE / 8];

-  UINTN                               BlockDeviceCount;

-  PEI_FAT_BLOCK_DEVICE                BlockDevice[PEI_FAT_MAX_BLOCK_DEVICE];

-  UINTN                               VolumeCount;

-  PEI_FAT_VOLUME                      Volume[PEI_FAT_MAX_VOLUME];

-  PEI_FAT_FILE                        File;

-  PEI_FAT_CACHE_BUFFER                CacheBuffer[PEI_FAT_CACHE_SIZE];

-

+  UINTN                                 Signature;

+  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI    DeviceRecoveryPpi;

+  EFI_PEI_PPI_DESCRIPTOR                PpiDescriptor;

+  EFI_PEI_NOTIFY_DESCRIPTOR             NotifyDescriptor[2];

+

+  UINT8                                 UnicodeCaseMap[0x300];

+  CHAR8                                 *EngUpperMap;

+  CHAR8                                 *EngLowerMap;

+  CHAR8                                 *EngInfoMap;

+

+  UINT64                                BlockData[PEI_FAT_MAX_BLOCK_SIZE / 8];

+  UINTN                                 BlockDeviceCount;

+  PEI_FAT_BLOCK_DEVICE                  BlockDevice[PEI_FAT_MAX_BLOCK_DEVICE];

+  UINTN                                 VolumeCount;

+  PEI_FAT_VOLUME                        Volume[PEI_FAT_MAX_VOLUME];

+  PEI_FAT_FILE                          File;

+  PEI_FAT_CACHE_BUFFER                  CacheBuffer[PEI_FAT_CACHE_SIZE];

 } PEI_FAT_PRIVATE_DATA;

 

 #define PEI_FAT_PRIVATE_DATA_FROM_THIS(a) \

@@ -178,7 +169,6 @@ typedef struct {
 #define UNPACK_UINT32(a) \

   (UINT32) ((((UINT8 *) a)[0] << 0) | (((UINT8 *) a)[1] << 8) | (((UINT8 *) a)[2] << 16) | (((UINT8 *) a)[3] << 24))

 

-

 //

 // API functions

 //

@@ -209,7 +199,6 @@ FindRecoveryFile (
   OUT PEI_FILE_HANDLE       *Handle

   );

 

-

 /**

   Returns the number of DXE capsules residing on the device.

   This function, by whatever mechanism, searches for DXE capsules from the associated device and

@@ -231,12 +220,11 @@ FindRecoveryFile (
 EFI_STATUS

 EFIAPI

 GetNumberRecoveryCapsules (

-  IN EFI_PEI_SERVICES                               **PeiServices,

-  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI             *This,

-  OUT UINTN                                         *NumberRecoveryCapsules

+  IN EFI_PEI_SERVICES                    **PeiServices,

+  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,

+  OUT UINTN                              *NumberRecoveryCapsules

   );

 

-

 /**

   Returns the size and type of the requested recovery capsule.

   This function returns the size and type of the capsule specified by CapsuleInstance.

@@ -267,14 +255,13 @@ GetNumberRecoveryCapsules (
 EFI_STATUS

 EFIAPI

 GetRecoveryCapsuleInfo (

-  IN  EFI_PEI_SERVICES                              **PeiServices,

-  IN  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI            *This,

-  IN  UINTN                                         CapsuleInstance,

-  OUT UINTN                                         *Size,

-  OUT EFI_GUID                                      *CapsuleType

+  IN  EFI_PEI_SERVICES                    **PeiServices,

+  IN  EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,

+  IN  UINTN                               CapsuleInstance,

+  OUT UINTN                               *Size,

+  OUT EFI_GUID                            *CapsuleType

   );

 

-

 /**

   Loads a DXE capsule from some media into memory.

 

@@ -297,13 +284,12 @@ GetRecoveryCapsuleInfo (
 EFI_STATUS

 EFIAPI

 LoadRecoveryCapsule (

-  IN EFI_PEI_SERVICES                             **PeiServices,

-  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI           *This,

-  IN UINTN                                        CapsuleInstance,

-  OUT VOID                                        *Buffer

+  IN EFI_PEI_SERVICES                    **PeiServices,

+  IN EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,

+  IN UINTN                               CapsuleInstance,

+  OUT VOID                               *Buffer

   );

 

-

 /**

   This version is different from the version in Unicode collation

   protocol in that this version strips off trailing blanks.

@@ -321,12 +307,11 @@ LoadRecoveryCapsule (
 **/

 VOID

 EngFatToStr (

-  IN UINTN                            FatSize,

-  IN CHAR8                            *Fat,

-  OUT CHAR16                          *Str

+  IN UINTN    FatSize,

+  IN CHAR8    *Fat,

+  OUT CHAR16  *Str

   );

 

-

 /**

   Performs a case-insensitive comparison of two Null-terminated Unicode strings.

 

@@ -342,7 +327,6 @@ EngStriColl (
   IN CHAR16                 *Str2

   );

 

-

 /**

   Reads a block of data from the block device by calling

   underlying Block I/O service.

@@ -361,14 +345,13 @@ EngStriColl (
 **/

 EFI_STATUS

 FatReadBlock (

-  IN  PEI_FAT_PRIVATE_DATA   *PrivateData,

-  IN  UINTN                  BlockDeviceNo,

-  IN  EFI_PEI_LBA            Lba,

-  IN  UINTN                  BufferSize,

-  OUT VOID                   *Buffer

+  IN  PEI_FAT_PRIVATE_DATA  *PrivateData,

+  IN  UINTN                 BlockDeviceNo,

+  IN  EFI_PEI_LBA           Lba,

+  IN  UINTN                 BufferSize,

+  OUT VOID                  *Buffer

   );

 

-

 /**

   Check if there is a valid FAT in the corresponding Block device

   of the volume and if yes, fill in the relevant fields for the

@@ -394,7 +377,6 @@ FatGetBpbInfo (
   IN OUT  PEI_FAT_VOLUME        *Volume

   );

 

-

 /**

   Gets the next cluster in the cluster chain.

 

@@ -416,7 +398,6 @@ FatGetNextCluster (
   OUT UINT32                *NextCluster

   );

 

-

 /**

   Disk reading.

 

@@ -439,7 +420,6 @@ FatReadDisk (
   OUT VOID                  *Buffer

   );

 

-

 /**

   Set a file's CurrentPos and CurrentCluster, then compute StraightReadAmount.

 

@@ -460,7 +440,6 @@ FatSetFilePos (
   IN  UINT32                Pos

   );

 

-

 /**

   Reads file data. Updates the file's CurrentPos.

 

@@ -482,7 +461,6 @@ FatReadFile (
   OUT VOID                  *Buffer

   );

 

-

 /**

   This function reads the next item in the parent directory and

   initializes the output parameter SubFile (CurrentPos is initialized to 0).

@@ -507,7 +485,6 @@ FatReadNextDirectoryEntry (
   OUT PEI_FAT_FILE          *SubFile

   );

 

-

 /**

   This function finds partitions (logical devices) in physical block devices.