Clean up DxeCore to remove duplicate memory allocation & device path utility services...

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Hand / Handle.c

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c
index d94fdde720a5d2b6da071cf588111dde7bffcafe..cfa103c0e5bcac1f01e2f3baa22137516a79c886 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <DxeMain.h>\r
+#include "DxeMain.h"\r
 \r
 \r
 //\r
@@ -132,7 +132,7 @@ CoreFindProtocolEntry (
   // allocate a new entry\r
   //\r
   if ((ProtEntry == NULL) && Create) {\r
-    ProtEntry = CoreAllocateBootServicesPool (sizeof(PROTOCOL_ENTRY));\r
+    ProtEntry = AllocatePool (sizeof(PROTOCOL_ENTRY));\r
 \r
     if (ProtEntry != NULL) {\r
       //\r
@@ -393,7 +393,7 @@ CoreInstallProtocolInterfaceNotify (
   //\r
   // Allocate a new protocol interface structure\r
   //\r
-  Prot = CoreAllocateZeroBootServicesPool (sizeof(PROTOCOL_INTERFACE));\r
+  Prot = AllocateZeroPool (sizeof(PROTOCOL_INTERFACE));\r
   if (Prot == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -404,7 +404,7 @@ CoreInstallProtocolInterfaceNotify (
   //\r
   Handle = (IHANDLE *)*UserHandle;\r
   if (Handle == NULL) {\r
-    Handle = CoreAllocateZeroBootServicesPool (sizeof(IHANDLE));\r
+    Handle = AllocateZeroPool (sizeof(IHANDLE));\r
     if (Handle == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
@@ -1145,7 +1145,7 @@ CoreOpenProtocol (
   //\r
   // Create new entry\r
   //\r
-  OpenData = CoreAllocateBootServicesPool (sizeof(OPEN_PROTOCOL_DATA));\r
+  OpenData = AllocatePool (sizeof(OPEN_PROTOCOL_DATA));\r
   if (OpenData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
   } else {\r
@@ -1331,7 +1331,7 @@ CoreOpenProtocolInformation (
     Size = Count * sizeof(EFI_OPEN_PROTOCOL_INFORMATION_ENTRY);\r
   }\r
 \r
-  Buffer = CoreAllocateBootServicesPool (Size);\r
+  Buffer = AllocatePool (Size);\r
   if (Buffer == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -1434,7 +1434,7 @@ CoreProtocolsPerHandle (
     goto Done;\r
   }\r
 \r
-  Buffer = CoreAllocateBootServicesPool (sizeof (EFI_GUID *) * ProtocolCount);\r
+  Buffer = AllocatePool (sizeof (EFI_GUID *) * ProtocolCount);\r
   if (Buffer == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -1505,7 +1505,7 @@ CoreConnectHandlesByKey (
     }\r
   }\r
 \r
-  HandleBuffer = CoreAllocateBootServicesPool (Count * sizeof (EFI_HANDLE));\r
+  HandleBuffer = AllocatePool (Count * sizeof (EFI_HANDLE));\r
   if (HandleBuffer == NULL) {\r
     CoreReleaseProtocolLock ();\r
     return;\r