Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / UefiPxeBcDxe / PxeBcDriver.c

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index 546e6aee811035002256661fa56d6b148336966a..d6907955a5b7510573b747bda69457496d8ba895 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2007, Intel Corporation\r
+Copyright (c) 2007 - 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -141,7 +141,7 @@ PxeBcDriverBindingStart (
   UINTN               Index;\r
   EFI_STATUS          Status;\r
 \r
-  Private = NetAllocateZeroPool (sizeof (PXEBC_PRIVATE_DATA));\r
+  Private = AllocateZeroPool (sizeof (PXEBC_PRIVATE_DATA));\r
   if (Private == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -246,7 +246,7 @@ PxeBcDriverBindingStart (
     goto ON_ERROR;\r
   }\r
 \r
-  NetZeroMem (&Private->Udp4CfgData, sizeof (EFI_UDP4_CONFIG_DATA));\r
+  ZeroMem (&Private->Udp4CfgData, sizeof (EFI_UDP4_CONFIG_DATA));\r
   Private->Udp4CfgData.AcceptBroadcast    = TRUE;\r
   Private->Udp4CfgData.AcceptPromiscuous  = FALSE;\r
   Private->Udp4CfgData.AcceptAnyPort      = FALSE;\r
@@ -285,7 +285,7 @@ ON_ERROR:
     NetLibDestroyServiceChild (\r
       ControllerHandle,\r
       This->DriverBindingHandle,\r
-      &gEfiUdp4ProtocolGuid,\r
+      &gEfiUdp4ServiceBindingProtocolGuid,\r
       Private->Udp4Child\r
       );\r
   }\r
@@ -301,7 +301,7 @@ ON_ERROR:
     NetLibDestroyServiceChild (\r
       ControllerHandle,\r
       This->DriverBindingHandle,\r
-      &gEfiMtftp4ProtocolGuid,\r
+      &gEfiMtftp4ServiceBindingProtocolGuid,\r
       Private->Mtftp4Child\r
       );\r
   }\r
@@ -317,12 +317,12 @@ ON_ERROR:
     NetLibDestroyServiceChild (\r
       ControllerHandle,\r
       This->DriverBindingHandle,\r
-      &gEfiDhcp4ProtocolGuid,\r
+      &gEfiDhcp4ServiceBindingProtocolGuid,\r
       Private->Dhcp4Child\r
       );\r
   }\r
 \r
-  NetFreePool (Private);\r
+  gBS->FreePool (Private);\r
 \r
   return Status;\r
 }\r
@@ -398,10 +398,10 @@ PxeBcDriverBindingStop (
           Private->Udp4Child,\r
           &gEfiUdp4ProtocolGuid,\r
           This->DriverBindingHandle,\r
-          ControllerHandle\r
+          NicHandle\r
           );\r
     NetLibDestroyServiceChild (\r
-      ControllerHandle,\r
+      NicHandle,\r
       This->DriverBindingHandle,\r
       &gEfiUdp4ServiceBindingProtocolGuid,\r
       Private->Udp4Child\r
@@ -411,10 +411,10 @@ PxeBcDriverBindingStop (
           Private->Dhcp4Child,\r
           &gEfiDhcp4ProtocolGuid,\r
           This->DriverBindingHandle,\r
-          ControllerHandle\r
+          NicHandle\r
           );\r
     NetLibDestroyServiceChild (\r
-      ControllerHandle,\r
+      NicHandle,\r
       This->DriverBindingHandle,\r
       &gEfiDhcp4ServiceBindingProtocolGuid,\r
       Private->Dhcp4Child\r
@@ -424,16 +424,16 @@ PxeBcDriverBindingStop (
           Private->Mtftp4Child,\r
           &gEfiMtftp4ProtocolGuid,\r
           This->DriverBindingHandle,\r
-          ControllerHandle\r
+          NicHandle\r
           );\r
     NetLibDestroyServiceChild (\r
-      ControllerHandle,\r
+      NicHandle,\r
       This->DriverBindingHandle,\r
       &gEfiMtftp4ServiceBindingProtocolGuid,\r
       Private->Mtftp4Child\r
       );\r
 \r
-    NetFreePool (Private);\r
+    gBS->FreePool (Private);\r
   }\r
 \r
   return Status;\r