MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciHostBridgeDxe / PciRootBridgeIo.c

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
index 16413b60a65ec48f6271771f1e15f3e39abda32a..4c908fad885190877f0717efc4b730ecd776744b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "PciRootBridge.h"\r
 #include "PciHostResource.h"\r
 \r
-extern EDKII_IOMMU_PROTOCOL        *mIoMmuProtocol;\r
-\r
 #define NO_MAPPING  (VOID *) (UINTN) -1\r
 \r
 #define RESOURCE_VALID(Resource) ((Resource)->Base <= (Resource)->Limit)\r
@@ -1269,7 +1267,7 @@ RootBridgeIoMap (
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r
-  if (mIoMmuProtocol != NULL) {\r
+  if (mIoMmu != NULL) {\r
     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear 64bit support\r
@@ -1278,14 +1276,14 @@ RootBridgeIoMap (
         Operation = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION) (Operation - EfiPciOperationBusMasterRead64);\r
       }\r
     }\r
-    Status = mIoMmuProtocol->Map (\r
-                               mIoMmuProtocol,\r
-                               (EDKII_IOMMU_OPERATION) Operation,\r
-                               HostAddress,\r
-                               NumberOfBytes,\r
-                               DeviceAddress,\r
-                               Mapping\r
-                               );\r
+    Status = mIoMmu->Map (\r
+                       mIoMmu,\r
+                       (EDKII_IOMMU_OPERATION) Operation,\r
+                       HostAddress,\r
+                       NumberOfBytes,\r
+                       DeviceAddress,\r
+                       Mapping\r
+                       );\r
     return Status;\r
   }\r
 \r
@@ -1413,11 +1411,11 @@ RootBridgeIoUnmap (
   PCI_ROOT_BRIDGE_INSTANCE *RootBridge;\r
   EFI_STATUS                Status;\r
 \r
-  if (mIoMmuProtocol != NULL) {\r
-    Status = mIoMmuProtocol->Unmap (\r
-                               mIoMmuProtocol,\r
-                               Mapping\r
-                               );\r
+  if (mIoMmu != NULL) {\r
+    Status = mIoMmu->Unmap (\r
+                       mIoMmu,\r
+                       Mapping\r
+                       );\r
     return Status;\r
   }\r
 \r
@@ -1539,21 +1537,21 @@ RootBridgeIoAllocateBuffer (
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r
-  if (mIoMmuProtocol != NULL) {\r
+  if (mIoMmu != NULL) {\r
     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear DUAL_ADDRESS_CYCLE\r
       //\r
       Attributes &= ~((UINT64) EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE);\r
     }\r
-    Status = mIoMmuProtocol->AllocateBuffer (\r
-                               mIoMmuProtocol,\r
-                               Type,\r
-                               MemoryType,\r
-                               Pages,\r
-                               HostAddress,\r
-                               Attributes\r
-                               );\r
+    Status = mIoMmu->AllocateBuffer (\r
+                       mIoMmu,\r
+                       Type,\r
+                       MemoryType,\r
+                       Pages,\r
+                       HostAddress,\r
+                       Attributes\r
+                       );\r
     return Status;\r
   }\r
 \r
@@ -1603,12 +1601,12 @@ RootBridgeIoFreeBuffer (
 {\r
   EFI_STATUS                Status;\r
 \r
-  if (mIoMmuProtocol != NULL) {\r
-    Status = mIoMmuProtocol->FreeBuffer (\r
-                               mIoMmuProtocol,\r
-                               Pages,\r
-                               HostAddress\r
-                               );\r
+  if (mIoMmu != NULL) {\r
+    Status = mIoMmu->FreeBuffer (\r
+                       mIoMmu,\r
+                       Pages,\r
+                       HostAddress\r
+                       );\r
     return Status;\r
   }\r
 \r