mirror of https://github.com/acidanthera/audk.git
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
This commit is contained in:
parent
5161b24d13
commit
b6d793e37c
|
@ -145,7 +145,7 @@
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||||
}
|
}
|
||||||
UefiCpuPkg/CpuIoDxe/CpuIo.inf
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
||||||
DuetPkg/CpuDxe/Cpu.inf
|
DuetPkg/CpuDxe/Cpu.inf
|
||||||
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
||||||
PcAtChipsetPkg/KbcResetDxe/Reset.inf
|
PcAtChipsetPkg/KbcResetDxe/Reset.inf
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
[Protocols]
|
[Protocols]
|
||||||
gEfiMetronomeArchProtocolGuid
|
gEfiMetronomeArchProtocolGuid
|
||||||
gEfiCpuIoProtocolGuid
|
gEfiCpuIo2ProtocolGuid
|
||||||
|
|
||||||
[Depex]
|
[Depex]
|
||||||
gEfiCpuIoProtocolGuid
|
gEfiCpuIo2ProtocolGuid
|
||||||
|
|
|
@ -21,7 +21,7 @@ Abstract:
|
||||||
#include "PcatPciRootBridge.h"
|
#include "PcatPciRootBridge.h"
|
||||||
#include "DeviceIo.h"
|
#include "DeviceIo.h"
|
||||||
|
|
||||||
EFI_CPU_IO_PROTOCOL *gCpuIo;
|
EFI_CPU_IO2_PROTOCOL *gCpuIo;
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -62,7 +62,7 @@ Returns:
|
||||||
//
|
//
|
||||||
// Initialize gCpuIo now since the chipset init code requires it.
|
// 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);
|
ASSERT_EFI_ERROR (Status);
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -24,7 +24,7 @@ Abstract:
|
||||||
#include <PiDxe.h>
|
#include <PiDxe.h>
|
||||||
#include <Protocol/PciRootBridgeIo.h>
|
#include <Protocol/PciRootBridgeIo.h>
|
||||||
#include <Protocol/DeviceIo.h>
|
#include <Protocol/DeviceIo.h>
|
||||||
#include <Protocol/CpuIo.h>
|
#include <Protocol/CpuIo2.h>
|
||||||
|
|
||||||
#include <Library/UefiLib.h>
|
#include <Library/UefiLib.h>
|
||||||
#include <Library/BaseLib.h>
|
#include <Library/BaseLib.h>
|
||||||
|
@ -54,7 +54,7 @@ typedef struct {
|
||||||
|
|
||||||
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
|
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
|
||||||
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL Io;
|
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL Io;
|
||||||
EFI_CPU_IO_PROTOCOL *CpuIo;
|
EFI_CPU_IO2_PROTOCOL *CpuIo;
|
||||||
|
|
||||||
UINT32 RootBridgeNumber;
|
UINT32 RootBridgeNumber;
|
||||||
UINT32 PrimaryBus;
|
UINT32 PrimaryBus;
|
||||||
|
@ -219,6 +219,6 @@ InitializePcatPciRootBridge (
|
||||||
IN EFI_SYSTEM_TABLE *SystemTable
|
IN EFI_SYSTEM_TABLE *SystemTable
|
||||||
);
|
);
|
||||||
|
|
||||||
extern EFI_CPU_IO_PROTOCOL *gCpuIo;
|
extern EFI_CPU_IO2_PROTOCOL *gCpuIo;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -62,11 +62,11 @@
|
||||||
[Protocols]
|
[Protocols]
|
||||||
gEfiPciRootBridgeIoProtocolGuid
|
gEfiPciRootBridgeIoProtocolGuid
|
||||||
gEfiDeviceIoProtocolGuid
|
gEfiDeviceIoProtocolGuid
|
||||||
gEfiCpuIoProtocolGuid
|
gEfiCpuIo2ProtocolGuid
|
||||||
|
|
||||||
[Guids]
|
[Guids]
|
||||||
gEfiPciOptionRomTableGuid
|
gEfiPciOptionRomTableGuid
|
||||||
gEfiPciExpressBaseAddressGuid
|
gEfiPciExpressBaseAddressGuid
|
||||||
|
|
||||||
[Depex]
|
[Depex]
|
||||||
gEfiCpuIoProtocolGuid
|
gEfiCpuIo2ProtocolGuid
|
||||||
|
|
Loading…
Reference in New Issue