Make comments match the Spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6876 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 189 insertions, 192 deletions

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 232521f..4613ea0 100644
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -43,9 +43,9 @@ typedef struct {
 //

 typedef UINT64 PHYSICAL_ADDRESS;

 

-//

-// LIST_ENTRY definition.

-//

+///

+/// LIST_ENTRY definition.

+///

 typedef struct _LIST_ENTRY LIST_ENTRY;

 

 struct _LIST_ENTRY {

@@ -360,9 +360,9 @@ typedef CHAR8 *VA_LIST;
 

 typedef INTN RETURN_STATUS;

 

-//

-// Set the upper bit to indicate EFI Error.

-//

+///

+/// Set the upper bit to indicate EFI Error.

+///

 #define ENCODE_ERROR(a)              (MAX_BIT | (a))

 

 #define ENCODE_WARNING(a)            (a)

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 4af0330..c4284ea 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -2309,7 +2309,7 @@ BitFieldWrite8 (
   Reads a bit field from an 8-bit value, performs a bitwise OR, and returns the

   result.

 

-  Performs a bitwise inclusive OR between the bit field specified by StartBit

+  Performs a bitwise OR between the bit field specified by StartBit

   and EndBit in Operand and the value specified by OrData. All other bits in

   Operand are preserved. The new 8-bit value is returned.

 

@@ -2376,8 +2376,8 @@ BitFieldAnd8 (
   bitwise OR, and returns the result.

 

   Performs a bitwise AND between the bit field specified by StartBit and EndBit

-  in Operand and the value specified by AndData, followed by a bitwise

-  inclusive OR with value specified by OrData. All other bits in Operand are

+  in Operand and the value specified by AndData, followed by a bitwise 

+  OR with value specified by OrData. All other bits in Operand are

   preserved. The new 8-bit value is returned.

 

   If 8-bit operations are not supported, then ASSERT().

@@ -2471,7 +2471,7 @@ BitFieldWrite16 (
   Reads a bit field from a 16-bit value, performs a bitwise OR, and returns the

   result.

 

-  Performs a bitwise inclusive OR between the bit field specified by StartBit

+  Performs a bitwise OR between the bit field specified by StartBit

   and EndBit in Operand and the value specified by OrData. All other bits in

   Operand are preserved. The new 16-bit value is returned.

 

@@ -2538,8 +2538,8 @@ BitFieldAnd16 (
   bitwise OR, and returns the result.

 

   Performs a bitwise AND between the bit field specified by StartBit and EndBit

-  in Operand and the value specified by AndData, followed by a bitwise

-  inclusive OR with value specified by OrData. All other bits in Operand are

+  in Operand and the value specified by AndData, followed by a bitwise 

+  OR with value specified by OrData. All other bits in Operand are

   preserved. The new 16-bit value is returned.

 

   If 16-bit operations are not supported, then ASSERT().

@@ -2633,7 +2633,7 @@ BitFieldWrite32 (
   Reads a bit field from a 32-bit value, performs a bitwise OR, and returns the

   result.

 

-  Performs a bitwise inclusive OR between the bit field specified by StartBit

+  Performs a bitwise OR between the bit field specified by StartBit

   and EndBit in Operand and the value specified by OrData. All other bits in

   Operand are preserved. The new 32-bit value is returned.

 

@@ -2700,8 +2700,8 @@ BitFieldAnd32 (
   bitwise OR, and returns the result.

 

   Performs a bitwise AND between the bit field specified by StartBit and EndBit

-  in Operand and the value specified by AndData, followed by a bitwise

-  inclusive OR with value specified by OrData. All other bits in Operand are

+  in Operand and the value specified by AndData, followed by a bitwise 

+  OR with value specified by OrData. All other bits in Operand are

   preserved. The new 32-bit value is returned.

 

   If 32-bit operations are not supported, then ASSERT().

@@ -2795,7 +2795,7 @@ BitFieldWrite64 (
   Reads a bit field from a 64-bit value, performs a bitwise OR, and returns the

   result.

 

-  Performs a bitwise inclusive OR between the bit field specified by StartBit

+  Performs a bitwise OR between the bit field specified by StartBit

   and EndBit in Operand and the value specified by OrData. All other bits in

   Operand are preserved. The new 64-bit value is returned.

 

@@ -2862,8 +2862,8 @@ BitFieldAnd64 (
   bitwise OR, and returns the result.

 

   Performs a bitwise AND between the bit field specified by StartBit and EndBit

-  in Operand and the value specified by AndData, followed by a bitwise

-  inclusive OR with value specified by OrData. All other bits in Operand are

+  in Operand and the value specified by AndData, followed by a bitwise 

+  OR with value specified by OrData. All other bits in Operand are

   preserved. The new 64-bit value is returned.

 

   If 64-bit operations are not supported, then ASSERT().

@@ -5284,10 +5284,10 @@ AsmWriteMsr32 (
 

 

 /**

-  Reads a 64-bit MSR, performs a bitwise inclusive OR on the lower 32-bits, and

+  Reads a 64-bit MSR, performs a bitwise OR on the lower 32-bits, and

   writes the result back to the 64-bit MSR.

 

-  Reads the 64-bit MSR specified by Index, performs a bitwise inclusive OR

+  Reads the 64-bit MSR specified by Index, performs a bitwise OR

   between the lower 32-bits of the read result and the value specified by

   OrData, and writes the result to the 64-bit MSR specified by Index. The lower

   32-bits of the value written to the MSR is returned. No parameter checking is

@@ -5338,12 +5338,12 @@ AsmMsrAnd32 (
 

 

 /**

-  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise inclusive OR

+  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise OR

   on the lower 32-bits, and writes the result back to the 64-bit MSR.

 

   Reads the 64-bit MSR specified by Index, performs a bitwise AND between the

   lower 32-bits of the read result and the value specified by AndData

-  preserving the upper 32-bits, performs a bitwise inclusive OR between the

+  preserving the upper 32-bits, performs a bitwise OR between the

   result of the AND operation and the value specified by OrData, and writes the

   result to the 64-bit MSR specified by Address. The lower 32-bits of the value

   written to the MSR is returned. No parameter checking is performed on Index,

@@ -5405,10 +5405,9 @@ AsmMsrBitFieldRead32 (
   Writes Value to a bit field in the lower 32-bits of a  64-bit MSR. The bit

   field is specified by the StartBit and the EndBit. All other bits in the

   destination MSR are preserved. The lower 32-bits of the MSR written is

-  returned. Extra left bits in Value are stripped. The caller must either

-  guarantee that Index and the data written is valid, or the caller must set up

-  exception handlers to catch the exceptions. This function is only available

-  on IA-32 and x64.

+  returned. The caller must either guarantee that Index and the data written 

+  is valid, or the caller must set up exception handlers to catch the exceptions. 

+  This function is only available on IA-32 and x64.

 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

@@ -5438,7 +5437,7 @@ AsmMsrBitFieldWrite32 (
   Reads a bit field in a 64-bit MSR, performs a bitwise OR, and writes the

   result back to the bit field in the 64-bit MSR.

 

-  Reads the 64-bit MSR specified by Index, performs a bitwise inclusive OR

+  Reads the 64-bit MSR specified by Index, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 64-bit MSR specified by Index. The lower 32-bits of the value

   written to the MSR are returned. Extra left bits in OrData are stripped. The

@@ -5508,11 +5507,11 @@ AsmMsrBitFieldAnd32 (
 

 /**

   Reads a bit field in a 64-bit MSR, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   64-bit MSR.

 

   Reads the 64-bit MSR specified by Index, performs a bitwise AND followed by a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 64-bit MSR specified by Index. The

   lower 32-bits of the value written to the MSR are returned. Extra left bits

   in both AndData and OrData are stripped. The caller must either guarantee

@@ -5593,10 +5592,10 @@ AsmWriteMsr64 (
 

 

 /**

-  Reads a 64-bit MSR, performs a bitwise inclusive OR, and writes the result

+  Reads a 64-bit MSR, performs a bitwise OR, and writes the result

   back to the 64-bit MSR.

 

-  Reads the 64-bit MSR specified by Index, performs a bitwise inclusive OR

+  Reads the 64-bit MSR specified by Index, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 64-bit MSR specified by Index. The value written to the MSR is

   returned. No parameter checking is performed on Index or OrData, and some of

@@ -5645,11 +5644,11 @@ AsmMsrAnd64 (
 

 

 /**

-  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise inclusive

+  Reads a 64-bit MSR, performs a bitwise AND followed by a bitwise 

   OR, and writes the result back to the 64-bit MSR.

 

   Reads the 64-bit MSR specified by Index, performs a bitwise AND between read

-  result and the value specified by AndData, performs a bitwise inclusive OR

+  result and the value specified by AndData, performs a bitwise OR

   between the result of the AND operation and the value specified by OrData,

   and writes the result to the 64-bit MSR specified by Index. The value written

   to the MSR is returned. No parameter checking is performed on Index, AndData,

@@ -5710,10 +5709,9 @@ AsmMsrBitFieldRead64 (
 

   Writes Value to a bit field in a 64-bit MSR. The bit field is specified by

   the StartBit and the EndBit. All other bits in the destination MSR are

-  preserved. The MSR written is returned. Extra left bits in Value are

-  stripped. The caller must either guarantee that Index and the data written is

-  valid, or the caller must set up exception handlers to catch the exceptions.

-  This function is only available on IA-32 and x64.

+  preserved. The MSR written is returned. The caller must either guarantee 

+  that Index and the data written is valid, or the caller must set up exception 

+  handlers to catch the exceptions. This function is only available on IA-32 and x64.

 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

@@ -5740,10 +5738,10 @@ AsmMsrBitFieldWrite64 (
 

 

 /**

-  Reads a bit field in a 64-bit MSR, performs a bitwise inclusive OR, and

+  Reads a bit field in a 64-bit MSR, performs a bitwise OR, and

   writes the result back to the bit field in the 64-bit MSR.

 

-  Reads the 64-bit MSR specified by Index, performs a bitwise inclusive OR

+  Reads the 64-bit MSR specified by Index, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 64-bit MSR specified by Index. The value written to the MSR is

   returned. Extra left bits in OrData are stripped. The caller must either

@@ -5813,11 +5811,11 @@ AsmMsrBitFieldAnd64 (
 

 /**

   Reads a bit field in a 64-bit MSR, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   64-bit MSR.

 

   Reads the 64-bit MSR specified by Index, performs a bitwise AND followed by

-  a bitwise inclusive OR between the read result and the value specified by

+  a bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 64-bit MSR specified by Index. The

   value written to the MSR is returned. Extra left bits in both AndData and

   OrData are stripped. The caller must either guarantee that Index and the data

diff --git a/MdePkg/Include/Library/IoLib.h b/MdePkg/Include/Library/IoLib.h
index 7c415f7..289c10f 100644
--- a/MdePkg/Include/Library/IoLib.h
+++ b/MdePkg/Include/Library/IoLib.h
@@ -76,10 +76,10 @@ IoWrite8 (
   );

 

 /**

-  Reads an 8-bit I/O port, performs a bitwise inclusive OR, and writes the

+  Reads an 8-bit I/O port, performs a bitwise OR, and writes the

   result back to the 8-bit I/O port.

 

-  Reads the 8-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 8-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 8-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -126,8 +126,8 @@ IoAnd8 (
   );

 

 /**

-  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 8-bit I/O port.

+  Reads an 8-bit I/O port, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 8-bit I/O port.

 

   Reads the 8-bit I/O port specified by Port, performs a bitwise AND between

   the read result and the value specified by AndData, performs a bitwise OR

@@ -186,8 +186,7 @@ IoBitFieldRead8 (
 

   Writes Value to the bit field of the I/O register. The bit field is specified

   by the StartBit and the EndBit. All other bits in the destination I/O

-  register are preserved. The value written to the I/O port is returned. Extra

-  left bits in Value are stripped.

+  register are preserved. The value written to the I/O port is returned. 

 

   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

@@ -217,7 +216,7 @@ IoBitFieldWrite8 (
   Reads a bit field in an 8-bit port, performs a bitwise OR, and writes the

   result back to the bit field in the 8-bit port.

 

-  Reads the 8-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 8-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 8-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -283,11 +282,11 @@ IoBitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   8-bit port.

 

   Reads the 8-bit I/O port specified by Port, performs a bitwise AND followed

-  by a bitwise inclusive OR between the read result and the value specified by

+  by a bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 8-bit I/O port specified by Port. The

   value written to the I/O port is returned. This function must guarantee that

   all I/O read and write operations are serialized. Extra left bits in both

@@ -364,10 +363,10 @@ IoWrite16 (
   );

 

 /**

-  Reads a 16-bit I/O port, performs a bitwise inclusive OR, and writes the

+  Reads a 16-bit I/O port, performs a bitwise OR, and writes the

   result back to the 16-bit I/O port.

 

-  Reads the 16-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 16-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 16-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -416,8 +415,8 @@ IoAnd16 (
   );

 

 /**

-  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 16-bit I/O port.

+  Reads a 16-bit I/O port, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 16-bit I/O port.

 

   Reads the 16-bit I/O port specified by Port, performs a bitwise AND between

   the read result and the value specified by AndData, performs a bitwise OR

@@ -510,7 +509,7 @@ IoBitFieldWrite16 (
   Reads a bit field in a 16-bit port, performs a bitwise OR, and writes the

   result back to the bit field in the 16-bit port.

 

-  Reads the 16-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 16-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 16-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -578,11 +577,11 @@ IoBitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   16-bit port.

 

   Reads the 16-bit I/O port specified by Port, performs a bitwise AND followed

-  by a bitwise inclusive OR between the read result and the value specified by

+  by a bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 16-bit I/O port specified by Port. The

   value written to the I/O port is returned. This function must guarantee that

   all I/O read and write operations are serialized. Extra left bits in both

@@ -660,10 +659,10 @@ IoWrite32 (
   );

 

 /**

-  Reads a 32-bit I/O port, performs a bitwise inclusive OR, and writes the

+  Reads a 32-bit I/O port, performs a bitwise OR, and writes the

   result back to the 32-bit I/O port.

 

-  Reads the 32-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 32-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 32-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -712,8 +711,8 @@ IoAnd32 (
   );

 

 /**

-  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 32-bit I/O port.

+  Reads a 32-bit I/O port, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 32-bit I/O port.

 

   Reads the 32-bit I/O port specified by Port, performs a bitwise AND between

   the read result and the value specified by AndData, performs a bitwise OR

@@ -806,7 +805,7 @@ IoBitFieldWrite32 (
   Reads a bit field in a 32-bit port, performs a bitwise OR, and writes the

   result back to the bit field in the 32-bit port.

 

-  Reads the 32-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 32-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 32-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -874,11 +873,11 @@ IoBitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   32-bit port.

 

   Reads the 32-bit I/O port specified by Port, performs a bitwise AND followed

-  by a bitwise inclusive OR between the read result and the value specified by

+  by a bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 32-bit I/O port specified by Port. The

   value written to the I/O port is returned. This function must guarantee that

   all I/O read and write operations are serialized. Extra left bits in both

@@ -956,10 +955,10 @@ IoWrite64 (
   );

 

 /**

-  Reads a 64-bit I/O port, performs a bitwise inclusive OR, and writes the

+  Reads a 64-bit I/O port, performs a bitwise OR, and writes the

   result back to the 64-bit I/O port.

 

-  Reads the 64-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 64-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 64-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -1008,8 +1007,8 @@ IoAnd64 (
   );

 

 /**

-  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 64-bit I/O port.

+  Reads a 64-bit I/O port, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 64-bit I/O port.

 

   Reads the 64-bit I/O port specified by Port, performs a bitwise AND between

   the read result and the value specified by AndData, performs a bitwise OR

@@ -1102,7 +1101,7 @@ IoBitFieldWrite64 (
   Reads a bit field in a 64-bit port, performs a bitwise OR, and writes the

   result back to the bit field in the 64-bit port.

 

-  Reads the 64-bit I/O port specified by Port, performs a bitwise inclusive OR

+  Reads the 64-bit I/O port specified by Port, performs a bitwise OR

   between the read result and the value specified by OrData, and writes the

   result to the 64-bit I/O port specified by Port. The value written to the I/O

   port is returned. This function must guarantee that all I/O read and write

@@ -1170,11 +1169,11 @@ IoBitFieldAnd64 (
 

 /**

   Reads a bit field in a 64-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   64-bit port.

 

   Reads the 64-bit I/O port specified by Port, performs a bitwise AND followed

-  by a bitwise inclusive OR between the read result and the value specified by

+  by a bitwise OR between the read result and the value specified by

   AndData, and writes the result to the 64-bit I/O port specified by Port. The

   value written to the I/O port is returned. This function must guarantee that

   all I/O read and write operations are serialized. Extra left bits in both

@@ -1248,11 +1247,11 @@ MmioWrite8 (
   );

 

 /**

-  Reads an 8-bit MMIO register, performs a bitwise inclusive OR, and writes the

+  Reads an 8-bit MMIO register, performs a bitwise OR, and writes the

   result back to the 8-bit MMIO register.

 

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 8-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 8-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized.

@@ -1298,8 +1297,8 @@ MmioAnd8 (
   );

 

 /**

-  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 8-bit MMIO register.

+  Reads an 8-bit MMIO register, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 8-bit MMIO register.

 

   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND

   between the read result and the value specified by AndData, performs a

@@ -1389,8 +1388,8 @@ MmioBitFieldWrite8 (
   Reads a bit field in an 8-bit MMIO register, performs a bitwise OR, and

   writes the result back to the bit field in the 8-bit MMIO register.

 

-  Reads the 8-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 8-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 8-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized. Extra left bits in OrData

@@ -1457,11 +1456,11 @@ MmioBitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit MMIO register, performs a bitwise AND followed

-  by a bitwise inclusive OR, and writes the result back to the bit field in the

+  by a bitwise OR, and writes the result back to the bit field in the

   8-bit MMIO register.

 

   Reads the 8-bit MMIO register specified by Address, performs a bitwise AND

-  followed by a bitwise inclusive OR between the read result and the value

+  followed by a bitwise OR between the read result and the value

   specified by AndData, and writes the result to the 8-bit MMIO register

   specified by Address. The value written to the MMIO register is returned.

   This function must guarantee that all MMIO read and write operations are

@@ -1536,11 +1535,11 @@ MmioWrite16 (
   );

 

 /**

-  Reads a 16-bit MMIO register, performs a bitwise inclusive OR, and writes the

+  Reads a 16-bit MMIO register, performs a bitwise OR, and writes the

   result back to the 16-bit MMIO register.

 

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 16-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 16-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized.

@@ -1588,8 +1587,8 @@ MmioAnd16 (
   );

 

 /**

-  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 16-bit MMIO register.

+  Reads a 16-bit MMIO register, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 16-bit MMIO register.

 

   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND

   between the read result and the value specified by AndData, performs a

@@ -1681,8 +1680,8 @@ MmioBitFieldWrite16 (
   Reads a bit field in a 16-bit MMIO register, performs a bitwise OR, and

   writes the result back to the bit field in the 16-bit MMIO register.

 

-  Reads the 16-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 16-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 16-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized. Extra left bits in OrData

@@ -1751,11 +1750,11 @@ MmioBitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit MMIO register, performs a bitwise AND followed

-  by a bitwise inclusive OR, and writes the result back to the bit field in the

+  by a bitwise OR, and writes the result back to the bit field in the

   16-bit MMIO register.

 

   Reads the 16-bit MMIO register specified by Address, performs a bitwise AND

-  followed by a bitwise inclusive OR between the read result and the value

+  followed by a bitwise OR between the read result and the value

   specified by AndData, and writes the result to the 16-bit MMIO register

   specified by Address. The value written to the MMIO register is returned.

   This function must guarantee that all MMIO read and write operations are

@@ -1831,11 +1830,11 @@ MmioWrite32 (
   );

 

 /**

-  Reads a 32-bit MMIO register, performs a bitwise inclusive OR, and writes the

+  Reads a 32-bit MMIO register, performs a bitwise OR, and writes the

   result back to the 32-bit MMIO register.

 

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 32-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 32-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized.

@@ -1883,8 +1882,8 @@ MmioAnd32 (
   );

 

 /**

-  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 32-bit MMIO register.

+  Reads a 32-bit MMIO register, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 32-bit MMIO register.

 

   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND

   between the read result and the value specified by AndData, performs a

@@ -1976,8 +1975,8 @@ MmioBitFieldWrite32 (
   Reads a bit field in a 32-bit MMIO register, performs a bitwise OR, and

   writes the result back to the bit field in the 32-bit MMIO register.

 

-  Reads the 32-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 32-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 32-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized. Extra left bits in OrData

@@ -2046,11 +2045,11 @@ MmioBitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit MMIO register, performs a bitwise AND followed

-  by a bitwise inclusive OR, and writes the result back to the bit field in the

+  by a bitwise OR, and writes the result back to the bit field in the

   32-bit MMIO register.

 

   Reads the 32-bit MMIO register specified by Address, performs a bitwise AND

-  followed by a bitwise inclusive OR between the read result and the value

+  followed by a bitwise OR between the read result and the value

   specified by AndData, and writes the result to the 32-bit MMIO register

   specified by Address. The value written to the MMIO register is returned.

   This function must guarantee that all MMIO read and write operations are

@@ -2126,11 +2125,11 @@ MmioWrite64 (
   );

 

 /**

-  Reads a 64-bit MMIO register, performs a bitwise inclusive OR, and writes the

+  Reads a 64-bit MMIO register, performs a bitwise OR, and writes the

   result back to the 64-bit MMIO register.

 

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 64-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 64-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized.

@@ -2178,8 +2177,8 @@ MmioAnd64 (
   );

 

 /**

-  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise

-  inclusive OR, and writes the result back to the 64-bit MMIO register.

+  Reads a 64-bit MMIO register, performs a bitwise AND followed by a bitwise 

+  OR, and writes the result back to the 64-bit MMIO register.

 

   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND

   between the read result and the value specified by AndData, performs a

@@ -2271,8 +2270,8 @@ MmioBitFieldWrite64 (
   Reads a bit field in a 64-bit MMIO register, performs a bitwise OR, and

   writes the result back to the bit field in the 64-bit MMIO register.

 

-  Reads the 64-bit MMIO register specified by Address, performs a bitwise

-  inclusive OR between the read result and the value specified by OrData, and

+  Reads the 64-bit MMIO register specified by Address, performs a bitwise 

+  OR between the read result and the value specified by OrData, and

   writes the result to the 64-bit MMIO register specified by Address. The value

   written to the MMIO register is returned. This function must guarantee that

   all MMIO read and write operations are serialized. Extra left bits in OrData

@@ -2341,11 +2340,11 @@ MmioBitFieldAnd64 (
 

 /**

   Reads a bit field in a 64-bit MMIO register, performs a bitwise AND followed

-  by a bitwise inclusive OR, and writes the result back to the bit field in the

+  by a bitwise OR, and writes the result back to the bit field in the

   64-bit MMIO register.

 

   Reads the 64-bit MMIO register specified by Address, performs a bitwise AND

-  followed by a bitwise inclusive OR between the read result and the value

+  followed by a bitwise OR between the read result and the value

   specified by AndData, and writes the result to the 64-bit MMIO register

   specified by Address. The value written to the MMIO register is returned.

   This function must guarantee that all MMIO read and write operations are

diff --git a/MdePkg/Include/Library/PciCf8Lib.h b/MdePkg/Include/Library/PciCf8Lib.h
index ddc7c27..f508aa6 100644
--- a/MdePkg/Include/Library/PciCf8Lib.h
+++ b/MdePkg/Include/Library/PciCf8Lib.h
@@ -113,11 +113,11 @@ PciCf8Write8 (
   );

 

 /**

-  Performs a bitwise inclusive OR of an 8-bit PCI configuration register with

+  Performs a bitwise OR of an 8-bit PCI configuration register with

   an 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -170,11 +170,11 @@ PciCf8And8 (
 

 /**

   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit

-  value, followed a  bitwise inclusive OR with another 8-bit value.

+  value, followed a  bitwise OR with another 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -267,7 +267,7 @@ PciCf8BitFieldWrite8 (
   writes the result back to the bit field in the 8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -336,11 +336,11 @@ PciCf8BitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -423,11 +423,11 @@ PciCf8Write16 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 16-bit PCI configuration register with

+  Performs a bitwise OR of a 16-bit PCI configuration register with

   a 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -482,11 +482,11 @@ PciCf8And16 (
 

 /**

   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit

-  value, followed a  bitwise inclusive OR with another 16-bit value.

+  value, followed a  bitwise OR with another 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -582,7 +582,7 @@ PciCf8BitFieldWrite16 (
   writes the result back to the bit field in the 16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -653,11 +653,11 @@ PciCf8BitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -741,11 +741,11 @@ PciCf8Write32 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 32-bit PCI configuration register with

+  Performs a bitwise OR of a 32-bit PCI configuration register with

   a 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -800,11 +800,11 @@ PciCf8And32 (
 

 /**

   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit

-  value, followed a  bitwise inclusive OR with another 32-bit value.

+  value, followed a  bitwise OR with another 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -900,7 +900,7 @@ PciCf8BitFieldWrite32 (
   writes the result back to the bit field in the 32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -971,11 +971,11 @@ PciCf8BitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

diff --git a/MdePkg/Include/Library/PciExpressLib.h b/MdePkg/Include/Library/PciExpressLib.h
index 286a8e5..1ea49c1 100644
--- a/MdePkg/Include/Library/PciExpressLib.h
+++ b/MdePkg/Include/Library/PciExpressLib.h
@@ -111,11 +111,11 @@ PciExpressWrite8 (
   );

 

 /**

-  Performs a bitwise inclusive OR of an 8-bit PCI configuration register with

+  Performs a bitwise OR of an 8-bit PCI configuration register with

   an 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -166,11 +166,11 @@ PciExpressAnd8 (
 

 /**

   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit

-  value, followed a  bitwise inclusive OR with another 8-bit value.

+  value, followed a  bitwise OR with another 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -260,7 +260,7 @@ PciExpressBitFieldWrite8 (
   writes the result back to the bit field in the 8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -327,11 +327,11 @@ PciExpressBitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -411,11 +411,11 @@ PciExpressWrite16 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 16-bit PCI configuration register with

+  Performs a bitwise OR of a 16-bit PCI configuration register with

   a 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -468,11 +468,11 @@ PciExpressAnd16 (
 

 /**

   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit

-  value, followed a  bitwise inclusive OR with another 16-bit value.

+  value, followed a  bitwise OR with another 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -565,7 +565,7 @@ PciExpressBitFieldWrite16 (
   writes the result back to the bit field in the 16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -634,11 +634,11 @@ PciExpressBitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -719,11 +719,11 @@ PciExpressWrite32 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 32-bit PCI configuration register with

+  Performs a bitwise OR of a 32-bit PCI configuration register with

   a 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -776,11 +776,11 @@ PciExpressAnd32 (
 

 /**

   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit

-  value, followed a  bitwise inclusive OR with another 32-bit value.

+  value, followed a  bitwise OR with another 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -873,7 +873,7 @@ PciExpressBitFieldWrite32 (
   writes the result back to the bit field in the 32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -942,11 +942,11 @@ PciExpressBitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

diff --git a/MdePkg/Include/Library/PciLib.h b/MdePkg/Include/Library/PciLib.h
index 766bb0b..d85acf5 100644
--- a/MdePkg/Include/Library/PciLib.h
+++ b/MdePkg/Include/Library/PciLib.h
@@ -112,11 +112,11 @@ PciWrite8 (
   );

 

 /**

-  Performs a bitwise inclusive OR of an 8-bit PCI configuration register with

+  Performs a bitwise OR of an 8-bit PCI configuration register with

   an 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -167,11 +167,11 @@ PciAnd8 (
 

 /**

   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit

-  value, followed a  bitwise inclusive OR with another 8-bit value.

+  value, followed a  bitwise OR with another 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -261,7 +261,7 @@ PciBitFieldWrite8 (
   writes the result back to the bit field in the 8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -328,11 +328,11 @@ PciBitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -412,11 +412,11 @@ PciWrite16 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 16-bit PCI configuration register with

+  Performs a bitwise OR of a 16-bit PCI configuration register with

   a 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -469,11 +469,11 @@ PciAnd16 (
 

 /**

   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit

-  value, followed a  bitwise inclusive OR with another 16-bit value.

+  value, followed a  bitwise OR with another 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -566,7 +566,7 @@ PciBitFieldWrite16 (
   writes the result back to the bit field in the 16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -635,11 +635,11 @@ PciBitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -720,11 +720,11 @@ PciWrite32 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 32-bit PCI configuration register with

+  Performs a bitwise OR of a 32-bit PCI configuration register with

   a 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -777,11 +777,11 @@ PciAnd32 (
 

 /**

   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit

-  value, followed a  bitwise inclusive OR with another 32-bit value.

+  value, followed a  bitwise OR with another 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

   bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and

+  performs a bitwise OR between the result of the AND operation and

   the value specified by OrData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -874,7 +874,7 @@ PciBitFieldWrite32 (
   writes the result back to the bit field in the 32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -943,11 +943,11 @@ PciBitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

diff --git a/MdePkg/Include/Library/PciSegmentLib.h b/MdePkg/Include/Library/PciSegmentLib.h
index 84f6a57..ee9600f 100644
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/MdePkg/Include/Library/PciSegmentLib.h
@@ -128,10 +128,10 @@ PciSegmentWrite8 (
   );

 

 /**

-  Performs a bitwise inclusive OR of an 8-bit PCI configuration register with an 8-bit value.

+  Performs a bitwise OR of an 8-bit PCI configuration register with an 8-bit value.

 

   Reads the 8-bit PCI configuration register specified by Address,

-  performs a bitwise inclusive OR between the read result and the value specified by OrData,

+  performs a bitwise OR between the read result and the value specified by OrData,

   and writes the result to the 8-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -176,11 +176,11 @@ PciSegmentAnd8 (
 

 /**

   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit value,

-  followed a  bitwise inclusive OR with another 8-bit value.

+  followed a  bitwise OR with another 8-bit value.

   

   Reads the 8-bit PCI configuration register specified by Address,

   performs a bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and the value specified by OrData,

+  performs a bitwise OR between the result of the AND operation and the value specified by OrData,

   and writes the result to the 8-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -268,7 +268,7 @@ PciSegmentBitFieldWrite8 (
   writes the result back to the bit field in the 8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 8-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -335,11 +335,11 @@ PciSegmentBitFieldAnd8 (
 

 /**

   Reads a bit field in an 8-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   8-bit port.

 

   Reads the 8-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 8-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -415,11 +415,11 @@ PciSegmentWrite16 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 16-bit PCI configuration register with

+  Performs a bitwise OR of a 16-bit PCI configuration register with

   a 16-bit value.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 16-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -469,11 +469,11 @@ PciSegmentAnd16 (
 

 /**

   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit value,

-  followed a  bitwise inclusive OR with another 16-bit value.

+  followed a  bitwise OR with another 16-bit value.

   

   Reads the 16-bit PCI configuration register specified by Address,

   performs a bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and the value specified by OrData,

+  performs a bitwise OR between the result of the AND operation and the value specified by OrData,

   and writes the result to the 16-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -561,7 +561,7 @@ PciSegmentBitFieldWrite16 (
 

 /**

   Reads the 16-bit PCI configuration register specified by Address,

-  performs a bitwise inclusive OR between the read result and the value specified by OrData,

+  performs a bitwise OR between the read result and the value specified by OrData,

   and writes the result to the 16-bit PCI configuration register specified by Address. 

 

   If any reserved bits in Address are set, then ASSERT().

@@ -594,7 +594,7 @@ PciSegmentBitFieldOr16 (
   and writes the result back to the bit field in the 16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address,

-  performs a bitwise inclusive OR between the read result and the value specified by OrData,

+  performs a bitwise OR between the read result and the value specified by OrData,

   and writes the result to the 16-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -627,11 +627,11 @@ PciSegmentBitFieldAnd16 (
 

 /**

   Reads a bit field in a 16-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   16-bit port.

 

   Reads the 16-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 16-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI

@@ -707,10 +707,10 @@ PciSegmentWrite32 (
   );

 

 /**

-  Performs a bitwise inclusive OR of a 32-bit PCI configuration register with a 32-bit value.

+  Performs a bitwise OR of a 32-bit PCI configuration register with a 32-bit value.

 

   Reads the 32-bit PCI configuration register specified by Address,

-  performs a bitwise inclusive OR between the read result and the value specified by OrData,

+  performs a bitwise OR between the read result and the value specified by OrData,

   and writes the result to the 32-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -758,11 +758,11 @@ PciSegmentAnd32 (
 

 /**

   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit value,

-  followed a  bitwise inclusive OR with another 32-bit value.

+  followed a  bitwise OR with another 32-bit value.

   

   Reads the 32-bit PCI configuration register specified by Address,

   performs a bitwise AND between the read result and the value specified by AndData,

-  performs a bitwise inclusive OR between the result of the AND operation and the value specified by OrData,

+  performs a bitwise OR between the result of the AND operation and the value specified by OrData,

   and writes the result to the 32-bit PCI configuration register specified by Address.

   The value written to the PCI configuration register is returned.

   This function must guarantee that all PCI read and write operations are serialized.

@@ -853,7 +853,7 @@ PciSegmentBitFieldWrite32 (
   writes the result back to the bit field in the 32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise inclusive OR between the read result and the value specified by

+  bitwise OR between the read result and the value specified by

   OrData, and writes the result to the 32-bit PCI configuration register

   specified by Address. The value written to the PCI configuration register is

   returned. This function must guarantee that all PCI read and write operations

@@ -921,11 +921,11 @@ PciSegmentBitFieldAnd32 (
 

 /**

   Reads a bit field in a 32-bit port, performs a bitwise AND followed by a

-  bitwise inclusive OR, and writes the result back to the bit field in the

+  bitwise OR, and writes the result back to the bit field in the

   32-bit port.

 

   Reads the 32-bit PCI configuration register specified by Address, performs a

-  bitwise AND followed by a bitwise inclusive OR between the read result and

+  bitwise AND followed by a bitwise OR between the read result and

   the value specified by AndData, and writes the result to the 32-bit PCI

   configuration register specified by Address. The value written to the PCI

   configuration register is returned. This function must guarantee that all PCI