MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Library / BaseLib / BitField.c

diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c
index 0f48a036ba32e7310ea109c351e1fa7dbe5b9084..862af53e9c3f5e26115bf912b0ea394f98148dfa 100644 (file)
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -23,9 +23,9 @@
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldReadUint (\r
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldReadUint (\r

-  IN      UINTN                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -56,10 +56,10 @@ InternalBaseLibBitFieldReadUint (
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldOrUint (\r
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldOrUint (\r

-  IN      UINTN                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINTN                     OrData\r
+  IN      UINTN  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINTN  OrData\r

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -74,7 +74,7 @@ InternalBaseLibBitFieldOrUint (
   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]\r
   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.\r
   //\r
   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]\r
   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.\r
   //\r

-  return Operand | ((OrData << StartBit) & ~((UINTN) -2 << EndBit));\r
+  return Operand | ((OrData << StartBit) & ~((UINTN)-2 << EndBit));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -98,10 +98,10 @@ InternalBaseLibBitFieldOrUint (
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldAndUint (\r
 UINTN\r
 EFIAPI\r
 InternalBaseLibBitFieldAndUint (\r

-  IN      UINTN                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINTN                     AndData\r
+  IN      UINTN  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINTN  AndData\r

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -141,9 +141,9 @@ InternalBaseLibBitFieldAndUint (
 UINT8\r
 EFIAPI\r
 BitFieldRead8 (\r
 UINT8\r
 EFIAPI\r
 BitFieldRead8 (\r

-  IN      UINT8                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINT8  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r

   )\r
 {\r
   ASSERT (EndBit < 8);\r
   )\r
 {\r
   ASSERT (EndBit < 8);\r


@@ -177,10 +177,10 @@ BitFieldRead8 (
 UINT8\r
 EFIAPI\r
 BitFieldWrite8 (\r
 UINT8\r
 EFIAPI\r
 BitFieldWrite8 (\r

-  IN      UINT8                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     Value\r
+  IN      UINT8  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  Value\r

   )\r
 {\r
   ASSERT (EndBit < 8);\r
   )\r
 {\r
   ASSERT (EndBit < 8);\r


@@ -215,10 +215,10 @@ BitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 BitFieldOr8 (\r
 UINT8\r
 EFIAPI\r
 BitFieldOr8 (\r

-  IN      UINT8                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     OrData\r
+  IN      UINT8  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 8);\r
   )\r
 {\r
   ASSERT (EndBit < 8);\r


@@ -253,10 +253,10 @@ BitFieldOr8 (
 UINT8\r
 EFIAPI\r
 BitFieldAnd8 (\r
 UINT8\r
 EFIAPI\r
 BitFieldAnd8 (\r

-  IN      UINT8                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData\r
+  IN      UINT8  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData\r

   )\r
 {\r
   ASSERT (EndBit < 8);\r
   )\r
 {\r
   ASSERT (EndBit < 8);\r


@@ -294,11 +294,11 @@ BitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 BitFieldAndThenOr8 (\r
 UINT8\r
 EFIAPI\r
 BitFieldAndThenOr8 (\r

-  IN      UINT8                     Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINT8  Operand,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 8);\r
   )\r
 {\r
   ASSERT (EndBit < 8);\r


@@ -333,9 +333,9 @@ BitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 BitFieldRead16 (\r
 UINT16\r
 EFIAPI\r
 BitFieldRead16 (\r

-  IN      UINT16                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINT16  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit\r

   )\r
 {\r
   ASSERT (EndBit < 16);\r
   )\r
 {\r
   ASSERT (EndBit < 16);\r


@@ -369,10 +369,10 @@ BitFieldRead16 (
 UINT16\r
 EFIAPI\r
 BitFieldWrite16 (\r
 UINT16\r
 EFIAPI\r
 BitFieldWrite16 (\r

-  IN      UINT16                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    Value\r
+  IN      UINT16  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  Value\r

   )\r
 {\r
   ASSERT (EndBit < 16);\r
   )\r
 {\r
   ASSERT (EndBit < 16);\r


@@ -407,10 +407,10 @@ BitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 BitFieldOr16 (\r
 UINT16\r
 EFIAPI\r
 BitFieldOr16 (\r

-  IN      UINT16                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    OrData\r
+  IN      UINT16  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 16);\r
   )\r
 {\r
   ASSERT (EndBit < 16);\r


@@ -445,10 +445,10 @@ BitFieldOr16 (
 UINT16\r
 EFIAPI\r
 BitFieldAnd16 (\r
 UINT16\r
 EFIAPI\r
 BitFieldAnd16 (\r

-  IN      UINT16                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData\r
+  IN      UINT16  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData\r

   )\r
 {\r
   ASSERT (EndBit < 16);\r
   )\r
 {\r
   ASSERT (EndBit < 16);\r


@@ -486,11 +486,11 @@ BitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 BitFieldAndThenOr16 (\r
 UINT16\r
 EFIAPI\r
 BitFieldAndThenOr16 (\r

-  IN      UINT16                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINT16  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 16);\r
   )\r
 {\r
   ASSERT (EndBit < 16);\r


@@ -525,9 +525,9 @@ BitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 BitFieldRead32 (\r
 UINT32\r
 EFIAPI\r
 BitFieldRead32 (\r

-  IN      UINT32                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINT32  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit\r

   )\r
 {\r
   ASSERT (EndBit < 32);\r
   )\r
 {\r
   ASSERT (EndBit < 32);\r


@@ -561,10 +561,10 @@ BitFieldRead32 (
 UINT32\r
 EFIAPI\r
 BitFieldWrite32 (\r
 UINT32\r
 EFIAPI\r
 BitFieldWrite32 (\r

-  IN      UINT32                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    Value\r
+  IN      UINT32  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  Value\r

   )\r
 {\r
   ASSERT (EndBit < 32);\r
   )\r
 {\r
   ASSERT (EndBit < 32);\r


@@ -599,10 +599,10 @@ BitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 BitFieldOr32 (\r
 UINT32\r
 EFIAPI\r
 BitFieldOr32 (\r

-  IN      UINT32                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    OrData\r
+  IN      UINT32  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 32);\r
   )\r
 {\r
   ASSERT (EndBit < 32);\r


@@ -637,10 +637,10 @@ BitFieldOr32 (
 UINT32\r
 EFIAPI\r
 BitFieldAnd32 (\r
 UINT32\r
 EFIAPI\r
 BitFieldAnd32 (\r

-  IN      UINT32                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData\r
+  IN      UINT32  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData\r

   )\r
 {\r
   ASSERT (EndBit < 32);\r
   )\r
 {\r
   ASSERT (EndBit < 32);\r


@@ -678,11 +678,11 @@ BitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 BitFieldAndThenOr32 (\r
 UINT32\r
 EFIAPI\r
 BitFieldAndThenOr32 (\r

-  IN      UINT32                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINT32  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 32);\r
   )\r
 {\r
   ASSERT (EndBit < 32);\r


@@ -717,9 +717,9 @@ BitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 BitFieldRead64 (\r
 UINT64\r
 EFIAPI\r
 BitFieldRead64 (\r

-  IN      UINT64                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINT64  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit\r

   )\r
 {\r
   ASSERT (EndBit < 64);\r
   )\r
 {\r
   ASSERT (EndBit < 64);\r


@@ -753,10 +753,10 @@ BitFieldRead64 (
 UINT64\r
 EFIAPI\r
 BitFieldWrite64 (\r
 UINT64\r
 EFIAPI\r
 BitFieldWrite64 (\r

-  IN      UINT64                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    Value\r
+  IN      UINT64  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  Value\r

   )\r
 {\r
   ASSERT (EndBit < 64);\r
   )\r
 {\r
   ASSERT (EndBit < 64);\r


@@ -791,10 +791,10 @@ BitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 BitFieldOr64 (\r
 UINT64\r
 EFIAPI\r
 BitFieldOr64 (\r

-  IN      UINT64                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    OrData\r
+  IN      UINT64  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  OrData\r

   )\r
 {\r
   UINT64  Value1;\r
   )\r
 {\r
   UINT64  Value1;\r


@@ -811,7 +811,7 @@ BitFieldOr64 (
   ASSERT (RShiftU64 (OrData, EndBit - StartBit) == (RShiftU64 (OrData, EndBit - StartBit) & 1));\r
 \r
   Value1 = LShiftU64 (OrData, StartBit);\r
   ASSERT (RShiftU64 (OrData, EndBit - StartBit) == (RShiftU64 (OrData, EndBit - StartBit) & 1));\r
 \r
   Value1 = LShiftU64 (OrData, StartBit);\r

-  Value2 = LShiftU64 ((UINT64) - 2, EndBit);\r
+  Value2 = LShiftU64 ((UINT64)-2, EndBit);\r

 \r
   return Operand | (Value1 & ~Value2);\r
 }\r
 \r
   return Operand | (Value1 & ~Value2);\r
 }\r


@@ -843,10 +843,10 @@ BitFieldOr64 (
 UINT64\r
 EFIAPI\r
 BitFieldAnd64 (\r
 UINT64\r
 EFIAPI\r
 BitFieldAnd64 (\r

-  IN      UINT64                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData\r
+  IN      UINT64  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData\r

   )\r
 {\r
   UINT64  Value1;\r
   )\r
 {\r
   UINT64  Value1;\r


@@ -898,11 +898,11 @@ BitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 BitFieldAndThenOr64 (\r
 UINT64\r
 EFIAPI\r
 BitFieldAndThenOr64 (\r

-  IN      UINT64                    Operand,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData,\r
-  IN      UINT64                    OrData\r
+  IN      UINT64  Operand,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData,\r
+  IN      UINT64  OrData\r

   )\r
 {\r
   ASSERT (EndBit < 64);\r
   )\r
 {\r
   ASSERT (EndBit < 64);\r


@@ -938,25 +938,25 @@ BitFieldAndThenOr64 (
 UINT8\r
 EFIAPI\r
 BitFieldCountOnes32 (\r
 UINT8\r
 EFIAPI\r
 BitFieldCountOnes32 (\r

-  IN       UINT32                   Operand,\r
-  IN       UINTN                    StartBit,\r
-  IN       UINTN                    EndBit\r
+  IN       UINT32  Operand,\r
+  IN       UINTN   StartBit,\r
+  IN       UINTN   EndBit\r

   )\r
 {\r
   )\r
 {\r

-  UINT32 Count;\r
+  UINT32  Count;\r

 \r
   ASSERT (EndBit < 32);\r
   ASSERT (StartBit <= EndBit);\r
 \r
 \r
   ASSERT (EndBit < 32);\r
   ASSERT (StartBit <= EndBit);\r
 \r

-  Count = BitFieldRead32 (Operand, StartBit, EndBit);\r
+  Count  = BitFieldRead32 (Operand, StartBit, EndBit);\r

   Count -= ((Count >> 1) & 0x55555555);\r
   Count -= ((Count >> 1) & 0x55555555);\r

-  Count = (Count & 0x33333333) + ((Count >> 2) & 0x33333333);\r
+  Count  = (Count & 0x33333333) + ((Count >> 2) & 0x33333333);\r

   Count += Count >> 4;\r
   Count &= 0x0F0F0F0F;\r
   Count += Count >> 8;\r
   Count += Count >> 16;\r
 \r
   Count += Count >> 4;\r
   Count &= 0x0F0F0F0F;\r
   Count += Count >> 8;\r
   Count += Count >> 16;\r
 \r

-  return (UINT8) Count & 0x3F;\r
+  return (UINT8)Count & 0x3F;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -982,21 +982,20 @@ BitFieldCountOnes32 (
 UINT8\r
 EFIAPI\r
 BitFieldCountOnes64 (\r
 UINT8\r
 EFIAPI\r
 BitFieldCountOnes64 (\r

-  IN       UINT64                   Operand,\r
-  IN       UINTN                    StartBit,\r
-  IN       UINTN                    EndBit\r
+  IN       UINT64  Operand,\r
+  IN       UINTN   StartBit,\r
+  IN       UINTN   EndBit\r

   )\r
 {\r
   )\r
 {\r

-  UINT64 BitField;\r
-  UINT8 Count;\r
+  UINT64  BitField;\r
+  UINT8   Count;\r

 \r
   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
 \r
   BitField = BitFieldRead64 (Operand, StartBit, EndBit);\r
 \r
   ASSERT (EndBit < 64);\r
   ASSERT (StartBit <= EndBit);\r
 \r
   BitField = BitFieldRead64 (Operand, StartBit, EndBit);\r

-  Count = BitFieldCountOnes32 ((UINT32) BitField, 0, 31);\r
-  Count += BitFieldCountOnes32 ((UINT32) RShiftU64(BitField, 32), 0, 31);\r
+  Count    = BitFieldCountOnes32 ((UINT32)BitField, 0, 31);\r
+  Count   += BitFieldCountOnes32 ((UINT32)RShiftU64 (BitField, 32), 0, 31);\r

 \r
   return Count;\r
 }\r
 \r
   return Count;\r
 }\r

-\r