Fix a bug about the iSCSI DHCP dependency issue.

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

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index c94abe8e007666018586e700b1a593cc8af85f41..3c5c8a74b3a684f451dcf9bf7aba230a4c8bd874 100644 (file)
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
@@ -1,7 +1,7 @@
 /** @file\r
   Produces the CPU I/O PPI.\r
 \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2012, 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
@@ -12,200 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
+#include "CpuIoPei.h"\r
 \r
-#include <Ppi/CpuIo.h>\r
-\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-\r
-#define MAX_IO_PORT_ADDRESS   0xFFFF\r
-\r
-//\r
-// Function Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-CpuMemoryServiceRead (\r
-  IN  CONST EFI_PEI_SERVICES    **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI  *This,\r
-  IN  EFI_PEI_CPU_IO_PPI_WIDTH  Width,\r
-  IN  UINT64                    Address,\r
-  IN  UINTN                     Count,\r
-  OUT VOID                      *Buffer\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CpuMemoryServiceWrite (\r
-  IN CONST EFI_PEI_SERVICES    **PeiServices,\r
-  IN CONST EFI_PEI_CPU_IO_PPI  *This,\r
-  IN EFI_PEI_CPU_IO_PPI_WIDTH  Width,\r
-  IN UINT64                    Address,\r
-  IN UINTN                     Count,\r
-  IN VOID                      *Buffer\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CpuIoServiceRead (\r
-  IN  CONST EFI_PEI_SERVICES    **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI  *This,\r
-  IN  EFI_PEI_CPU_IO_PPI_WIDTH  Width,\r
-  IN  UINT64                    Address,\r
-  IN  UINTN                     Count,\r
-  OUT VOID                      *Buffer\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-CpuIoServiceWrite (\r
-  IN CONST EFI_PEI_SERVICES    **PeiServices,\r
-  IN CONST EFI_PEI_CPU_IO_PPI  *This,\r
-  IN EFI_PEI_CPU_IO_PPI_WIDTH  Width,\r
-  IN UINT64                    Address,\r
-  IN UINTN                     Count,\r
-  IN VOID                      *Buffer\r
-  );\r
-\r
-UINT8\r
-EFIAPI\r
-CpuIoRead8 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT16\r
-EFIAPI\r
-CpuIoRead16 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT32\r
-EFIAPI\r
-CpuIoRead32 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT64\r
-EFIAPI\r
-CpuIoRead64 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuIoWrite8 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT8                       Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuIoWrite16 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT16                      Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuIoWrite32 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT32                      Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuIoWrite64 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT64                      Data\r
-  );\r
-\r
-UINT8\r
-EFIAPI\r
-CpuMemRead8 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT16\r
-EFIAPI\r
-CpuMemRead16 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT32\r
-EFIAPI\r
-CpuMemRead32 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-UINT64\r
-EFIAPI\r
-CpuMemRead64 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuMemWrite8 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT8                       Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuMemWrite16 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT16                      Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuMemWrite32 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT32                      Data\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-CpuMemWrite64 (\r
-  IN  CONST EFI_PEI_SERVICES      **PeiServices,\r
-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
-  IN  UINT64                      Address,\r
-  IN  UINT64                      Data\r
-  );\r
-  \r
 //\r
 // Instance of CPU I/O PPI\r
 //\r
@@ -319,7 +127,7 @@ CpuIoCheckParameter (
   //\r
   // Check to see if Width is in the valid range\r
   //\r
-  if (Width < 0 || Width >= EfiPeiCpuIoWidthMaximum) {\r
+  if ((UINT32)Width >= EfiPeiCpuIoWidthMaximum) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r