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

diff --git a/PcAtChipsetPkg/KbcResetDxe/Reset.inf b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
index 5bb39a43c6d0a9d901dec37efa4f7ccf64d2cea5..6ca69ae3ea2771e0254c59237d0adc6c64eb9488 100644 (file)
--- a/PcAtChipsetPkg/KbcResetDxe/Reset.inf
+++ b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
@@ -45,6 +45,6 @@
   gEfiResetArchProtocolGuid\r
 \r
 [Depex]\r
-  gEfiCpuIoProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid\r
 \r
 \r

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
index 7cb6a6503ff7d982004f1f1dc490e63b7373a70a..105a3b0e04cf06266b7e7725da6331521bf8762a 100755 (executable)
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.h
@@ -22,7 +22,7 @@
 \r
 #include <Protocol/PciHostBridgeResourceAllocation.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
-#include <Protocol/CpuIo.h>\r
+#include <Protocol/CpuIo2.h>\r
 #include <Protocol/Metronome.h>\r
 #include <Protocol/DevicePath.h>\r
 \r

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
index f36cf9b02a6497b6356d308b4b7d0fcfa9d791b3..282e65433f6a23080867da761bf4a726713f7c05 100755 (executable)
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -47,9 +47,9 @@
 [Protocols]\r
   gEfiPciHostBridgeResourceAllocationProtocolGuid\r
   gEfiPciRootBridgeIoProtocolGuid\r
-  gEfiCpuIoProtocolGuid \r
+  gEfiCpuIo2ProtocolGuid \r
   gEfiMetronomeArchProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
 \r
 [depex]\r
-  gEfiCpuIoProtocolGuid AND gEfiMetronomeArchProtocolGuid\r
+  gEfiCpuIo2ProtocolGuid AND gEfiMetronomeArchProtocolGuid\r

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
index 11eadb40f76c876bbcd4daeaa3369fc83701f676..36f83f62e00c926f7d916d7e06ee6ed5cd0944ba 100755 (executable)
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -211,7 +211,7 @@ RootBridgeIoPciRW (
 // Memory Controller Pci Root Bridge Io Module Variables\r
 //\r
 EFI_METRONOME_ARCH_PROTOCOL *mMetronome;\r
-EFI_CPU_IO_PROTOCOL *mCpuIo;\r
+EFI_CPU_IO2_PROTOCOL *mCpuIo;\r
 \r
 EFI_STATUS\r
 RootBridgeConstructor (\r
@@ -313,7 +313,7 @@ Returns:
 \r
   Protocol->SegmentNumber  = 0;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **)&mCpuIo);\r
+  Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&mCpuIo);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = gBS->LocateProtocol (&gEfiMetronomeArchProtocolGuid, NULL, (VOID **)&mMetronome);\r