MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Library / BaseIoLibIntrinsic / IoHighLevel.c

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 559f5693187a179cf0b0059808aee8cb8f6b7431..f01e4b571f94b61b51f9faab9f0309908290f236 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -38,11 +38,11 @@
 UINT8\r
 EFIAPI\r
 IoOr8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Port,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
-  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) | OrData));\r
+  return IoWrite8 (Port, (UINT8)(IoRead8 (Port) | OrData));\r
 }\r
 \r
 /**\r
@@ -66,11 +66,11 @@ IoOr8 (
 UINT8\r
 EFIAPI\r
 IoAnd8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Port,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
-  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) & AndData));\r
+  return IoWrite8 (Port, (UINT8)(IoRead8 (Port) & AndData));\r
 }\r
 \r
 /**\r
@@ -96,12 +96,12 @@ IoAnd8 (
 UINT8\r
 EFIAPI\r
 IoAndThenOr8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Port,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
-  return IoWrite8 (Port, (UINT8) ((IoRead8 (Port) & AndData) | OrData));\r
+  return IoWrite8 (Port, (UINT8)((IoRead8 (Port) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -127,9 +127,9 @@ IoAndThenOr8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldRead8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return BitFieldRead8 (IoRead8 (Port), StartBit, EndBit);\r
@@ -161,10 +161,10 @@ IoBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldWrite8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  Value\r
   )\r
 {\r
   return IoWrite8 (\r
@@ -202,10 +202,10 @@ IoBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldOr8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return IoWrite8 (\r
@@ -243,10 +243,10 @@ IoBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldAnd8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
   return IoWrite8 (\r
@@ -288,11 +288,11 @@ IoBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldAndThenOr8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return IoWrite8 (\r
@@ -323,11 +323,11 @@ IoBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 IoOr16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
-  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) | OrData));\r
+  return IoWrite16 (Port, (UINT16)(IoRead16 (Port) | OrData));\r
 }\r
 \r
 /**\r
@@ -352,11 +352,11 @@ IoOr16 (
 UINT16\r
 EFIAPI\r
 IoAnd16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
-  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) & AndData));\r
+  return IoWrite16 (Port, (UINT16)(IoRead16 (Port) & AndData));\r
 }\r
 \r
 /**\r
@@ -383,12 +383,12 @@ IoAnd16 (
 UINT16\r
 EFIAPI\r
 IoAndThenOr16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
-  return IoWrite16 (Port, (UINT16) ((IoRead16 (Port) & AndData) | OrData));\r
+  return IoWrite16 (Port, (UINT16)((IoRead16 (Port) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -415,9 +415,9 @@ IoAndThenOr16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldRead16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return BitFieldRead16 (IoRead16 (Port), StartBit, EndBit);\r
@@ -451,10 +451,10 @@ IoBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldWrite16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  Value\r
   )\r
 {\r
   return IoWrite16 (\r
@@ -493,10 +493,10 @@ IoBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldOr16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return IoWrite16 (\r
@@ -535,10 +535,10 @@ IoBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldAnd16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
   return IoWrite16 (\r
@@ -581,11 +581,11 @@ IoBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldAndThenOr16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return IoWrite16 (\r
@@ -616,8 +616,8 @@ IoBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 IoOr32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return IoWrite32 (Port, IoRead32 (Port) | OrData);\r
@@ -645,8 +645,8 @@ IoOr32 (
 UINT32\r
 EFIAPI\r
 IoAnd32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   return IoWrite32 (Port, IoRead32 (Port) & AndData);\r
@@ -676,9 +676,9 @@ IoAnd32 (
 UINT32\r
 EFIAPI\r
 IoAndThenOr32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return IoWrite32 (Port, (IoRead32 (Port) & AndData) | OrData);\r
@@ -708,9 +708,9 @@ IoAndThenOr32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldRead32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return BitFieldRead32 (IoRead32 (Port), StartBit, EndBit);\r
@@ -744,10 +744,10 @@ IoBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldWrite32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  Value\r
   )\r
 {\r
   return IoWrite32 (\r
@@ -786,10 +786,10 @@ IoBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldOr32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return IoWrite32 (\r
@@ -828,10 +828,10 @@ IoBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldAnd32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   return IoWrite32 (\r
@@ -874,11 +874,11 @@ IoBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldAndThenOr32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return IoWrite32 (\r
@@ -909,8 +909,8 @@ IoBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 IoOr64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return IoWrite64 (Port, IoRead64 (Port) | OrData);\r
@@ -938,8 +938,8 @@ IoOr64 (
 UINT64\r
 EFIAPI\r
 IoAnd64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT64                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINT64  AndData\r
   )\r
 {\r
   return IoWrite64 (Port, IoRead64 (Port) & AndData);\r
@@ -969,9 +969,9 @@ IoAnd64 (
 UINT64\r
 EFIAPI\r
 IoAndThenOr64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT64                    AndData,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT64  AndData,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return IoWrite64 (Port, (IoRead64 (Port) & AndData) | OrData);\r
@@ -1001,9 +1001,9 @@ IoAndThenOr64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldRead64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Port,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return BitFieldRead64 (IoRead64 (Port), StartBit, EndBit);\r
@@ -1037,10 +1037,10 @@ IoBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldWrite64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  Value\r
   )\r
 {\r
   return IoWrite64 (\r
@@ -1079,10 +1079,10 @@ IoBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldOr64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return IoWrite64 (\r
@@ -1121,10 +1121,10 @@ IoBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldAnd64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData\r
   )\r
 {\r
   return IoWrite64 (\r
@@ -1167,11 +1167,11 @@ IoBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldAndThenOr64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return IoWrite64 (\r
@@ -1201,11 +1201,11 @@ IoBitFieldAndThenOr64 (
 UINT8\r
 EFIAPI\r
 MmioOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
-  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) | OrData));\r
+  return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) | OrData));\r
 }\r
 \r
 /**\r
@@ -1229,11 +1229,11 @@ MmioOr8 (
 UINT8\r
 EFIAPI\r
 MmioAnd8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
-  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) & AndData));\r
+  return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) & AndData));\r
 }\r
 \r
 /**\r
@@ -1260,12 +1260,12 @@ MmioAnd8 (
 UINT8\r
 EFIAPI\r
 MmioAndThenOr8 (\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
-  return MmioWrite8 (Address, (UINT8) ((MmioRead8 (Address) & AndData) | OrData));\r
+  return MmioWrite8 (Address, (UINT8)((MmioRead8 (Address) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -1291,9 +1291,9 @@ MmioAndThenOr8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldRead8 (\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
   return BitFieldRead8 (MmioRead8 (Address), StartBit, EndBit);\r
@@ -1325,10 +1325,10 @@ MmioBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldWrite8 (\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
   return MmioWrite8 (\r
@@ -1367,10 +1367,10 @@ MmioBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldOr8 (\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
   return MmioWrite8 (\r
@@ -1409,10 +1409,10 @@ MmioBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldAnd8 (\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
   return MmioWrite8 (\r
@@ -1454,11 +1454,11 @@ MmioBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldAndThenOr8 (\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
   return MmioWrite8 (\r
@@ -1489,11 +1489,11 @@ MmioBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 MmioOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
-  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) | OrData));\r
+  return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) | OrData));\r
 }\r
 \r
 /**\r
@@ -1518,11 +1518,11 @@ MmioOr16 (
 UINT16\r
 EFIAPI\r
 MmioAnd16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
-  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) & AndData));\r
+  return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) & AndData));\r
 }\r
 \r
 /**\r
@@ -1549,12 +1549,12 @@ MmioAnd16 (
 UINT16\r
 EFIAPI\r
 MmioAndThenOr16 (\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
-  return MmioWrite16 (Address, (UINT16) ((MmioRead16 (Address) & AndData) | OrData));\r
+  return MmioWrite16 (Address, (UINT16)((MmioRead16 (Address) & AndData) | OrData));\r
 }\r
 \r
 /**\r
@@ -1581,9 +1581,9 @@ MmioAndThenOr16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldRead16 (\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
   return BitFieldRead16 (MmioRead16 (Address), StartBit, EndBit);\r
@@ -1616,10 +1616,10 @@ MmioBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldWrite16 (\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
   return MmioWrite16 (\r
@@ -1659,10 +1659,10 @@ MmioBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldOr16 (\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
   return MmioWrite16 (\r
@@ -1702,10 +1702,10 @@ MmioBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldAnd16 (\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
   return MmioWrite16 (\r
@@ -1748,11 +1748,11 @@ MmioBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldAndThenOr16 (\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
   return MmioWrite16 (\r
@@ -1783,8 +1783,8 @@ MmioBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 MmioOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return MmioWrite32 (Address, MmioRead32 (Address) | OrData);\r
@@ -1812,8 +1812,8 @@ MmioOr32 (
 UINT32\r
 EFIAPI\r
 MmioAnd32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   return MmioWrite32 (Address, MmioRead32 (Address) & AndData);\r
@@ -1843,9 +1843,9 @@ MmioAnd32 (
 UINT32\r
 EFIAPI\r
 MmioAndThenOr32 (\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
   return MmioWrite32 (Address, (MmioRead32 (Address) & AndData) | OrData);\r
@@ -1875,9 +1875,9 @@ MmioAndThenOr32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldRead32 (\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
   return BitFieldRead32 (MmioRead32 (Address), StartBit, EndBit);\r
@@ -1910,10 +1910,10 @@ MmioBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldWrite32 (\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
   return MmioWrite32 (\r
@@ -1953,10 +1953,10 @@ MmioBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldOr32 (\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
   return MmioWrite32 (\r
@@ -1996,10 +1996,10 @@ MmioBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldAnd32 (\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
   return MmioWrite32 (\r
@@ -2042,11 +2042,11 @@ MmioBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldAndThenOr32 (\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
   return MmioWrite32 (\r
@@ -2077,8 +2077,8 @@ MmioBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 MmioOr64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return MmioWrite64 (Address, MmioRead64 (Address) | OrData);\r
@@ -2106,8 +2106,8 @@ MmioOr64 (
 UINT64\r
 EFIAPI\r
 MmioAnd64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT64                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT64  AndData\r
   )\r
 {\r
   return MmioWrite64 (Address, MmioRead64 (Address) & AndData);\r
@@ -2137,9 +2137,9 @@ MmioAnd64 (
 UINT64\r
 EFIAPI\r
 MmioAndThenOr64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT64                    AndData,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT64  AndData,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return MmioWrite64 (Address, (MmioRead64 (Address) & AndData) | OrData);\r
@@ -2169,9 +2169,9 @@ MmioAndThenOr64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldRead64 (\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
   return BitFieldRead64 (MmioRead64 (Address), StartBit, EndBit);\r
@@ -2204,10 +2204,10 @@ MmioBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldWrite64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  Value\r
   )\r
 {\r
   return MmioWrite64 (\r
@@ -2247,10 +2247,10 @@ MmioBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldOr64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return MmioWrite64 (\r
@@ -2290,10 +2290,10 @@ MmioBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldAnd64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData\r
   )\r
 {\r
   return MmioWrite64 (\r
@@ -2336,11 +2336,11 @@ MmioBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldAndThenOr64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT64                    AndData,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT64  AndData,\r
+  IN      UINT64  OrData\r
   )\r
 {\r
   return MmioWrite64 (\r