Make comments match the Spec.

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

1 files changed, 33 insertions, 35 deletions

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 4af0330f1..c4284eac2 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