Program SD Cards into 4-bit mode (support for this is required in the spec). This...

[mirror_edk2.git] / UefiCpuPkg / CpuIo2Dxe / CpuIo2Dxe.c

diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
index eb1863f2f1e8d35bdb9614f8ac8e682cd6b7e3b4..c183748eea5c4f34d079dd76b291f59d52620b93 100644 (file)
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
@@ -1,8 +1,8 @@
 /** @file\r
   Produces the CPU I/O 2 Protocol.\r
 \r
-Copyright (c) 2009 - 2010, Intel Corporation\r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -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
@@ -207,7 +207,7 @@ CpuIoCheckParameter (
   // can also be the maximum integer value supported by the CPU, this range\r
   // check must be adjusted to avoid all oveflow 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