Modified to pass EBC build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3320 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
index dba120eada77ee00c0af6db76cd92f7f0ef9324f..51079ddc4653cda44544b92ff45eed6db51b27e9 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
@@ -60,6 +60,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r


@@ -84,4 +85,4 @@
 \r
 [Protocols]\r
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED\r

-\r
+  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
index 0ee234ec26ea55b343344e2913051eb6e40013f3..0466a35a1797eb4ae202d40ddcd796e1717b155e 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
@@ -49,6 +49,9 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Protocols>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index e43c173bb1b7f9c75378ebb81e9a554990c80fd3..6aeee32cc47f80023b12780440284b425bf8ed87 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -44,9 +44,9 @@ IoLibConstructor (
 {\r
   EFI_STATUS                        Status;\r
 \r
 {\r
   EFI_STATUS                        Status;\r
 \r

-  Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &mPciRootBridgeIo);\r
+  Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **) &mPciRootBridgeIo);\r

   if (EFI_ERROR (Status)) {\r
   if (EFI_ERROR (Status)) {\r

-    Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &mCpuIo);\r
+    Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);\r

   }\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   }\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -78,7 +78,7 @@ IoReadWorker (
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r

-    Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, Width, Port, 1, &Data);\r
+    Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);\r

   } else {\r
     Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);\r
   }\r
   } else {\r
     Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);\r
   }\r


@@ -113,7 +113,7 @@ IoWriteWorker (
   EFI_STATUS                        Status;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r
   EFI_STATUS                        Status;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r

-    Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, Width, Port, 1, &Data);\r
+    Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);\r

   } else {\r
     Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);\r
   }\r
   } else {\r
     Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);\r
   }\r


@@ -147,7 +147,7 @@ MmioReadWorker (
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r

-    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);\r
+    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);\r

   } else {\r
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);\r
   }\r
   } else {\r
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);\r
   }\r


@@ -181,7 +181,7 @@ MmioWriteWorker (
   EFI_STATUS                        Status;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r
   EFI_STATUS                        Status;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r

-    Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, Width, Address, 1, &Data);\r
+    Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);\r

   } else {\r
     Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);\r
   }\r
   } else {\r
     Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);\r
   }\r