From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 7 Dec 2009 12:48:53 +0000 (+0000)
Subject: Update to consume CPU I/O 2 Protocol instead of Framework CPU I/O Protocol.
X-Git-Tag: edk2-stable201903~16788
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=b6d793e37c6e675cc77f502a24ffc49dd77dde8f

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 20597e0f77..502f56b5ad 100644
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -145,7 +145,7 @@
     <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
diff --git a/DuetPkg/LegacyMetronome/Metronome.inf b/DuetPkg/LegacyMetronome/Metronome.inf
index 9f061d27b9..fe79ae18f3 100644
--- a/DuetPkg/LegacyMetronome/Metronome.inf
+++ b/DuetPkg/LegacyMetronome/Metronome.inf
@@ -43,7 +43,7 @@
 
 [Protocols]
   gEfiMetronomeArchProtocolGuid
-  gEfiCpuIoProtocolGuid
+  gEfiCpuIo2ProtocolGuid
 
 [Depex]
-  gEfiCpuIoProtocolGuid
+  gEfiCpuIo2ProtocolGuid
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
index edb139e47e..059260c600 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
@@ -21,7 +21,7 @@ Abstract:
 #include "PcatPciRootBridge.h"
 #include "DeviceIo.h"
 
-EFI_CPU_IO_PROTOCOL *gCpuIo;
+EFI_CPU_IO2_PROTOCOL *gCpuIo;
 
 EFI_STATUS
 EFIAPI
@@ -62,7 +62,7 @@ Returns:
   //
   // Initialize gCpuIo now since the chipset init code requires it.
   //
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **)&gCpuIo);
+  Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&gCpuIo);
   ASSERT_EFI_ERROR (Status);
 
   //
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
index 23b9fd7c06..a53ec6289f 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
@@ -24,7 +24,7 @@ Abstract:
 #include <PiDxe.h>
 #include <Protocol/PciRootBridgeIo.h>
 #include <Protocol/DeviceIo.h>
-#include <Protocol/CpuIo.h>
+#include <Protocol/CpuIo2.h>
 
 #include <Library/UefiLib.h>
 #include <Library/BaseLib.h>
@@ -54,7 +54,7 @@ typedef struct {
                                     
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL   Io;
-  EFI_CPU_IO_PROTOCOL               *CpuIo;
+  EFI_CPU_IO2_PROTOCOL              *CpuIo;
 
   UINT32                            RootBridgeNumber;
   UINT32                            PrimaryBus;
@@ -219,6 +219,6 @@ InitializePcatPciRootBridge (
   IN EFI_SYSTEM_TABLE *SystemTable
   );
 
-extern EFI_CPU_IO_PROTOCOL  *gCpuIo;
+extern EFI_CPU_IO2_PROTOCOL  *gCpuIo;
 
 #endif
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
index 0addf7e39e..a9a8360fb1 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
@@ -62,11 +62,11 @@
 [Protocols]
   gEfiPciRootBridgeIoProtocolGuid
   gEfiDeviceIoProtocolGuid
-  gEfiCpuIoProtocolGuid
+  gEfiCpuIo2ProtocolGuid
 
 [Guids]
   gEfiPciOptionRomTableGuid
   gEfiPciExpressBaseAddressGuid
 
 [Depex]
-  gEfiCpuIoProtocolGuid
+  gEfiCpuIo2ProtocolGuid