MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Library / BasePciExpressLib / PciExpressLib.c

diff --git a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
index 910dd75bb48c096796eca559ad86902a1d8493e9..df937ec1fbc251eec7e51caa7136a4f67bdb3994 100644 (file)
--- a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
@@ -10,7 +10,6 @@
 \r
 **/\r
 \r
-\r
 #include <Base.h>\r
 \r
 #include <Library/BaseLib.h>\r
@@ -19,7 +18,6 @@
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
 /**\r
   Assert the validity of a PCI address. A valid PCI address should contain 1's\r
   only in the low 28 bits. PcdPciExpressBaseSize limits the size to the real\r
@@ -72,12 +70,12 @@ PciExpressRegisterForRuntimeAccess (
   @return The base address of PCI Express.\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 GetPciExpressBaseAddress (\r
   VOID\r
   )\r
 {\r
-  return (VOID*)(UINTN) PcdGet64 (PcdPciExpressBaseAddress);\r
+  return (VOID *)(UINTN)PcdGet64 (PcdPciExpressBaseAddress);\r
 }\r
 \r
 /**\r
@@ -95,7 +93,7 @@ PcdPciExpressBaseSize (
   VOID\r
   )\r
 {\r
-  return (UINTN) PcdGet64 (PcdPciExpressBaseSize);\r
+  return (UINTN)PcdGet64 (PcdPciExpressBaseSize);\r
 }\r
 \r
 /**\r
@@ -117,14 +115,15 @@ PcdPciExpressBaseSize (
 UINT8\r
 EFIAPI\r
 PciExpressRead8 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
-  return MmioRead8 ((UINTN) GetPciExpressBaseAddress () + Address);\r
+\r
+  return MmioRead8 ((UINTN)GetPciExpressBaseAddress () + Address);\r
 }\r
 \r
 /**\r
@@ -147,15 +146,16 @@ PciExpressRead8 (
 UINT8\r
 EFIAPI\r
 PciExpressWrite8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Address,\r
+  IN      UINT8  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
-  return MmioWrite8 ((UINTN) GetPciExpressBaseAddress () + Address, Value);\r
+\r
+  return MmioWrite8 ((UINTN)GetPciExpressBaseAddress () + Address, Value);\r
 }\r
 \r
 /**\r
@@ -182,15 +182,16 @@ PciExpressWrite8 (
 UINT8\r
 EFIAPI\r
 PciExpressOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
-  return MmioOr8 ((UINTN) GetPciExpressBaseAddress () + Address, OrData);\r
+\r
+  return MmioOr8 ((UINTN)GetPciExpressBaseAddress () + Address, OrData);\r
 }\r
 \r
 /**\r
@@ -217,15 +218,16 @@ PciExpressOr8 (
 UINT8\r
 EFIAPI\r
 PciExpressAnd8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
-  return MmioAnd8 ((UINTN) GetPciExpressBaseAddress () + Address, AndData);\r
+\r
+  return MmioAnd8 ((UINTN)GetPciExpressBaseAddress () + Address, AndData);\r
 }\r
 \r
 /**\r
@@ -254,17 +256,18 @@ PciExpressAnd8 (
 UINT8\r
 EFIAPI\r
 PciExpressAndThenOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioAndThenOr8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            AndData,\r
            OrData\r
            );\r
@@ -296,17 +299,18 @@ PciExpressAndThenOr8 (
 UINT8\r
 EFIAPI\r
 PciExpressBitFieldRead8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioBitFieldRead8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit\r
            );\r
@@ -340,18 +344,19 @@ PciExpressBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 PciExpressBitFieldWrite8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioBitFieldWrite8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            Value\r
@@ -389,18 +394,19 @@ PciExpressBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 PciExpressBitFieldOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioBitFieldOr8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            OrData\r
@@ -438,18 +444,19 @@ PciExpressBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 PciExpressBitFieldAnd8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioBitFieldAnd8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData\r
@@ -491,19 +498,20 @@ PciExpressBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 PciExpressBitFieldAndThenOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT8) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT8)-1;\r
   }\r
+\r
   return MmioBitFieldAndThenOr8 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData,\r
@@ -531,14 +539,15 @@ PciExpressBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 PciExpressRead16 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
-  return MmioRead16 ((UINTN) GetPciExpressBaseAddress () + Address);\r
+\r
+  return MmioRead16 ((UINTN)GetPciExpressBaseAddress () + Address);\r
 }\r
 \r
 /**\r
@@ -562,15 +571,16 @@ PciExpressRead16 (
 UINT16\r
 EFIAPI\r
 PciExpressWrite16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT16  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
-  return MmioWrite16 ((UINTN) GetPciExpressBaseAddress () + Address, Value);\r
+\r
+  return MmioWrite16 ((UINTN)GetPciExpressBaseAddress () + Address, Value);\r
 }\r
 \r
 /**\r
@@ -598,15 +608,16 @@ PciExpressWrite16 (
 UINT16\r
 EFIAPI\r
 PciExpressOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
-  return MmioOr16 ((UINTN) GetPciExpressBaseAddress () + Address, OrData);\r
+\r
+  return MmioOr16 ((UINTN)GetPciExpressBaseAddress () + Address, OrData);\r
 }\r
 \r
 /**\r
@@ -634,15 +645,16 @@ PciExpressOr16 (
 UINT16\r
 EFIAPI\r
 PciExpressAnd16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
-  return MmioAnd16 ((UINTN) GetPciExpressBaseAddress () + Address, AndData);\r
+\r
+  return MmioAnd16 ((UINTN)GetPciExpressBaseAddress () + Address, AndData);\r
 }\r
 \r
 /**\r
@@ -672,17 +684,18 @@ PciExpressAnd16 (
 UINT16\r
 EFIAPI\r
 PciExpressAndThenOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioAndThenOr16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            AndData,\r
            OrData\r
            );\r
@@ -715,17 +728,18 @@ PciExpressAndThenOr16 (
 UINT16\r
 EFIAPI\r
 PciExpressBitFieldRead16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioBitFieldRead16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit\r
            );\r
@@ -760,18 +774,19 @@ PciExpressBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 PciExpressBitFieldWrite16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioBitFieldWrite16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            Value\r
@@ -810,18 +825,19 @@ PciExpressBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 PciExpressBitFieldOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioBitFieldOr16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            OrData\r
@@ -860,18 +876,19 @@ PciExpressBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 PciExpressBitFieldAnd16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioBitFieldAnd16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData\r
@@ -914,19 +931,20 @@ PciExpressBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 PciExpressBitFieldAndThenOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT16) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT16)-1;\r
   }\r
+\r
   return MmioBitFieldAndThenOr16 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData,\r
@@ -954,14 +972,15 @@ PciExpressBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 PciExpressRead32 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
-  return MmioRead32 ((UINTN) GetPciExpressBaseAddress () + Address);\r
+\r
+  return MmioRead32 ((UINTN)GetPciExpressBaseAddress () + Address);\r
 }\r
 \r
 /**\r
@@ -985,15 +1004,16 @@ PciExpressRead32 (
 UINT32\r
 EFIAPI\r
 PciExpressWrite32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT32  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
-  return MmioWrite32 ((UINTN) GetPciExpressBaseAddress () + Address, Value);\r
+\r
+  return MmioWrite32 ((UINTN)GetPciExpressBaseAddress () + Address, Value);\r
 }\r
 \r
 /**\r
@@ -1021,15 +1041,16 @@ PciExpressWrite32 (
 UINT32\r
 EFIAPI\r
 PciExpressOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
-  return MmioOr32 ((UINTN) GetPciExpressBaseAddress () + Address, OrData);\r
+\r
+  return MmioOr32 ((UINTN)GetPciExpressBaseAddress () + Address, OrData);\r
 }\r
 \r
 /**\r
@@ -1057,15 +1078,16 @@ PciExpressOr32 (
 UINT32\r
 EFIAPI\r
 PciExpressAnd32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
-  return MmioAnd32 ((UINTN) GetPciExpressBaseAddress () + Address, AndData);\r
+\r
+  return MmioAnd32 ((UINTN)GetPciExpressBaseAddress () + Address, AndData);\r
 }\r
 \r
 /**\r
@@ -1095,17 +1117,18 @@ PciExpressAnd32 (
 UINT32\r
 EFIAPI\r
 PciExpressAndThenOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioAndThenOr32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            AndData,\r
            OrData\r
            );\r
@@ -1138,17 +1161,18 @@ PciExpressAndThenOr32 (
 UINT32\r
 EFIAPI\r
 PciExpressBitFieldRead32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioBitFieldRead32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit\r
            );\r
@@ -1183,18 +1207,19 @@ PciExpressBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 PciExpressBitFieldWrite32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  Value\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioBitFieldWrite32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            Value\r
@@ -1233,18 +1258,19 @@ PciExpressBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 PciExpressBitFieldOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioBitFieldOr32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            OrData\r
@@ -1283,18 +1309,19 @@ PciExpressBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 PciExpressBitFieldAnd32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioBitFieldAnd32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData\r
@@ -1337,19 +1364,20 @@ PciExpressBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 PciExpressBitFieldAndThenOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   ASSERT_INVALID_PCI_ADDRESS (Address);\r
-  if (Address >= PcdPciExpressBaseSize()) {\r
-    return (UINT32) -1;\r
+  if (Address >= PcdPciExpressBaseSize ()) {\r
+    return (UINT32)-1;\r
   }\r
+\r
   return MmioBitFieldAndThenOr32 (\r
-           (UINTN) GetPciExpressBaseAddress () + Address,\r
+           (UINTN)GetPciExpressBaseAddress () + Address,\r
            StartBit,\r
            EndBit,\r
            AndData,\r
@@ -1384,17 +1412,18 @@ PciExpressBitFieldAndThenOr32 (
 UINTN\r
 EFIAPI\r
 PciExpressReadBuffer (\r
-  IN      UINTN                     StartAddress,\r
-  IN      UINTN                     Size,\r
-  OUT     VOID                      *Buffer\r
+  IN      UINTN  StartAddress,\r
+  IN      UINTN  Size,\r
+  OUT     VOID   *Buffer\r
   )\r
 {\r
-  UINTN   ReturnValue;\r
+  UINTN  ReturnValue;\r
 \r
   ASSERT_INVALID_PCI_ADDRESS (StartAddress);\r
-  if (StartAddress >= PcdPciExpressBaseSize()) {\r
-    return (UINTN) -1;\r
+  if (StartAddress >= PcdPciExpressBaseSize ()) {\r
+    return (UINTN)-1;\r
   }\r
+\r
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);\r
 \r
   if (Size == 0) {\r
@@ -1413,41 +1442,41 @@ PciExpressReadBuffer (
     // Read a byte if StartAddress is byte aligned\r
     //\r
     *(volatile UINT8 *)Buffer = PciExpressRead8 (StartAddress);\r
-    StartAddress += sizeof (UINT8);\r
-    Size -= sizeof (UINT8);\r
-    Buffer = (UINT8*)Buffer + 1;\r
+    StartAddress             += sizeof (UINT8);\r
+    Size                     -= sizeof (UINT8);\r
+    Buffer                    = (UINT8 *)Buffer + 1;\r
   }\r
 \r
-  if (Size >= sizeof (UINT16) && (StartAddress & 2) != 0) {\r
+  if ((Size >= sizeof (UINT16)) && ((StartAddress & 2) != 0)) {\r
     //\r
     // Read a word if StartAddress is word aligned\r
     //\r
-    WriteUnaligned16 ((UINT16 *) Buffer, (UINT16) PciExpressRead16 (StartAddress));\r
+    WriteUnaligned16 ((UINT16 *)Buffer, (UINT16)PciExpressRead16 (StartAddress));\r
 \r
     StartAddress += sizeof (UINT16);\r
-    Size -= sizeof (UINT16);\r
-    Buffer = (UINT16*)Buffer + 1;\r
+    Size         -= sizeof (UINT16);\r
+    Buffer        = (UINT16 *)Buffer + 1;\r
   }\r
 \r
   while (Size >= sizeof (UINT32)) {\r
     //\r
     // Read as many double words as possible\r
     //\r
-    WriteUnaligned32 ((UINT32 *) Buffer, (UINT32) PciExpressRead32 (StartAddress));\r
+    WriteUnaligned32 ((UINT32 *)Buffer, (UINT32)PciExpressRead32 (StartAddress));\r
 \r
     StartAddress += sizeof (UINT32);\r
-    Size -= sizeof (UINT32);\r
-    Buffer = (UINT32*)Buffer + 1;\r
+    Size         -= sizeof (UINT32);\r
+    Buffer        = (UINT32 *)Buffer + 1;\r
   }\r
 \r
   if (Size >= sizeof (UINT16)) {\r
     //\r
     // Read the last remaining word if exist\r
     //\r
-    WriteUnaligned16 ((UINT16 *) Buffer, (UINT16) PciExpressRead16 (StartAddress));\r
+    WriteUnaligned16 ((UINT16 *)Buffer, (UINT16)PciExpressRead16 (StartAddress));\r
     StartAddress += sizeof (UINT16);\r
-    Size -= sizeof (UINT16);\r
-    Buffer = (UINT16*)Buffer + 1;\r
+    Size         -= sizeof (UINT16);\r
+    Buffer        = (UINT16 *)Buffer + 1;\r
   }\r
 \r
   if (Size >= sizeof (UINT8)) {\r
@@ -1488,17 +1517,18 @@ PciExpressReadBuffer (
 UINTN\r
 EFIAPI\r
 PciExpressWriteBuffer (\r
-  IN      UINTN                     StartAddress,\r
-  IN      UINTN                     Size,\r
-  IN      VOID                      *Buffer\r
+  IN      UINTN  StartAddress,\r
+  IN      UINTN  Size,\r
+  IN      VOID   *Buffer\r
   )\r
 {\r
-  UINTN                             ReturnValue;\r
+  UINTN  ReturnValue;\r
 \r
   ASSERT_INVALID_PCI_ADDRESS (StartAddress);\r
-  if (StartAddress >= PcdPciExpressBaseSize()) {\r
-    return (UINTN) -1;\r
+  if (StartAddress >= PcdPciExpressBaseSize ()) {\r
+    return (UINTN)-1;\r
   }\r
+\r
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);\r
 \r
   if (Size == 0) {\r
@@ -1516,47 +1546,47 @@ PciExpressWriteBuffer (
     //\r
     // Write a byte if StartAddress is byte aligned\r
     //\r
-    PciExpressWrite8 (StartAddress, *(UINT8*)Buffer);\r
+    PciExpressWrite8 (StartAddress, *(UINT8 *)Buffer);\r
     StartAddress += sizeof (UINT8);\r
-    Size -= sizeof (UINT8);\r
-    Buffer = (UINT8*)Buffer + 1;\r
+    Size         -= sizeof (UINT8);\r
+    Buffer        = (UINT8 *)Buffer + 1;\r
   }\r
 \r
-  if (Size >= sizeof (UINT16) && (StartAddress & 2) != 0) {\r
+  if ((Size >= sizeof (UINT16)) && ((StartAddress & 2) != 0)) {\r
     //\r
     // Write a word if StartAddress is word aligned\r
     //\r
-    PciExpressWrite16 (StartAddress, ReadUnaligned16 ((UINT16*)Buffer));\r
+    PciExpressWrite16 (StartAddress, ReadUnaligned16 ((UINT16 *)Buffer));\r
     StartAddress += sizeof (UINT16);\r
-    Size -= sizeof (UINT16);\r
-    Buffer = (UINT16*)Buffer + 1;\r
+    Size         -= sizeof (UINT16);\r
+    Buffer        = (UINT16 *)Buffer + 1;\r
   }\r
 \r
   while (Size >= sizeof (UINT32)) {\r
     //\r
     // Write as many double words as possible\r
     //\r
-    PciExpressWrite32 (StartAddress, ReadUnaligned32 ((UINT32*)Buffer));\r
+    PciExpressWrite32 (StartAddress, ReadUnaligned32 ((UINT32 *)Buffer));\r
     StartAddress += sizeof (UINT32);\r
-    Size -= sizeof (UINT32);\r
-    Buffer = (UINT32*)Buffer + 1;\r
+    Size         -= sizeof (UINT32);\r
+    Buffer        = (UINT32 *)Buffer + 1;\r
   }\r
 \r
   if (Size >= sizeof (UINT16)) {\r
     //\r
     // Write the last remaining word if exist\r
     //\r
-    PciExpressWrite16 (StartAddress, ReadUnaligned16 ((UINT16*)Buffer));\r
+    PciExpressWrite16 (StartAddress, ReadUnaligned16 ((UINT16 *)Buffer));\r
     StartAddress += sizeof (UINT16);\r
-    Size -= sizeof (UINT16);\r
-    Buffer = (UINT16*)Buffer + 1;\r
+    Size         -= sizeof (UINT16);\r
+    Buffer        = (UINT16 *)Buffer + 1;\r
   }\r
 \r
   if (Size >= sizeof (UINT8)) {\r
     //\r
     // Write the last remaining byte if exist\r
     //\r
-    PciExpressWrite8 (StartAddress, *(UINT8*)Buffer);\r
+    PciExpressWrite8 (StartAddress, *(UINT8 *)Buffer);\r
   }\r
 \r
   return ReturnValue;\r