BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / Nt32Pkg / CpuRuntimeDxe / CpuDriver.h

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 33d9c0d3827d37b83c400e236a0786f7d1e050ec..5c0eaeb520694373b2a80f9b7fda8b275d793eb9 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -1,7 +1,7 @@
 /**@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
@@ -24,21 +24,22 @@ Abstract:
 \r
 \r
 #include <FrameworkDxe.h>\r
+#include <IndustryStandard/SmBios.h>\r
 #include <Protocol/Cpu.h>\r
-#include <Protocol/DataHub.h>\r
+#include <Protocol/Smbios.h>\r
 #include <Protocol/FrameworkHii.h>\r
 #include <Guid/DataHubRecords.h>\r
-#include <Guid/DataHubProducer.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/FrameworkHiiLib.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
@@ -53,7 +54,7 @@ typedef struct {
   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
@@ -73,7 +74,7 @@ typedef struct {
 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
@@ -83,7 +84,7 @@ CpuMemoryServiceRead (
 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
@@ -93,7 +94,7 @@ CpuMemoryServiceWrite (
 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
@@ -103,7 +104,7 @@ CpuIoServiceRead (
 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