Fix ICC build break

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

diff --git a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
index d76ce04227dc4b17972a3b26ddd027f447739a2d..802b4fef2b01b679b4a3bbad02ec9133aca0205f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
+++ b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
@@ -183,13 +183,13 @@ 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_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   if (!MmioOperation && (Width == EfiCpuIoWidthUint64)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
   //\r
-  // Check to see if Address is alligned\r
+  // Check to see if Address is aligned\r
   //\r
   if ((Address & (UINT64)(mInStride[Width] - 1)) != 0) {\r
     return EFI_UNSUPPORTED;\r
@@ -205,9 +205,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
@@ -226,7 +226,7 @@ CpuIoCheckParameter (
   }\r
 \r
   //\r
-  // Check to see if Buffer is alligned\r
+  // Check to see if Buffer is aligned\r
   //\r
   if (((UINTN)Buffer & (mInStride[Width] - 1)) != 0) {\r
     return EFI_UNSUPPORTED;\r
@@ -300,7 +300,7 @@ CpuMemoryServiceRead (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       *Uint8Buffer = MmioRead8 ((UINTN)Address);\r
@@ -380,7 +380,7 @@ CpuMemoryServiceWrite (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       MmioWrite8 ((UINTN)Address, *Uint8Buffer);\r
@@ -460,7 +460,7 @@ CpuIoServiceRead (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       *Uint8Buffer = IoRead8 ((UINTN)Address);\r
@@ -542,7 +542,7 @@ CpuIoServiceWrite (
   //\r
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
-  OperationWidth = Width & 0x03;\r
+  OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       IoWrite8 ((UINTN)Address, *Uint8Buffer);\r