MdePkg: Apply uncrustify changes

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

diff --git a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
index ac4d3a6849c57c808e93b680b30e9c8d6fff8e64..94d4786d82acddcc2cdc271f847ba0fb1a41a116 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
@@ -9,7 +9,6 @@
 \r
 **/\r
 \r
-\r
 #include "DxeCpuIo2LibInternal.h"\r
 \r
 /**\r
@@ -33,11 +32,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
@@ -61,11 +60,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
@@ -91,12 +90,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
@@ -122,9 +121,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
@@ -157,10 +156,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
@@ -198,10 +197,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
@@ -239,10 +238,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
@@ -284,11 +283,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
@@ -318,11 +317,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
@@ -346,11 +345,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
@@ -376,12 +375,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
@@ -407,9 +406,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
@@ -442,10 +441,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
@@ -483,10 +482,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
@@ -524,10 +523,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
@@ -569,11 +568,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
@@ -603,8 +602,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
@@ -631,8 +630,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
@@ -661,9 +660,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
@@ -692,9 +691,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
@@ -727,10 +726,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
@@ -768,10 +767,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
@@ -809,10 +808,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
@@ -854,11 +853,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
@@ -888,8 +887,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
@@ -916,8 +915,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
@@ -946,9 +945,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
@@ -977,9 +976,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
@@ -1012,10 +1011,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
@@ -1053,10 +1052,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
@@ -1094,10 +1093,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
@@ -1139,11 +1138,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
@@ -1173,11 +1172,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
@@ -1201,11 +1200,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
@@ -1232,12 +1231,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
@@ -1263,9 +1262,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
@@ -1297,10 +1296,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
@@ -1339,10 +1338,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
@@ -1381,10 +1380,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
@@ -1426,11 +1425,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
@@ -1460,11 +1459,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
@@ -1488,11 +1487,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
@@ -1519,12 +1518,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
@@ -1550,9 +1549,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
@@ -1584,10 +1583,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
@@ -1626,10 +1625,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
@@ -1668,10 +1667,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
@@ -1713,11 +1712,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
@@ -1747,8 +1746,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
@@ -1775,8 +1774,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
@@ -1806,9 +1805,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
@@ -1837,9 +1836,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
@@ -1871,10 +1870,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
@@ -1913,10 +1912,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
@@ -1955,10 +1954,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
@@ -2000,11 +1999,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
@@ -2034,8 +2033,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
@@ -2062,8 +2061,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
@@ -2093,9 +2092,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
@@ -2124,9 +2123,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
@@ -2158,10 +2157,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
@@ -2200,10 +2199,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
@@ -2242,10 +2241,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
@@ -2287,11 +2286,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