-/*++\r
+/**@file\r
\r
-Copyright (c) 2006, Intel Corporation \r
-All rights reserved. This program and the accompanying materials \r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
http://opensource.org/licenses/bsd-license.php \r
\r
NT Emulation Architectural Protocol Driver as defined in Tiano.\r
\r
---*/\r
+**/\r
\r
#ifndef _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
#define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
\r
\r
#include <FrameworkDxe.h>\r
+#include <IndustryStandard/SmBios.h>\r
#include <Protocol/Cpu.h>\r
-#include <Protocol/DataHub.h>\r
-#include <Protocol/HiiFramework.h>\r
+#include <Protocol/Smbios.h>\r
+#include <Protocol/FrameworkHii.h>\r
#include <Guid/DataHubRecords.h>\r
-#include <Protocol/CpuIo.h>\r
+#include <Protocol/CpuIo2.h>\r
#include <Protocol/WinNtIo.h>\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
-#include <Library/HiiLibFramework.h>\r
+#include <Library/HiiLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/PcdLib.h>\r
+#include <Library/WinNtLib.h>\r
\r
\r
extern UINT8 CpuStrings[];\r
//\r
// Internal Data Structures\r
//\r
-#define CPU_ARCH_PROT_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('c', 'a', 'p', 'd')\r
+#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')\r
\r
typedef struct {\r
UINTN Signature;\r
EFI_HANDLE Handle;\r
\r
EFI_CPU_ARCH_PROTOCOL Cpu;\r
- EFI_CPU_IO_PROTOCOL CpuIo;\r
+ EFI_CPU_IO2_PROTOCOL CpuIo;\r
\r
//\r
// Local Data for CPU interface goes here\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceRead (\r
- IN EFI_CPU_IO_PROTOCOL *This,\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
IN UINT64 Address,\r
IN UINTN Count,\r
EFI_STATUS\r
EFIAPI\r
CpuMemoryServiceWrite (\r
- IN EFI_CPU_IO_PROTOCOL *This,\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
IN UINT64 Address,\r
IN UINTN Count,\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceRead (\r
- IN EFI_CPU_IO_PROTOCOL *This,\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
IN UINT64 UserAddress,\r
IN UINTN Count,\r
EFI_STATUS\r
EFIAPI\r
CpuIoServiceWrite (\r
- IN EFI_CPU_IO_PROTOCOL *This,\r
+ IN EFI_CPU_IO2_PROTOCOL *This,\r
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,\r
IN UINT64 UserAddress,\r
IN UINTN Count,\r