BeagleBoardPkg: Removing ipf which is no longer supported from edk2.

[mirror_edk2.git] / DuetPkg / PciRootBridgeNoEnumerationDxe / Ipf / PcatIo.c

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
index 9979d47c4e0a8b7a46a6434a3c47b3650892d15f..97857c298186e7ef1a41895647d9e815afd7cd3a 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2005, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2005 - 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
 http://opensource.org/licenses/bsd-license.php                                            \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


@@ -21,7 +21,7 @@ Revision History
 --*/\r
 \r
 #include "PcatPciRootBridge.h"\r
 --*/\r
 \r
 #include "PcatPciRootBridge.h"\r

-#include "pci22.h"\r
+#include <IndustryStandard/Pci.h>\r

 #include "SalProc.h"\r
 \r
 #include EFI_GUID_DEFINITION (SalSystemTable)\r
 #include "SalProc.h"\r
 \r
 #include EFI_GUID_DEFINITION (SalSystemTable)\r


@@ -46,8 +46,8 @@ Revision History
 //\r
 // Local variables for performing SAL Proc calls\r
 //\r
 //\r
 // Local variables for performing SAL Proc calls\r
 //\r

-static PLABEL         mSalProcPlabel;\r
-static CALL_SAL_PROC  mGlobalSalProc;\r
+PLABEL         mSalProcPlabel;\r
+CALL_SAL_PROC  mGlobalSalProc;\r

 \r
 EFI_STATUS\r
 PcatRootBridgeIoIoRead (\r
 \r
 EFI_STATUS\r
 PcatRootBridgeIoIoRead (\r


@@ -59,8 +59,8 @@ PcatRootBridgeIoIoRead (
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE *PrivateData;\r
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE *PrivateData;\r

-  UINTN                                InStride;\r
-  UINTN                                OutStride;\r
+  UINTN                         InStride;\r
+  UINTN                         OutStride;\r

   UINTN                         AlignMask;\r
   UINTN                         Address;\r
   PTR                           Buffer;\r
   UINTN                         AlignMask;\r
   UINTN                         Address;\r
   PTR                           Buffer;\r


@@ -81,7 +81,7 @@ PcatRootBridgeIoIoRead (
     return EFI_INVALID_PARAMETER;\r
   }\r
     \r
     return EFI_INVALID_PARAMETER;\r
   }\r
     \r

-  if (Width < 0 || Width >= EfiPciWidthMaximum) {\r
+  if ((UINT32)Width >= EfiPciWidthMaximum) {\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -163,9 +163,9 @@ PcatRootBridgeIoIoWrite (
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE  *PrivateData;\r
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE  *PrivateData;\r

-  UINTN                                 InStride;\r
-  UINTN                                 OutStride;\r
-  UINTN                                 AlignMask;\r
+  UINTN                          InStride;\r
+  UINTN                          OutStride;\r
+  UINTN                          AlignMask;\r

   UINTN                          Address;\r
   PTR                            Buffer;\r
   UINT16                         Data16;\r
   UINTN                          Address;\r
   PTR                            Buffer;\r
   UINT16                         Data16;\r


@@ -318,9 +318,9 @@ PcatRootBridgeIoPciRW (
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE  *PrivateData;\r
   )\r
 {\r
   PCAT_PCI_ROOT_BRIDGE_INSTANCE  *PrivateData;\r

-  UINTN                                 AlignMask;\r
-  UINTN                                 InStride;\r
-  UINTN                                 OutStride;\r
+  UINTN                          AlignMask;\r
+  UINTN                          InStride;\r
+  UINTN                          OutStride;\r

   UINT64                         Address;\r
   DEFIO_PCI_ADDR                 *Defio;\r
   PTR                            Buffer;\r
   UINT64                         Address;\r
   DEFIO_PCI_ADDR                 *Defio;\r
   PTR                            Buffer;\r