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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9532 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xli24 2009-12-07 07:10:49 +00:00
parent bd2057a846
commit 5161b24d13
4 changed files with 13 additions and 15 deletions

View File

@ -26,7 +26,7 @@ Abstract:
#include <Protocol/Cpu.h> #include <Protocol/Cpu.h>
#include <Protocol/Smbios.h> #include <Protocol/Smbios.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo2.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
@ -540,7 +540,7 @@ Returns:
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&mCpuTemplate.Handle, &mCpuTemplate.Handle,
&gEfiCpuArchProtocolGuid, &mCpuTemplate.Cpu, &gEfiCpuArchProtocolGuid, &mCpuTemplate.Cpu,
&gEfiCpuIoProtocolGuid, &mCpuTemplate.CpuIo, &gEfiCpuIo2ProtocolGuid, &mCpuTemplate.CpuIo,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);

View File

@ -60,7 +60,7 @@
gEfiUnixIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED gEfiUnixIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
gEfiSmbiosProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiSmbiosProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiHiiProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiHiiProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiCpuIoProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiCpuIo2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED
[Depex] [Depex]

View File

@ -36,7 +36,7 @@ typedef struct {
EFI_HANDLE Handle; EFI_HANDLE Handle;
EFI_CPU_ARCH_PROTOCOL Cpu; EFI_CPU_ARCH_PROTOCOL Cpu;
EFI_CPU_IO_PROTOCOL CpuIo; EFI_CPU_IO2_PROTOCOL CpuIo;
// //
// Local Data for CPU interface goes here // Local Data for CPU interface goes here
@ -55,7 +55,7 @@ typedef struct {
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuMemoryServiceRead ( CpuMemoryServiceRead (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address, IN UINT64 Address,
IN UINTN Count, IN UINTN Count,
@ -65,7 +65,7 @@ CpuMemoryServiceRead (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuMemoryServiceWrite ( CpuMemoryServiceWrite (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address, IN UINT64 Address,
IN UINTN Count, IN UINTN Count,
@ -75,7 +75,7 @@ CpuMemoryServiceWrite (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuIoServiceRead ( CpuIoServiceRead (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress, IN UINT64 UserAddress,
IN UINTN Count, IN UINTN Count,
@ -85,7 +85,7 @@ CpuIoServiceRead (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuIoServiceWrite ( CpuIoServiceWrite (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress, IN UINT64 UserAddress,
IN UINTN Count, IN UINTN Count,

View File

@ -26,7 +26,7 @@ Abstract:
#include <Protocol/Cpu.h> #include <Protocol/Cpu.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo2.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
@ -42,8 +42,6 @@ Abstract:
#define IA32_MAX_IO_ADDRESS 0xFFFF #define IA32_MAX_IO_ADDRESS 0xFFFF
#define IA32_MAX_MEM_ADDRESS 0xFFFFFFFF #define IA32_MAX_MEM_ADDRESS 0xFFFFFFFF
EFI_CPU_IO_PROTOCOL mCpuIoProtocol;
EFI_STATUS EFI_STATUS
CpuIoCheckAddressRange ( CpuIoCheckAddressRange (
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
@ -56,7 +54,7 @@ CpuIoCheckAddressRange (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuMemoryServiceRead ( CpuMemoryServiceRead (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address, IN UINT64 Address,
IN UINTN Count, IN UINTN Count,
@ -111,7 +109,7 @@ Returns:
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuMemoryServiceWrite ( CpuMemoryServiceWrite (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Address, IN UINT64 Address,
IN UINTN Count, IN UINTN Count,
@ -165,7 +163,7 @@ Returns:
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuIoServiceRead ( CpuIoServiceRead (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress, IN UINT64 UserAddress,
IN UINTN Count, IN UINTN Count,
@ -226,7 +224,7 @@ Returns:
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
CpuIoServiceWrite ( CpuIoServiceWrite (
IN EFI_CPU_IO_PROTOCOL *This, IN EFI_CPU_IO2_PROTOCOL *This,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width, IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 UserAddress, IN UINT64 UserAddress,
IN UINTN Count, IN UINTN Count,