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 29d4af58d661665b2327fa67d7eb4a09fdc70b1a..94d4786d82acddcc2cdc271f847ba0fb1a41a116 100644 (file)
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
@@ -4,18 +4,11 @@
   All assertions for bit field operations are handled bit field functions in the\r
   Base Library.\r
 \r
   All assertions for bit field operations are handled bit field functions in the\r
   Base Library.\r
 \r

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r

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

-\r

 #include "DxeCpuIo2LibInternal.h"\r
 \r
 /**\r
 #include "DxeCpuIo2LibInternal.h"\r
 \r
 /**\r


@@ -39,11 +32,11 @@
 UINT8\r
 EFIAPI\r
 IoOr8 (\r
 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
 {\r

-  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) | OrData));\r
+  return IoWrite8 (Port, (UINT8)(IoRead8 (Port) | OrData));\r

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


@@ -67,11 +60,11 @@ IoOr8 (
 UINT8\r
 EFIAPI\r
 IoAnd8 (\r
 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
 {\r

-  return IoWrite8 (Port, (UINT8) (IoRead8 (Port) & AndData));\r
+  return IoWrite8 (Port, (UINT8)(IoRead8 (Port) & AndData));\r

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


@@ -97,12 +90,12 @@ IoAnd8 (
 UINT8\r
 EFIAPI\r
 IoAndThenOr8 (\r
 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
 {\r

-  return IoWrite8 (Port, (UINT8) ((IoRead8 (Port) & AndData) | OrData));\r
+  return IoWrite8 (Port, (UINT8)((IoRead8 (Port) & AndData) | OrData));\r

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


@@ -128,9 +121,9 @@ IoAndThenOr8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldRead8 (\r
 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
   )\r
 {\r
   return BitFieldRead8 (IoRead8 (Port), StartBit, EndBit);\r


@@ -148,6 +141,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -162,10 +156,10 @@ IoBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldWrite8 (\r
 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
   )\r
 {\r
   return IoWrite8 (\r


@@ -188,6 +182,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -202,10 +197,10 @@ IoBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldOr8 (\r
 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
   )\r
 {\r
   return IoWrite8 (\r


@@ -228,6 +223,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -242,10 +238,10 @@ IoBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldAnd8 (\r
 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
   )\r
 {\r
   return IoWrite8 (\r


@@ -270,6 +266,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -285,11 +283,11 @@ IoBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 IoBitFieldAndThenOr8 (\r
 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
   )\r
 {\r
   return IoWrite8 (\r


@@ -319,11 +317,11 @@ IoBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 IoOr16 (\r
 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
 {\r

-  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) | OrData));\r
+  return IoWrite16 (Port, (UINT16)(IoRead16 (Port) | OrData));\r

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


@@ -347,11 +345,11 @@ IoOr16 (
 UINT16\r
 EFIAPI\r
 IoAnd16 (\r
 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
 {\r

-  return IoWrite16 (Port, (UINT16) (IoRead16 (Port) & AndData));\r
+  return IoWrite16 (Port, (UINT16)(IoRead16 (Port) & AndData));\r

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


@@ -377,12 +375,12 @@ IoAnd16 (
 UINT16\r
 EFIAPI\r
 IoAndThenOr16 (\r
 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
 {\r

-  return IoWrite16 (Port, (UINT16) ((IoRead16 (Port) & AndData) | OrData));\r
+  return IoWrite16 (Port, (UINT16)((IoRead16 (Port) & AndData) | OrData));\r

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


@@ -408,9 +406,9 @@ IoAndThenOr16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldRead16 (\r
 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
   )\r
 {\r
   return BitFieldRead16 (IoRead16 (Port), StartBit, EndBit);\r


@@ -428,6 +426,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -442,10 +441,10 @@ IoBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldWrite16 (\r
 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
   )\r
 {\r
   return IoWrite16 (\r


@@ -468,6 +467,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -482,10 +482,10 @@ IoBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldOr16 (\r
 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
   )\r
 {\r
   return IoWrite16 (\r


@@ -508,6 +508,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -522,10 +523,10 @@ IoBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldAnd16 (\r
 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
   )\r
 {\r
   return IoWrite16 (\r


@@ -550,6 +551,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -565,11 +568,11 @@ IoBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 IoBitFieldAndThenOr16 (\r
 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
   )\r
 {\r
   return IoWrite16 (\r


@@ -599,8 +602,8 @@ IoBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 IoOr32 (\r
 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
   )\r
 {\r
   return IoWrite32 (Port, IoRead32 (Port) | OrData);\r


@@ -627,8 +630,8 @@ IoOr32 (
 UINT32\r
 EFIAPI\r
 IoAnd32 (\r
 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
   )\r
 {\r
   return IoWrite32 (Port, IoRead32 (Port) & AndData);\r


@@ -657,9 +660,9 @@ IoAnd32 (
 UINT32\r
 EFIAPI\r
 IoAndThenOr32 (\r
 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
   )\r
 {\r
   return IoWrite32 (Port, (IoRead32 (Port) & AndData) | OrData);\r


@@ -688,9 +691,9 @@ IoAndThenOr32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldRead32 (\r
 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
   )\r
 {\r
   return BitFieldRead32 (IoRead32 (Port), StartBit, EndBit);\r


@@ -708,6 +711,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -722,10 +726,10 @@ IoBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldWrite32 (\r
 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
   )\r
 {\r
   return IoWrite32 (\r


@@ -748,6 +752,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -762,10 +767,10 @@ IoBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldOr32 (\r
 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
   )\r
 {\r
   return IoWrite32 (\r


@@ -788,6 +793,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -802,10 +808,10 @@ IoBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldAnd32 (\r
 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
   )\r
 {\r
   return IoWrite32 (\r


@@ -830,6 +836,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -845,11 +853,11 @@ IoBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 IoBitFieldAndThenOr32 (\r
 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
   )\r
 {\r
   return IoWrite32 (\r


@@ -879,8 +887,8 @@ IoBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 IoOr64 (\r
 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
   )\r
 {\r
   return IoWrite64 (Port, IoRead64 (Port) | OrData);\r


@@ -907,8 +915,8 @@ IoOr64 (
 UINT64\r
 EFIAPI\r
 IoAnd64 (\r
 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
   )\r
 {\r
   return IoWrite64 (Port, IoRead64 (Port) & AndData);\r


@@ -937,9 +945,9 @@ IoAnd64 (
 UINT64\r
 EFIAPI\r
 IoAndThenOr64 (\r
 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
   )\r
 {\r
   return IoWrite64 (Port, (IoRead64 (Port) & AndData) | OrData);\r


@@ -968,9 +976,9 @@ IoAndThenOr64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldRead64 (\r
 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
   )\r
 {\r
   return BitFieldRead64 (IoRead64 (Port), StartBit, EndBit);\r


@@ -988,6 +996,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1002,10 +1011,10 @@ IoBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldWrite64 (\r
 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
   )\r
 {\r
   return IoWrite64 (\r


@@ -1028,6 +1037,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1042,10 +1052,10 @@ IoBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldOr64 (\r
 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
   )\r
 {\r
   return IoWrite64 (\r


@@ -1068,6 +1078,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1082,10 +1093,10 @@ IoBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldAnd64 (\r
 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
   )\r
 {\r
   return IoWrite64 (\r


@@ -1110,6 +1121,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Port      The I/O port to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1125,11 +1138,11 @@ IoBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 IoBitFieldAndThenOr64 (\r
 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
   )\r
 {\r
   return IoWrite64 (\r


@@ -1159,11 +1172,11 @@ IoBitFieldAndThenOr64 (
 UINT8\r
 EFIAPI\r
 MmioOr8 (\r
 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
 {\r

-  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) | OrData));\r
+  return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) | OrData));\r

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


@@ -1187,11 +1200,11 @@ MmioOr8 (
 UINT8\r
 EFIAPI\r
 MmioAnd8 (\r
 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
 {\r

-  return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) & AndData));\r
+  return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) & AndData));\r

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


@@ -1218,12 +1231,12 @@ MmioAnd8 (
 UINT8\r
 EFIAPI\r
 MmioAndThenOr8 (\r
 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
 {\r

-  return MmioWrite8 (Address, (UINT8) ((MmioRead8 (Address) & AndData) | OrData));\r
+  return MmioWrite8 (Address, (UINT8)((MmioRead8 (Address) & AndData) | OrData));\r

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


@@ -1249,9 +1262,9 @@ MmioAndThenOr8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldRead8 (\r
 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
   )\r
 {\r
   return BitFieldRead8 (MmioRead8 (Address), StartBit, EndBit);\r


@@ -1268,6 +1281,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1282,10 +1296,10 @@ MmioBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldWrite8 (\r
 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
   )\r
 {\r
   return MmioWrite8 (\r


@@ -1309,6 +1323,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1323,10 +1338,10 @@ MmioBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldOr8 (\r
 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
   )\r
 {\r
   return MmioWrite8 (\r


@@ -1350,6 +1365,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1364,10 +1380,10 @@ MmioBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldAnd8 (\r
 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
   )\r
 {\r
   return MmioWrite8 (\r


@@ -1392,6 +1408,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 7, then ASSERT().\r
   If EndBit is greater than 7, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1407,11 +1425,11 @@ MmioBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 MmioBitFieldAndThenOr8 (\r
 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
   )\r
 {\r
   return MmioWrite8 (\r


@@ -1441,11 +1459,11 @@ MmioBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 MmioOr16 (\r
 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
 {\r

-  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) | OrData));\r
+  return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) | OrData));\r

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


@@ -1469,11 +1487,11 @@ MmioOr16 (
 UINT16\r
 EFIAPI\r
 MmioAnd16 (\r
 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
 {\r

-  return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) & AndData));\r
+  return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) & AndData));\r

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


@@ -1500,12 +1518,12 @@ MmioAnd16 (
 UINT16\r
 EFIAPI\r
 MmioAndThenOr16 (\r
 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
 {\r

-  return MmioWrite16 (Address, (UINT16) ((MmioRead16 (Address) & AndData) | OrData));\r
+  return MmioWrite16 (Address, (UINT16)((MmioRead16 (Address) & AndData) | OrData));\r

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


@@ -1531,9 +1549,9 @@ MmioAndThenOr16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldRead16 (\r
 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
   )\r
 {\r
   return BitFieldRead16 (MmioRead16 (Address), StartBit, EndBit);\r


@@ -1550,6 +1568,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1564,10 +1583,10 @@ MmioBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldWrite16 (\r
 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
   )\r
 {\r
   return MmioWrite16 (\r


@@ -1591,6 +1610,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1605,10 +1625,10 @@ MmioBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldOr16 (\r
 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
   )\r
 {\r
   return MmioWrite16 (\r


@@ -1632,6 +1652,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1646,10 +1667,10 @@ MmioBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldAnd16 (\r
 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
   )\r
 {\r
   return MmioWrite16 (\r


@@ -1674,6 +1695,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 15, then ASSERT().\r
   If EndBit is greater than 15, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1689,11 +1712,11 @@ MmioBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 MmioBitFieldAndThenOr16 (\r
 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
   )\r
 {\r
   return MmioWrite16 (\r


@@ -1723,8 +1746,8 @@ MmioBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 MmioOr32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (Address, MmioRead32 (Address) | OrData);\r


@@ -1751,8 +1774,8 @@ MmioOr32 (
 UINT32\r
 EFIAPI\r
 MmioAnd32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (Address, MmioRead32 (Address) & AndData);\r


@@ -1782,9 +1805,9 @@ MmioAnd32 (
 UINT32\r
 EFIAPI\r
 MmioAndThenOr32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (Address, (MmioRead32 (Address) & AndData) | OrData);\r


@@ -1813,9 +1836,9 @@ MmioAndThenOr32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldRead32 (\r
 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
   )\r
 {\r
   return BitFieldRead32 (MmioRead32 (Address), StartBit, EndBit);\r


@@ -1832,6 +1855,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1846,10 +1870,10 @@ MmioBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldWrite32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (\r


@@ -1873,6 +1897,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1887,10 +1912,10 @@ MmioBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldOr32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (\r


@@ -1914,6 +1939,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1928,10 +1954,10 @@ MmioBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldAnd32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (\r


@@ -1956,6 +1982,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 31, then ASSERT().\r
   If EndBit is greater than 31, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -1971,11 +1999,11 @@ MmioBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 MmioBitFieldAndThenOr32 (\r
 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
   )\r
 {\r
   return MmioWrite32 (\r


@@ -2005,8 +2033,8 @@ MmioBitFieldAndThenOr32 (
 UINT64\r
 EFIAPI\r
 MmioOr64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (Address, MmioRead64 (Address) | OrData);\r


@@ -2033,8 +2061,8 @@ MmioOr64 (
 UINT64\r
 EFIAPI\r
 MmioAnd64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (Address, MmioRead64 (Address) & AndData);\r


@@ -2064,9 +2092,9 @@ MmioAnd64 (
 UINT64\r
 EFIAPI\r
 MmioAndThenOr64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (Address, (MmioRead64 (Address) & AndData) | OrData);\r


@@ -2095,9 +2123,9 @@ MmioAndThenOr64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldRead64 (\r
 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
   )\r
 {\r
   return BitFieldRead64 (MmioRead64 (Address), StartBit, EndBit);\r


@@ -2114,6 +2142,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -2128,10 +2157,10 @@ MmioBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldWrite64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (\r


@@ -2155,6 +2184,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -2169,10 +2199,10 @@ MmioBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldOr64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (\r


@@ -2196,6 +2226,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -2210,10 +2241,10 @@ MmioBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldAnd64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (\r


@@ -2238,6 +2269,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r
   If StartBit is greater than 63, then ASSERT().\r
   If EndBit is greater than 63, then ASSERT().\r
   If EndBit is less than StartBit, then ASSERT().\r

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r
+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().\r

 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r
 \r
   @param  Address   The MMIO register to write.\r
   @param  StartBit  The ordinal of the least significant bit in the bit field.\r


@@ -2253,11 +2286,11 @@ MmioBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 MmioBitFieldAndThenOr64 (\r
 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
   )\r
 {\r
   return MmioWrite64 (\r