Update to consume CPU I/O 2 Protocol instead of Framework CPU I/O Protocol.

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

diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index 20597e0f77267dbb1b8c1c91f3dc1ccb80bf931b..502f56b5ad0369266455143b0b3763c553352262 100644 (file)
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -145,7 +145,7 @@
     <LibraryClasses>
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
     <LibraryClasses>
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }

-  UefiCpuPkg/CpuIoDxe/CpuIo.inf
+  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

   DuetPkg/CpuDxe/Cpu.inf
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
   PcAtChipsetPkg/KbcResetDxe/Reset.inf
   DuetPkg/CpuDxe/Cpu.inf
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
   PcAtChipsetPkg/KbcResetDxe/Reset.inf

diff --git a/DuetPkg/LegacyMetronome/Metronome.inf b/DuetPkg/LegacyMetronome/Metronome.inf
index 9f061d27b9cc4ae8105b9dc70caa54108df07a25..fe79ae18f3e1de9af99a259e0d8119c5ee266aaa 100644 (file)
--- a/DuetPkg/LegacyMetronome/Metronome.inf
+++ b/DuetPkg/LegacyMetronome/Metronome.inf
@@ -43,7 +43,7 @@
 \r
 [Protocols]\r
   gEfiMetronomeArchProtocolGuid\r
 \r
 [Protocols]\r
   gEfiMetronomeArchProtocolGuid\r

-  gEfiCpuIoProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid\r

 \r
 [Depex]\r
 \r
 [Depex]\r

-  gEfiCpuIoProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
index edb139e47e89118617473d9158afa02dea383ce9..059260c6003c2f18b7e814751fa8af0f9c57c14a 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
@@ -21,7 +21,7 @@ Abstract:
 #include "PcatPciRootBridge.h"\r
 #include "DeviceIo.h"\r
 \r
 #include "PcatPciRootBridge.h"\r
 #include "DeviceIo.h"\r
 \r

-EFI_CPU_IO_PROTOCOL *gCpuIo;\r
+EFI_CPU_IO2_PROTOCOL *gCpuIo;\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -62,7 +62,7 @@ Returns:
   //\r
   // Initialize gCpuIo now since the chipset init code requires it.\r
   //\r
   //\r
   // Initialize gCpuIo now since the chipset init code requires it.\r
   //\r

-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **)&gCpuIo);\r
+  Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&gCpuIo);\r

   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
index 23b9fd7c06460e750141e3ae995c821b08b05799..a53ec6289f0b62368e2e32666315eb1674649543 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
@@ -24,7 +24,7 @@ Abstract:
 #include <PiDxe.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/DeviceIo.h>\r
 #include <PiDxe.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/DeviceIo.h>\r

-#include <Protocol/CpuIo.h>\r
+#include <Protocol/CpuIo2.h>\r

 \r
 #include <Library/UefiLib.h>\r
 #include <Library/BaseLib.h>\r
 \r
 #include <Library/UefiLib.h>\r
 #include <Library/BaseLib.h>\r


@@ -54,7 +54,7 @@ typedef struct {
                                     \r
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL   Io;\r
                                     \r
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL   Io;\r

-  EFI_CPU_IO_PROTOCOL               *CpuIo;\r
+  EFI_CPU_IO2_PROTOCOL              *CpuIo;\r

 \r
   UINT32                            RootBridgeNumber;\r
   UINT32                            PrimaryBus;\r
 \r
   UINT32                            RootBridgeNumber;\r
   UINT32                            PrimaryBus;\r


@@ -219,6 +219,6 @@ InitializePcatPciRootBridge (
   IN EFI_SYSTEM_TABLE *SystemTable\r
   );\r
 \r
   IN EFI_SYSTEM_TABLE *SystemTable\r
   );\r
 \r

-extern EFI_CPU_IO_PROTOCOL  *gCpuIo;\r
+extern EFI_CPU_IO2_PROTOCOL  *gCpuIo;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
index 0addf7e39e02c90d36daa2ea206a3413fb0e9c8d..a9a8360fb15097eed17a3b4ecca88b05faa508ba 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
@@ -62,11 +62,11 @@
 [Protocols]\r
   gEfiPciRootBridgeIoProtocolGuid\r
   gEfiDeviceIoProtocolGuid\r
 [Protocols]\r
   gEfiPciRootBridgeIoProtocolGuid\r
   gEfiDeviceIoProtocolGuid\r

-  gEfiCpuIoProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid\r

 \r
 [Guids]\r
   gEfiPciOptionRomTableGuid\r
   gEfiPciExpressBaseAddressGuid\r
 \r
 [Depex]\r
 \r
 [Guids]\r
   gEfiPciOptionRomTableGuid\r
   gEfiPciExpressBaseAddressGuid\r
 \r
 [Depex]\r

-  gEfiCpuIoProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid\r