X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FLibrary%2FDxeIoLibCpuIo%2FIoLib.c;h=6aeee32cc47f80023b12780440284b425bf8ed87;hp=e124e39b6cae59ddfeaf9c75bcb4e2cc4a5e09da;hb=856500d8fdb158a7158654c62f952b90cf454b9d;hpb=53f93f7ec59b51d896a2573e74edad19cad115fb

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index e124e39b6c..6aeee32cc4 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -14,10 +14,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
 
 #include "DxeCpuIoLibInternal.h"
 
@@ -48,9 +44,9 @@ IoLibConstructor (
 {
   EFI_STATUS                        Status;
 
-  Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &mPciRootBridgeIo);
+  Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **) &mPciRootBridgeIo);
   if (EFI_ERROR (Status)) {
-    Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &mCpuIo);
+    Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);
   }
   ASSERT_EFI_ERROR (Status);
 
@@ -82,7 +78,7 @@ IoReadWorker (
   UINT64                            Data;
 
   if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, Width, Port, 1, &Data);
+    Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
   } else {
     Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
   }
@@ -117,7 +113,7 @@ IoWriteWorker (
   EFI_STATUS                        Status;
 
   if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, Width, Port, 1, &Data);
+    Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
   } else {
     Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
   }
@@ -151,7 +147,7 @@ MmioReadWorker (
   UINT64                            Data;
 
   if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
+    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
   } else {
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
   }
@@ -185,7 +181,7 @@ MmioWriteWorker (
   EFI_STATUS                        Status;
 
   if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, Width, Address, 1, &Data);
+    Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
   } else {
     Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
   }