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
This commit is contained in:
xli24 2009-12-07 03:25:16 +00:00
parent 54bd807967
commit 8e9778c9a4
4 changed files with 6 additions and 6 deletions

View File

@ -45,6 +45,6 @@
gEfiResetArchProtocolGuid gEfiResetArchProtocolGuid
[Depex] [Depex]
gEfiCpuIoProtocolGuid gEfiCpuIo2ProtocolGuid

View File

@ -22,7 +22,7 @@
#include <Protocol/PciHostBridgeResourceAllocation.h> #include <Protocol/PciHostBridgeResourceAllocation.h>
#include <Protocol/PciRootBridgeIo.h> #include <Protocol/PciRootBridgeIo.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo2.h>
#include <Protocol/Metronome.h> #include <Protocol/Metronome.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>

View File

@ -47,9 +47,9 @@
[Protocols] [Protocols]
gEfiPciHostBridgeResourceAllocationProtocolGuid gEfiPciHostBridgeResourceAllocationProtocolGuid
gEfiPciRootBridgeIoProtocolGuid gEfiPciRootBridgeIoProtocolGuid
gEfiCpuIoProtocolGuid gEfiCpuIo2ProtocolGuid
gEfiMetronomeArchProtocolGuid gEfiMetronomeArchProtocolGuid
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid
[depex] [depex]
gEfiCpuIoProtocolGuid AND gEfiMetronomeArchProtocolGuid gEfiCpuIo2ProtocolGuid AND gEfiMetronomeArchProtocolGuid

View File

@ -211,7 +211,7 @@ RootBridgeIoPciRW (
// Memory Controller Pci Root Bridge Io Module Variables // Memory Controller Pci Root Bridge Io Module Variables
// //
EFI_METRONOME_ARCH_PROTOCOL *mMetronome; EFI_METRONOME_ARCH_PROTOCOL *mMetronome;
EFI_CPU_IO_PROTOCOL *mCpuIo; EFI_CPU_IO2_PROTOCOL *mCpuIo;
EFI_STATUS EFI_STATUS
RootBridgeConstructor ( RootBridgeConstructor (
@ -313,7 +313,7 @@ Returns:
Protocol->SegmentNumber = 0; Protocol->SegmentNumber = 0;
Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **)&mCpuIo); Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&mCpuIo);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
Status = gBS->LocateProtocol (&gEfiMetronomeArchProtocolGuid, NULL, (VOID **)&mMetronome); Status = gBS->LocateProtocol (&gEfiMetronomeArchProtocolGuid, NULL, (VOID **)&mMetronome);