diff options
Diffstat (limited to 'UnixPkg/CpuRuntimeDxe')
| -rw-r--r-- | UnixPkg/CpuRuntimeDxe/Cpu.c | 4 | ||||
| -rw-r--r-- | UnixPkg/CpuRuntimeDxe/Cpu.inf | 2 | ||||
| -rw-r--r-- | UnixPkg/CpuRuntimeDxe/CpuDriver.h | 10 | ||||
| -rw-r--r-- | UnixPkg/CpuRuntimeDxe/CpuIo.c | 12 |
4 files changed, 13 insertions, 15 deletions
diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c index 7778c43b23..cfd5c00864 100644 --- a/UnixPkg/CpuRuntimeDxe/Cpu.c +++ b/UnixPkg/CpuRuntimeDxe/Cpu.c @@ -26,7 +26,7 @@ Abstract: #include <Protocol/Cpu.h>
#include <Protocol/Smbios.h>
#include <Guid/DataHubRecords.h>
-#include <Protocol/CpuIo.h>
+#include <Protocol/CpuIo2.h>
#include <Protocol/FrameworkHii.h>
#include <Library/BaseLib.h>
@@ -540,7 +540,7 @@ Returns: Status = gBS->InstallMultipleProtocolInterfaces (
&mCpuTemplate.Handle,
&gEfiCpuArchProtocolGuid, &mCpuTemplate.Cpu,
- &gEfiCpuIoProtocolGuid, &mCpuTemplate.CpuIo,
+ &gEfiCpuIo2ProtocolGuid, &mCpuTemplate.CpuIo,
NULL
);
ASSERT_EFI_ERROR (Status);
diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf index b96249386a..c037bae61a 100644 --- a/UnixPkg/CpuRuntimeDxe/Cpu.inf +++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf @@ -60,7 +60,7 @@ gEfiUnixIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
gEfiSmbiosProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiHiiProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
- gEfiCpuIoProtocolGuid # PROTOCOL ALWAYS_PRODUCED
+ gEfiCpuIo2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED
[Depex]
diff --git a/UnixPkg/CpuRuntimeDxe/CpuDriver.h b/UnixPkg/CpuRuntimeDxe/CpuDriver.h index db25a57af0..ad6ded97b0 100644 --- a/UnixPkg/CpuRuntimeDxe/CpuDriver.h +++ b/UnixPkg/CpuRuntimeDxe/CpuDriver.h @@ -36,7 +36,7 @@ typedef struct { EFI_HANDLE Handle;
EFI_CPU_ARCH_PROTOCOL Cpu;
- EFI_CPU_IO_PROTOCOL CpuIo;
+ EFI_CPU_IO2_PROTOCOL CpuIo;
//
// Local Data for CPU interface goes here
@@ -55,7 +55,7 @@ typedef struct { EFI_STATUS
EFIAPI
CpuMemoryServiceRead (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address,
IN UINTN Count,
@@ -65,7 +65,7 @@ CpuMemoryServiceRead ( EFI_STATUS
EFIAPI
CpuMemoryServiceWrite (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address,
IN UINTN Count,
@@ -75,7 +75,7 @@ CpuMemoryServiceWrite ( EFI_STATUS
EFIAPI
CpuIoServiceRead (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress,
IN UINTN Count,
@@ -85,7 +85,7 @@ CpuIoServiceRead ( EFI_STATUS
EFIAPI
CpuIoServiceWrite (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress,
IN UINTN Count,
diff --git a/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c index 5980a03d44..4b2ae51ba7 100644 --- a/UnixPkg/CpuRuntimeDxe/CpuIo.c +++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c @@ -26,7 +26,7 @@ Abstract: #include <Protocol/Cpu.h>
#include <Protocol/DataHub.h>
#include <Guid/DataHubRecords.h>
-#include <Protocol/CpuIo.h>
+#include <Protocol/CpuIo2.h>
#include <Protocol/FrameworkHii.h>
#include <Library/BaseLib.h>
@@ -42,8 +42,6 @@ Abstract: #define IA32_MAX_IO_ADDRESS 0xFFFF
#define IA32_MAX_MEM_ADDRESS 0xFFFFFFFF
-EFI_CPU_IO_PROTOCOL mCpuIoProtocol;
-
EFI_STATUS
CpuIoCheckAddressRange (
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
@@ -56,7 +54,7 @@ CpuIoCheckAddressRange ( EFI_STATUS
EFIAPI
CpuMemoryServiceRead (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address,
IN UINTN Count,
@@ -111,7 +109,7 @@ Returns: EFI_STATUS
EFIAPI
CpuMemoryServiceWrite (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address,
IN UINTN Count,
@@ -165,7 +163,7 @@ Returns: EFI_STATUS
EFIAPI
CpuIoServiceRead (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress,
IN UINTN Count,
@@ -226,7 +224,7 @@ Returns: EFI_STATUS
EFIAPI
CpuIoServiceWrite (
- IN EFI_CPU_IO_PROTOCOL *This,
+ IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress,
IN UINTN Count,
|