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

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

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 8d7b3d03ef2600e9c18314242759a81fc305a921..85542f2b2e02ef1752e1af3c63fa47d92e29bb57 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -193,7 +193,7 @@ EfiPxeBcDhcp (
   //\r
   // Set the DHCP4 config data.\r
   //\r
-  NetZeroMem (&Dhcp4CfgData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
+  ZeroMem (&Dhcp4CfgData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
   Dhcp4CfgData.OptionCount      = OptCount;\r
   Dhcp4CfgData.OptionList       = OptList;\r
   Dhcp4CfgData.Dhcp4Callback    = PxeBcDhcpCallBack;\r
@@ -216,8 +216,8 @@ EfiPxeBcDhcp (
     //\r
     Private->NumOffers   = 0;\r
     Private->BootpIndex  = 0;\r
-    NetZeroMem (Private->ServerCount, sizeof (Private->ServerCount));\r
-    NetZeroMem (Private->ProxyIndex, sizeof (Private->ProxyIndex));\r
+    ZeroMem (Private->ServerCount, sizeof (Private->ServerCount));\r
+    ZeroMem (Private->ProxyIndex, sizeof (Private->ProxyIndex));\r
 \r
     Status = Dhcp4->Start (Dhcp4, NULL);\r
     if (EFI_ERROR (Status)) {\r
@@ -241,9 +241,9 @@ EfiPxeBcDhcp (
 \r
     ASSERT (Dhcp4Mode.State == Dhcp4Bound);\r
 \r
-    NetCopyMem (&Private->StationIp, &Dhcp4Mode.ClientAddress, sizeof (EFI_IPv4_ADDRESS));\r
-    NetCopyMem (&Private->SubnetMask, &Dhcp4Mode.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
-    NetCopyMem (&Private->GatewayIp, &Dhcp4Mode.RouterAddress, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Private->StationIp, &Dhcp4Mode.ClientAddress, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Private->SubnetMask, &Dhcp4Mode.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Private->GatewayIp, &Dhcp4Mode.RouterAddress, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     //\r
     // Check the selected offer to see whether BINL is required, if no or BINL is\r
@@ -262,7 +262,7 @@ EfiPxeBcDhcp (
     //\r
     // Remove the previously configured option list and callback function\r
     //\r
-    NetZeroMem (&Dhcp4CfgData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
+    ZeroMem (&Dhcp4CfgData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
     Dhcp4->Configure (Dhcp4, &Dhcp4CfgData);\r
 \r
     Private->AddressIsOk = TRUE;\r
@@ -385,7 +385,7 @@ EfiPxeBcDiscover (
       //\r
       // Get the multicast discover ip address from vendor option.\r
       //\r
-      NetCopyMem (&DefaultInfo.ServerMCastIp.Addr, &VendorOpt->DiscoverMcastIp, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&DefaultInfo.ServerMCastIp.Addr, &VendorOpt->DiscoverMcastIp, sizeof (EFI_IPv4_ADDRESS));\r
     }\r
 \r
     DefaultInfo.IpCnt = 0;\r
@@ -444,7 +444,7 @@ EfiPxeBcDiscover (
       if (BootSvrEntry == NULL) {\r
         Private->ServerIp.Addr[0] = SrvList[Index].IpAddr.Addr[0];\r
       } else {\r
-        NetCopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));\r
+        CopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));\r
       }\r
 \r
       Status = PxeBcDiscvBootService (\r
@@ -497,7 +497,7 @@ EfiPxeBcDiscover (
   }\r
 \r
   if (Mode->PxeBisReplyReceived) {\r
-    NetCopyMem (&Private->ServerIp, &Mode->PxeReply.Dhcpv4.BootpSiAddr, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Private->ServerIp, &Mode->PxeReply.Dhcpv4.BootpSiAddr, sizeof (EFI_IPv4_ADDRESS));\r
   }\r
 \r
   return Status;\r
@@ -568,10 +568,10 @@ EfiPxeBcMtftp (
   Mtftp4Config.TimeoutValue      = PXEBC_MTFTP_TIMEOUT;\r
   Mtftp4Config.TryCount          = PXEBC_MTFTP_RETRIES;\r
 \r
-  NetCopyMem (&Mtftp4Config.StationIp, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&Mtftp4Config.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&Mtftp4Config.GatewayIp, &Private->GatewayIp, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&Mtftp4Config.ServerIp, ServerIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Mtftp4Config.StationIp, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Mtftp4Config.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Mtftp4Config.GatewayIp, &Private->GatewayIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Mtftp4Config.ServerIp, ServerIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   switch (Operation) {\r
 \r
@@ -769,13 +769,13 @@ EfiPxeBcUdpWrite (
   ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));\r
   ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));\r
 \r
-  NetCopyMem (&Udp4Session.DestinationAddress, DestIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Udp4Session.DestinationAddress, DestIp, sizeof (EFI_IPv4_ADDRESS));\r
   Udp4Session.DestinationPort = *DestPort;\r
-  NetCopyMem (&Udp4Session.SourceAddress, SrcIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Udp4Session.SourceAddress, SrcIp, sizeof (EFI_IPv4_ADDRESS));\r
   Udp4Session.SourcePort = *SrcPort;\r
 \r
   FragCount = (HeaderSize != NULL) ? 2 : 1;\r
-  Udp4TxData = (EFI_UDP4_TRANSMIT_DATA *) NetAllocatePool (sizeof (EFI_UDP4_TRANSMIT_DATA) + (FragCount - 1) * sizeof (EFI_UDP4_FRAGMENT_DATA));\r
+  Udp4TxData = (EFI_UDP4_TRANSMIT_DATA *) AllocatePool (sizeof (EFI_UDP4_TRANSMIT_DATA) + (FragCount - 1) * sizeof (EFI_UDP4_FRAGMENT_DATA));\r
   if (Udp4TxData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -799,7 +799,7 @@ EfiPxeBcUdpWrite (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   PxeBcCommonNotify,\r
                   &IsDone,\r
                   &Token.Event\r
@@ -826,7 +826,7 @@ ON_EXIT:
     gBS->CloseEvent (Token.Event);\r
   }\r
 \r
-  NetFreePool (Udp4TxData);\r
+  gBS->FreePool (Udp4TxData);\r
 \r
   return Status;\r
 }\r
@@ -928,7 +928,7 @@ EfiPxeBcUdpRead (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   PxeBcCommonNotify,\r
                   &IsDone,\r
                   &Token.Event\r
@@ -968,7 +968,7 @@ EfiPxeBcUdpRead (
       Matched = TRUE;\r
 \r
       if (DestIp != NULL) {\r
-        NetCopyMem (DestIp, &Session->DestinationAddress, sizeof (EFI_IPv4_ADDRESS));\r
+        CopyMem (DestIp, &Session->DestinationAddress, sizeof (EFI_IPv4_ADDRESS));\r
       }\r
     } else {\r
       if (DestIp != NULL) {\r
@@ -1006,7 +1006,7 @@ EfiPxeBcUdpRead (
       if (OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) {\r
 \r
         if (SrcIp != NULL) {\r
-          NetCopyMem (SrcIp, &Session->SourceAddress, sizeof (EFI_IPv4_ADDRESS));\r
+          CopyMem (SrcIp, &Session->SourceAddress, sizeof (EFI_IPv4_ADDRESS));\r
         }\r
       } else {\r
 \r
@@ -1039,7 +1039,7 @@ EfiPxeBcUdpRead (
 \r
       if (HeaderSize != NULL) {\r
         CopyLen = MIN (*HeaderSize, RxData->DataLength);\r
-        NetCopyMem (HeaderPtr, RxData->FragmentTable[0].FragmentBuffer, CopyLen);\r
+        CopyMem (HeaderPtr, RxData->FragmentTable[0].FragmentBuffer, CopyLen);\r
         *HeaderSize = CopyLen;\r
       }\r
 \r
@@ -1049,7 +1049,7 @@ EfiPxeBcUdpRead (
       } else {\r
 \r
         *BufferSize = RxData->DataLength - CopyLen;\r
-        NetCopyMem (BufferPtr, (UINT8 *) RxData->FragmentTable[0].FragmentBuffer + CopyLen, *BufferSize);\r
+        CopyMem (BufferPtr, (UINT8 *) RxData->FragmentTable[0].FragmentBuffer + CopyLen, *BufferSize);\r
       }\r
     } else {\r
 \r
@@ -1397,27 +1397,27 @@ EfiPxeBcSetPackets (
   }\r
 \r
   if (NewDhcpDiscover != NULL) {\r
-    NetCopyMem (&Mode->DhcpDiscover, NewDhcpDiscover, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->DhcpDiscover, NewDhcpDiscover, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   if (NewDhcpAck != NULL) {\r
-    NetCopyMem (&Mode->DhcpAck, NewDhcpAck, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->DhcpAck, NewDhcpAck, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   if (NewProxyOffer != NULL) {\r
-    NetCopyMem (&Mode->ProxyOffer, NewProxyOffer, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->ProxyOffer, NewProxyOffer, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   if (NewPxeDiscover != NULL) {\r
-    NetCopyMem (&Mode->PxeDiscover, NewPxeDiscover, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->PxeDiscover, NewPxeDiscover, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   if (NewPxeReply != NULL) {\r
-    NetCopyMem (&Mode->PxeReply, NewPxeReply, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->PxeReply, NewPxeReply, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   if (NewPxeBisReply != NULL) {\r
-    NetCopyMem (&Mode->PxeBisReply, NewPxeBisReply, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+    CopyMem (&Mode->PxeBisReply, NewPxeBisReply, sizeof (EFI_PXE_BASE_CODE_PACKET));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -1623,12 +1623,12 @@ DiscoverBootFile (
     Packet = &Private->Dhcp4Ack;\r
   }\r
 \r
-  NetCopyMem (&Private->ServerIp, &Packet->Packet.Offer.Dhcp4.Header.ServerAddr, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Private->ServerIp, &Packet->Packet.Offer.Dhcp4.Header.ServerAddr, sizeof (EFI_IPv4_ADDRESS));\r
   if (Private->ServerIp.Addr[0] == 0) {\r
     //\r
     // next server ip address is zero, use option 54 instead\r
     //\r
-    NetCopyMem (\r
+    CopyMem (\r
       &Private->ServerIp,\r
       Packet->Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_SERVER_ID]->Data,\r
       sizeof (EFI_IPv4_ADDRESS)\r
@@ -1646,7 +1646,7 @@ DiscoverBootFile (
     //\r
     // Already have the bootfile length option, compute the file size\r
     //\r
-    NetCopyMem (&Value, Packet->Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_BOOTFILE_LEN]->Data, sizeof (Value));\r
+    CopyMem (&Value, Packet->Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_BOOTFILE_LEN]->Data, sizeof (Value));\r
     Value       = NTOHS (Value);\r
     *BufferSize = 512 * Value;\r
     Status      = EFI_BUFFER_TOO_SMALL;\r