MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Include / Library / IoLib.h

diff --git a/MdePkg/Include/Library/IoLib.h b/MdePkg/Include/Library/IoLib.h
index afdb0d83a73b24af1191109804329f5641b6eac6..9f0c28fe87983e11f7c14e4b4a99c2257da256fc 100644 (file)
--- a/MdePkg/Include/Library/IoLib.h
+++ b/MdePkg/Include/Library/IoLib.h
@@ -26,7 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-#define IO_LIB_ADDRESS(Segment,Port) \\r
+#define IO_LIB_ADDRESS(Segment, Port) \\r
   ( ((Port) & 0xffff) | (((Segment) & 0xffff) << 16) )\r
 \r
 /**\r
@@ -46,7 +46,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 UINT8\r
 EFIAPI\r
 IoRead8 (\r
-  IN      UINTN                     Port\r
+  IN      UINTN  Port\r
   );\r
 \r
 /**\r
@@ -67,8 +67,8 @@ IoRead8 (
 UINT8\r
 EFIAPI\r
 IoWrite8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Port,\r
+  IN      UINT8  Value\r
   );\r
 \r
 /**\r
@@ -91,9 +91,9 @@ IoWrite8 (
 VOID\r
 EFIAPI\r
 IoReadFifo8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  OUT     VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  OUT     VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -116,9 +116,9 @@ IoReadFifo8 (
 VOID\r
 EFIAPI\r
 IoWriteFifo8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  IN      VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  IN      VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -142,8 +142,8 @@ IoWriteFifo8 (
 UINT8\r
 EFIAPI\r
 IoOr8 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Port,\r
+  IN      UINT8  OrData\r
   );\r
 \r
 /**\r
@@ -167,8 +167,8 @@ 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
 /**\r
@@ -194,9 +194,9 @@ 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
 /**\r
@@ -222,9 +222,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
 /**\r
@@ -253,10 +253,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
 /**\r
@@ -288,10 +288,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
 /**\r
@@ -323,10 +323,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
 /**\r
@@ -362,11 +362,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
 /**\r
@@ -387,7 +387,7 @@ IoBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 IoRead16 (\r
-  IN      UINTN                     Port\r
+  IN      UINTN  Port\r
   );\r
 \r
 /**\r
@@ -409,8 +409,8 @@ IoRead16 (
 UINT16\r
 EFIAPI\r
 IoWrite16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINT16  Value\r
   );\r
 \r
 /**\r
@@ -433,9 +433,9 @@ IoWrite16 (
 VOID\r
 EFIAPI\r
 IoReadFifo16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  OUT     VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  OUT     VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -458,9 +458,9 @@ IoReadFifo16 (
 VOID\r
 EFIAPI\r
 IoWriteFifo16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  IN      VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  IN      VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -485,8 +485,8 @@ IoWriteFifo16 (
 UINT16\r
 EFIAPI\r
 IoOr16 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT16  OrData\r
   );\r
 \r
 /**\r
@@ -511,8 +511,8 @@ 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
 /**\r
@@ -539,9 +539,9 @@ 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
 /**\r
@@ -568,9 +568,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
 /**\r
@@ -601,10 +601,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
 /**\r
@@ -637,10 +637,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
 /**\r
@@ -673,10 +673,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
 /**\r
@@ -713,11 +713,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
 /**\r
@@ -738,7 +738,7 @@ IoBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 IoRead32 (\r
-  IN      UINTN                     Port\r
+  IN      UINTN  Port\r
   );\r
 \r
 /**\r
@@ -760,8 +760,8 @@ IoRead32 (
 UINT32\r
 EFIAPI\r
 IoWrite32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINT32  Value\r
   );\r
 \r
 /**\r
@@ -784,9 +784,9 @@ IoWrite32 (
 VOID\r
 EFIAPI\r
 IoReadFifo32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  OUT     VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  OUT     VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -809,9 +809,9 @@ IoReadFifo32 (
 VOID\r
 EFIAPI\r
 IoWriteFifo32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINTN                     Count,\r
-  IN      VOID                      *Buffer\r
+  IN      UINTN  Port,\r
+  IN      UINTN  Count,\r
+  IN      VOID   *Buffer\r
   );\r
 \r
 /**\r
@@ -836,8 +836,8 @@ IoWriteFifo32 (
 UINT32\r
 EFIAPI\r
 IoOr32 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT32  OrData\r
   );\r
 \r
 /**\r
@@ -862,8 +862,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
 /**\r
@@ -890,9 +890,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
 /**\r
@@ -919,9 +919,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
 /**\r
@@ -952,10 +952,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
 /**\r
@@ -988,10 +988,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
 /**\r
@@ -1024,10 +1024,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
 /**\r
@@ -1064,11 +1064,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
 /**\r
@@ -1089,7 +1089,7 @@ IoBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 IoRead64 (\r
-  IN      UINTN                     Port\r
+  IN      UINTN  Port\r
   );\r
 \r
 /**\r
@@ -1111,8 +1111,8 @@ IoRead64 (
 UINT64\r
 EFIAPI\r
 IoWrite64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT64                    Value\r
+  IN      UINTN   Port,\r
+  IN      UINT64  Value\r
   );\r
 \r
 /**\r
@@ -1137,8 +1137,8 @@ IoWrite64 (
 UINT64\r
 EFIAPI\r
 IoOr64 (\r
-  IN      UINTN                     Port,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Port,\r
+  IN      UINT64  OrData\r
   );\r
 \r
 /**\r
@@ -1163,8 +1163,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
 /**\r
@@ -1191,9 +1191,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
 /**\r
@@ -1220,9 +1220,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
 /**\r
@@ -1253,10 +1253,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
 /**\r
@@ -1289,10 +1289,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
 /**\r
@@ -1325,10 +1325,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
 /**\r
@@ -1365,11 +1365,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
 /**\r
@@ -1389,7 +1389,7 @@ IoBitFieldAndThenOr64 (
 UINT8\r
 EFIAPI\r
 MmioRead8 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   );\r
 \r
 /**\r
@@ -1410,8 +1410,8 @@ MmioRead8 (
 UINT8\r
 EFIAPI\r
 MmioWrite8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Address,\r
+  IN      UINT8  Value\r
   );\r
 \r
 /**\r
@@ -1435,8 +1435,8 @@ MmioWrite8 (
 UINT8\r
 EFIAPI\r
 MmioOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  OrData\r
   );\r
 \r
 /**\r
@@ -1460,8 +1460,8 @@ 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
 /**\r
@@ -1488,9 +1488,9 @@ 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
 /**\r
@@ -1516,9 +1516,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
 /**\r
@@ -1547,10 +1547,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
 /**\r
@@ -1583,10 +1583,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
 /**\r
@@ -1619,10 +1619,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
 /**\r
@@ -1658,11 +1658,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
 /**\r
@@ -1683,7 +1683,7 @@ MmioBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 MmioRead16 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   );\r
 \r
 /**\r
@@ -1705,8 +1705,8 @@ MmioRead16 (
 UINT16\r
 EFIAPI\r
 MmioWrite16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT16  Value\r
   );\r
 \r
 /**\r
@@ -1731,8 +1731,8 @@ MmioWrite16 (
 UINT16\r
 EFIAPI\r
 MmioOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  OrData\r
   );\r
 \r
 /**\r
@@ -1757,8 +1757,8 @@ 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
 /**\r
@@ -1785,9 +1785,9 @@ 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
 /**\r
@@ -1814,9 +1814,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
 /**\r
@@ -1846,10 +1846,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
 /**\r
@@ -1883,10 +1883,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
 /**\r
@@ -1920,10 +1920,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
 /**\r
@@ -1960,11 +1960,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
 /**\r
@@ -1985,7 +1985,7 @@ MmioBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 MmioRead32 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   );\r
 \r
 /**\r
@@ -2007,8 +2007,8 @@ MmioRead32 (
 UINT32\r
 EFIAPI\r
 MmioWrite32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT32  Value\r
   );\r
 \r
 /**\r
@@ -2033,8 +2033,8 @@ MmioWrite32 (
 UINT32\r
 EFIAPI\r
 MmioOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  OrData\r
   );\r
 \r
 /**\r
@@ -2059,8 +2059,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
 /**\r
@@ -2087,9 +2087,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
 /**\r
@@ -2116,9 +2116,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
 /**\r
@@ -2148,10 +2148,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
 /**\r
@@ -2185,10 +2185,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
 /**\r
@@ -2222,10 +2222,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
 /**\r
@@ -2262,11 +2262,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
 /**\r
@@ -2287,7 +2287,7 @@ MmioBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 MmioRead64 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   );\r
 \r
 /**\r
@@ -2307,8 +2307,8 @@ MmioRead64 (
 UINT64\r
 EFIAPI\r
 MmioWrite64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT64                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT64  Value\r
   );\r
 \r
 /**\r
@@ -2333,8 +2333,8 @@ MmioWrite64 (
 UINT64\r
 EFIAPI\r
 MmioOr64 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT64                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT64  OrData\r
   );\r
 \r
 /**\r
@@ -2359,8 +2359,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
 /**\r
@@ -2387,9 +2387,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
 /**\r
@@ -2416,9 +2416,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
 /**\r
@@ -2448,10 +2448,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
 /**\r
@@ -2485,10 +2485,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
 /**\r
@@ -2522,10 +2522,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
 /**\r
@@ -2562,11 +2562,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
 /**\r
@@ -2590,9 +2590,9 @@ MmioBitFieldAndThenOr64 (
 UINT8 *\r
 EFIAPI\r
 MmioReadBuffer8 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT8       *Buffer\r
+  IN  UINTN  StartAddress,\r
+  IN  UINTN  Length,\r
+  OUT UINT8  *Buffer\r
   );\r
 \r
 /**\r
@@ -2620,9 +2620,9 @@ MmioReadBuffer8 (
 UINT16 *\r
 EFIAPI\r
 MmioReadBuffer16 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT16      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT16  *Buffer\r
   );\r
 \r
 /**\r
@@ -2650,9 +2650,9 @@ MmioReadBuffer16 (
 UINT32 *\r
 EFIAPI\r
 MmioReadBuffer32 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT32      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT32  *Buffer\r
   );\r
 \r
 /**\r
@@ -2680,9 +2680,9 @@ MmioReadBuffer32 (
 UINT64 *\r
 EFIAPI\r
 MmioReadBuffer64 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT64      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT64  *Buffer\r
   );\r
 \r
 /**\r
@@ -2706,9 +2706,9 @@ MmioReadBuffer64 (
 UINT8 *\r
 EFIAPI\r
 MmioWriteBuffer8 (\r
-  IN  UINTN         StartAddress,\r
-  IN  UINTN         Length,\r
-  IN  CONST UINT8   *Buffer\r
+  IN  UINTN        StartAddress,\r
+  IN  UINTN        Length,\r
+  IN  CONST UINT8  *Buffer\r
   );\r
 \r
 /**\r
@@ -2737,9 +2737,9 @@ MmioWriteBuffer8 (
 UINT16 *\r
 EFIAPI\r
 MmioWriteBuffer16 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT16 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT16  *Buffer\r
   );\r
 \r
 /**\r
@@ -2768,9 +2768,9 @@ MmioWriteBuffer16 (
 UINT32 *\r
 EFIAPI\r
 MmioWriteBuffer32 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT32 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT32  *Buffer\r
   );\r
 \r
 /**\r
@@ -2799,11 +2799,9 @@ MmioWriteBuffer32 (
 UINT64 *\r
 EFIAPI\r
 MmioWriteBuffer64 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT64 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT64  *Buffer\r
   );\r
 \r
-\r
 #endif\r
-\r