\r
**/\r
\r
-#include "ComponentName.h"\r
+#include "InternalIsaBus.h"\r
\r
//\r
// EFI Component Name Protocol\r
#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
#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
);\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
\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
// 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
&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
&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