ISA Bus code scrub.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
index 7c614b558cd34bb252818abe32f0894d26b3b6aa..bbf262d5177b80c835816e3139f402cbba872ed8 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "ComponentName.h"\r
+#include "InternalIsaBus.h"\r
 \r
 //\r
 // EFI Component Name Protocol\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
index c198d870c688055f81bbf550b8d5f04f9e17dd9f..301142698b782c81d672c9e72bdef3a59d97b06d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _COMPONENT_NAME_H_\r
 #define _COMPONENT_NAME_H_\r
 \r
-#include "InternalIsaBus.h"\r
-\r
 extern EFI_COMPONENT_NAME_PROTOCOL   gIsaBusComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gIsaBusComponentName2;\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index ad2f945d477f57d8c6c51814989eeb9c16cdbdb1..672e449cf9228ee8520b1043a596ae07a47dc523 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
@@ -16,8 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _INTERNAL_ISA_BUS_H_\r
 \r
 \r
-#include <PiDxe.h>\r
-#include <FrameworkDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/ComponentName.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
index e189ed7576e33564ef66bc29ef6b53813fdd5c3e..8cf9ac9c2cfc0f2ace0b1572cfe5f921cce20500 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
@@ -522,8 +522,8 @@ IsaBusControllerDriverStop (
                       );\r
 \r
       if (!EFI_ERROR (Status)) {\r
-        gBS->FreePool (IsaIoDevice->DevicePath);\r
-        gBS->FreePool (IsaIoDevice);\r
+        FreePool (IsaIoDevice->DevicePath);\r
+        FreePool (IsaIoDevice);\r
       } else {\r
         //\r
         // Re-open PCI IO Protocol on behalf of the child device\r
@@ -660,10 +660,10 @@ Done:
 \r
   if (EFI_ERROR (Status)) {\r
     if (IsaIoDevice->DevicePath != NULL) {\r
-      gBS->FreePool (IsaIoDevice->DevicePath);\r
+      FreePool (IsaIoDevice->DevicePath);\r
     }\r
 \r
-    gBS->FreePool (IsaIoDevice);\r
+    FreePool (IsaIoDevice);\r
   }\r
 \r
   return Status;\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index 99295f48c41e79c77e57a846d49e3b942b7d0ecb..815fa6bcab900f53fbfbc5458771f3d3f265cab8 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -387,7 +387,7 @@ IsaIoUnmap (
     // Free the mapped buffer and the MAP_INFO structure.\r
     //\r
     gBS->FreePages (IsaMapInfo->MappedHostAddress, IsaMapInfo->NumberOfPages);\r
-    gBS->FreePool (IsaMapInfo);\r
+    FreePool (IsaMapInfo);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -822,7 +822,7 @@ IsaIoMapOnlySupportSlaveReadWrite (
                     &IsaMapInfo->MappedHostAddress\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      gBS->FreePool (IsaMapInfo);\r
+      FreePool (IsaMapInfo);\r
       *NumberOfBytes  = 0;\r
       *Mapping        = NULL;\r
       return Status;\r
@@ -1129,7 +1129,7 @@ IsaIoMapFullSupport (
                     &IsaMapInfo->MappedHostAddress\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      gBS->FreePool (IsaMapInfo);\r
+      FreePool (IsaMapInfo);\r
       *NumberOfBytes  = 0;\r
       *Mapping        = NULL;\r
       return Status;\r