Update drivers 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@9524 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 6 insertions, 6 deletions

diff --git a/PcAtChipsetPkg/KbcResetDxe/Reset.inf b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
index 5bb39a43c..6ca69ae3e 100644
--- a/PcAtChipsetPkg/KbcResetDxe/Reset.inf
+++ b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
@@ -45,6 +45,6 @@
   gEfiResetArchProtocolGuid

 

 [Depex]

-  gEfiCpuIoProtocolGuid

+  gEfiCpuIo2ProtocolGuid

 

 

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
index 7cb6a6503..105a3b0e0 100755
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
@@ -22,7 +22,7 @@
 

 #include <Protocol/PciHostBridgeResourceAllocation.h>

 #include <Protocol/PciRootBridgeIo.h>

-#include <Protocol/CpuIo.h>

+#include <Protocol/CpuIo2.h>

 #include <Protocol/Metronome.h>

 #include <Protocol/DevicePath.h>

 

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
index f36cf9b02..282e65433 100755
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -47,9 +47,9 @@
 [Protocols]

   gEfiPciHostBridgeResourceAllocationProtocolGuid

   gEfiPciRootBridgeIoProtocolGuid

-  gEfiCpuIoProtocolGuid 

+  gEfiCpuIo2ProtocolGuid 

   gEfiMetronomeArchProtocolGuid

   gEfiDevicePathProtocolGuid

 

 [depex]

-  gEfiCpuIoProtocolGuid AND gEfiMetronomeArchProtocolGuid

+  gEfiCpuIo2ProtocolGuid AND gEfiMetronomeArchProtocolGuid

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
index 11eadb40f..36f83f62e 100755
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -211,7 +211,7 @@ RootBridgeIoPciRW (
 // Memory Controller Pci Root Bridge Io Module Variables

 //

 EFI_METRONOME_ARCH_PROTOCOL *mMetronome;

-EFI_CPU_IO_PROTOCOL *mCpuIo;

+EFI_CPU_IO2_PROTOCOL *mCpuIo;

 

 EFI_STATUS

 RootBridgeConstructor (

@@ -313,7 +313,7 @@ Returns:
 

   Protocol->SegmentNumber  = 0;

 

-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **)&mCpuIo);

+  Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&mCpuIo);

   ASSERT_EFI_ERROR (Status);

 

   Status = gBS->LocateProtocol (&gEfiMetronomeArchProtocolGuid, NULL, (VOID **)&mMetronome);