Update NT32 emulation platform to produce dummy CPU I/O 2 Protocol.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9528 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 13 insertions, 15 deletions

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 074781e6ff..804c5acdbf 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -525,7 +525,7 @@ Returns:
   Status = gBS->InstallMultipleProtocolInterfaces (

                   &mCpuTemplate.Handle,

                   &gEfiCpuArchProtocolGuid,   &mCpuTemplate.Cpu,

-                  &gEfiCpuIoProtocolGuid,     &mCpuTemplate.CpuIo,

+                  &gEfiCpuIo2ProtocolGuid,    &mCpuTemplate.CpuIo,

                   NULL

                   );

   ASSERT_EFI_ERROR (Status);

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 2cd644c489..079a6ac62a 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -29,7 +29,7 @@ Abstract:
 #include <Protocol/Smbios.h>

 #include <Protocol/FrameworkHii.h>

 #include <Guid/DataHubRecords.h>

-#include <Protocol/CpuIo.h>

+#include <Protocol/CpuIo2.h>

 #include <Protocol/WinNtIo.h>

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

@@ -53,7 +53,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

@@ -73,7 +73,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,

@@ -83,7 +83,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,

@@ -93,7 +93,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,

@@ -103,7 +103,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/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
index b513c7242d..65b694b127 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -28,8 +28,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,

@@ -42,7 +40,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,

@@ -97,7 +95,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,

@@ -151,7 +149,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,

@@ -212,7 +210,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,

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 28f116c3eb..2d8333bafa 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -56,7 +56,7 @@
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED

   gEfiSmbiosProtocolGuid                        # PROTOCOL SOMETIMES_CONSUMED

   gEfiWinNtIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

-  gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

+  gEfiCpuIo2ProtocolGuid                        # PROTOCOL ALWAYS_PRODUCED

   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

 

 [Depex]