Fix ICC build break

Fix some typos

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

diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
index 30ef9ec8a8c5ee97af6bf30f38918d0927a6266b..8df68217bc9619aa1eb14473d97dfe052490458f 100644 (file)
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
@@ -156,9 +156,9 @@ CpuIoCheckParameter (
   //\r
   // Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count \r
   // can also be the maximum integer value supported by the CPU, this range\r
-  // check must be adjusted to avoid all oveflow conditions.\r
+  // check must be adjusted to avoid all overflow conditions.\r
   //   \r
-  // The follwing form of the range check is equivalent but assumes that \r
+  // The following form of the range check is equivalent but assumes that \r
   // MAX_ADDRESS and MAX_IO_PORT_ADDRESS are of the form (2^n - 1).\r
   //\r
   Limit = (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS);\r

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index 7f7383815e62921810b0893e0ce0ac178463e2d1..72717d6360a1a64a5ac740d34962882a27945be3 100644 (file)
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
@@ -334,7 +334,7 @@ CpuIoCheckParameter (
   //\r
   // Check to see if Width is in the valid range for I/O Port operations\r
   //\r
-  Width = Width & 0x03;\r
+  Width = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);\r
   if (!MmioOperation && (Width == EfiPeiCpuIoWidthUint64)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -349,9 +349,9 @@ CpuIoCheckParameter (
   //\r
   // Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count \r
   // can also be the maximum integer value supported by the CPU, this range\r
-  // check must be adjusted to avoid all oveflow conditions.\r
+  // check must be adjusted to avoid all overflow conditions.\r
   //   \r
-  // The follwing form of the range check is equivalent but assumes that \r
+  // The following form of the range check is equivalent but assumes that \r
   // MAX_ADDRESS and MAX_IO_PORT_ADDRESS are of the form (2^n - 1).\r
   //\r
   Limit = (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS);\r
@@ -418,7 +418,7 @@ CpuMemoryServiceRead (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);\r
   Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiPeiCpuIoWidthUint8) {\r
@@ -492,7 +492,7 @@ CpuMemoryServiceWrite (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);\r
   Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiPeiCpuIoWidthUint8) {\r
@@ -566,7 +566,7 @@ CpuIoServiceRead (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);\r
   Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiPeiCpuIoWidthUint8) {\r
@@ -638,7 +638,7 @@ CpuIoServiceWrite (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);\r
   Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);\r
   for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiPeiCpuIoWidthUint8) {\r