Update comment in dsc file to explain NULL library class.

[mirror_edk2.git] / UnixPkg / CpuRuntimeDxe / CpuIo.c

diff --git a/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c
index 5c3ebb2f38c2d5dee65e350fc11c0104eb05588f..4b2ae51ba76eecc2531c37ef24cb234fff195846 100644 (file)
--- a/UnixPkg/CpuRuntimeDxe/CpuIo.c
+++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c
@@ -22,11 +22,11 @@ Abstract:
   Bridge I/O Protocol.\r
 \r
 --*/\r
-#include "PiDxe.h"\r
+#include <FrameworkDxe.h>\r
 #include <Protocol/Cpu.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Guid/DataHubRecords.h>\r
-#include <Protocol/CpuIo.h>\r
+#include <Protocol/CpuIo2.h>\r
 #include <Protocol/FrameworkHii.h>\r
 \r
 #include <Library/BaseLib.h>\r
@@ -42,8 +42,6 @@ Abstract:
 #define IA32_MAX_IO_ADDRESS   0xFFFF\r
 #define IA32_MAX_MEM_ADDRESS  0xFFFFFFFF\r
 \r
-EFI_CPU_IO_PROTOCOL mCpuIoProtocol;\r
-\r
 EFI_STATUS\r
 CpuIoCheckAddressRange (\r
   IN  EFI_CPU_IO_PROTOCOL_WIDTH         Width,\r
@@ -56,7 +54,7 @@ CpuIoCheckAddressRange (
 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
@@ -111,7 +109,7 @@ Returns:
 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
@@ -165,7 +163,7 @@ Returns:
 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
@@ -226,7 +224,7 @@ Returns:
 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