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

[mirror_edk2.git] / MdeModulePkg / Library / DxeNetLib / DxeNetLib.c

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index ee8b6797e5dc4b11bd5abaafe986c0a1f656cac2..b813db37ccae2fb46d1c88c4abe384b51b691509 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -255,7 +255,7 @@ NetGetUint32 (
 {\r
   UINT32                    Value;\r
 \r
-  NetCopyMem (&Value, Buf, sizeof (UINT32));\r
+  CopyMem (&Value, Buf, sizeof (UINT32));\r
   return NTOHL (Value);\r
 }\r
 \r
@@ -277,7 +277,7 @@ NetPutUint32 (
   )\r
 {\r
   Data = HTONL (Data);\r
-  NetCopyMem (Buf, &Data, sizeof (UINT32));\r
+  CopyMem (Buf, &Data, sizeof (UINT32));\r
 }\r
 \r
 \r
@@ -289,16 +289,16 @@ NetPutUint32 (
   @return The entry that is removed from the list, NULL if the list is empty.\r
 \r
 **/\r
-NET_LIST_ENTRY *\r
+LIST_ENTRY *\r
 NetListRemoveHead (\r
-  NET_LIST_ENTRY            *Head\r
+  LIST_ENTRY            *Head\r
   )\r
 {\r
-  NET_LIST_ENTRY            *First;\r
+  LIST_ENTRY            *First;\r
 \r
   ASSERT (Head != NULL);\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     return NULL;\r
   }\r
 \r
@@ -307,8 +307,8 @@ NetListRemoveHead (
   First->ForwardLink->BackLink  = Head;\r
 \r
   DEBUG_CODE (\r
-    First->ForwardLink  = (LIST_ENTRY     *) NULL;\r
-    First->BackLink     = (LIST_ENTRY     *) NULL;\r
+    First->ForwardLink  = (LIST_ENTRY *) NULL;\r
+    First->BackLink     = (LIST_ENTRY *) NULL;\r
   );\r
 \r
   return First;\r
@@ -323,16 +323,16 @@ NetListRemoveHead (
   @return The entry that is removed from the list, NULL if the list is empty.\r
 \r
 **/\r
-NET_LIST_ENTRY *\r
+LIST_ENTRY *\r
 NetListRemoveTail (\r
-  NET_LIST_ENTRY            *Head\r
+  LIST_ENTRY            *Head\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Last;\r
+  LIST_ENTRY            *Last;\r
 \r
   ASSERT (Head != NULL);\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     return NULL;\r
   }\r
 \r
@@ -341,8 +341,8 @@ NetListRemoveTail (
   Last->BackLink->ForwardLink = Head;\r
 \r
   DEBUG_CODE (\r
-    Last->ForwardLink = (LIST_ENTRY     *) NULL;\r
-    Last->BackLink    = (LIST_ENTRY     *) NULL;\r
+    Last->ForwardLink = (LIST_ENTRY *) NULL;\r
+    Last->BackLink    = (LIST_ENTRY *) NULL;\r
   );\r
 \r
   return Last;\r
@@ -360,8 +360,8 @@ NetListRemoveTail (
 **/\r
 VOID\r
 NetListInsertAfter (\r
-  IN NET_LIST_ENTRY         *PrevEntry,\r
-  IN NET_LIST_ENTRY         *NewEntry\r
+  IN LIST_ENTRY         *PrevEntry,\r
+  IN LIST_ENTRY         *NewEntry\r
   )\r
 {\r
   NewEntry->BackLink                = PrevEntry;\r
@@ -382,8 +382,8 @@ NetListInsertAfter (
 **/\r
 VOID\r
 NetListInsertBefore (\r
-  IN NET_LIST_ENTRY *PostEntry,\r
-  IN NET_LIST_ENTRY *NewEntry\r
+  IN LIST_ENTRY     *PostEntry,\r
+  IN LIST_ENTRY     *NewEntry\r
   )\r
 {\r
   NewEntry->ForwardLink             = PostEntry;\r
@@ -408,8 +408,8 @@ NetMapInit (
 {\r
   ASSERT (Map != NULL);\r
 \r
-  NetListInit (&Map->Used);\r
-  NetListInit (&Map->Recycled);\r
+  InitializeListHead (&Map->Used);\r
+  InitializeListHead (&Map->Recycled);\r
   Map->Count = 0;\r
 }\r
 \r
@@ -428,30 +428,30 @@ NetMapClean (
   )\r
 {\r
   NET_MAP_ITEM              *Item;\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
 \r
   ASSERT (Map != NULL);\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Map->Used) {\r
     Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
 \r
-    NetListRemoveEntry (&Item->Link);\r
+    RemoveEntryList (&Item->Link);\r
     Map->Count--;\r
 \r
-    NetFreePool (Item);\r
+    gBS->FreePool (Item);\r
   }\r
 \r
-  ASSERT ((Map->Count == 0) && NetListIsEmpty (&Map->Used));\r
+  ASSERT ((Map->Count == 0) && IsListEmpty (&Map->Used));\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Map->Recycled) {\r
     Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);\r
 \r
-    NetListRemoveEntry (&Item->Link);\r
-    NetFreePool (Item);\r
+    RemoveEntryList (&Item->Link);\r
+    gBS->FreePool (Item);\r
   }\r
 \r
-  ASSERT (NetListIsEmpty (&Map->Recycled));\r
+  ASSERT (IsListEmpty (&Map->Recycled));\r
 }\r
 \r
 \r
@@ -506,16 +506,16 @@ NetMapAllocItem (
   )\r
 {\r
   NET_MAP_ITEM              *Item;\r
-  NET_LIST_ENTRY            *Head;\r
+  LIST_ENTRY                *Head;\r
   UINTN                     Index;\r
 \r
   ASSERT (Map != NULL);\r
 \r
   Head = &Map->Recycled;\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     for (Index = 0; Index < NET_MAP_INCREAMENT; Index++) {\r
-      Item = NetAllocatePool (sizeof (NET_MAP_ITEM));\r
+      Item = AllocatePool (sizeof (NET_MAP_ITEM));\r
 \r
       if (Item == NULL) {\r
         if (Index == 0) {\r
@@ -525,7 +525,7 @@ NetMapAllocItem (
         break;\r
       }\r
 \r
-      NetListInsertHead (Head, &Item->Link);\r
+      InsertHeadList (Head, &Item->Link);\r
     }\r
   }\r
 \r
@@ -566,7 +566,7 @@ NetMapInsertHead (
 \r
   Item->Key   = Key;\r
   Item->Value = Value;\r
-  NetListInsertHead (&Map->Used, &Item->Link);\r
+  InsertHeadList (&Map->Used, &Item->Link);\r
 \r
   Map->Count++;\r
   return EFI_SUCCESS;\r
@@ -603,7 +603,7 @@ NetMapInsertTail (
 \r
   Item->Key   = Key;\r
   Item->Value = Value;\r
-  NetListInsertTail (&Map->Used, &Item->Link);\r
+  InsertTailList (&Map->Used, &Item->Link);\r
 \r
   Map->Count++;\r
 \r
@@ -627,7 +627,7 @@ NetItemInMap (
   IN NET_MAP_ITEM           *Item\r
   )\r
 {\r
-  NET_LIST_ENTRY            *ListEntry;\r
+  LIST_ENTRY            *ListEntry;\r
 \r
   NET_LIST_FOR_EACH (ListEntry, &Map->Used) {\r
     if (ListEntry == &Item->Link) {\r
@@ -654,7 +654,7 @@ NetMapFindKey (
   IN  VOID                  *Key\r
   )\r
 {\r
-  NET_LIST_ENTRY          *Entry;\r
+  LIST_ENTRY              *Entry;\r
   NET_MAP_ITEM            *Item;\r
 \r
   ASSERT (Map != NULL);\r
@@ -691,9 +691,9 @@ NetMapRemoveItem (
   ASSERT ((Map != NULL) && (Item != NULL));\r
   ASSERT (NetItemInMap (Map, Item));\r
 \r
-  NetListRemoveEntry (&Item->Link);\r
+  RemoveEntryList (&Item->Link);\r
   Map->Count--;\r
-  NetListInsertHead (&Map->Recycled, &Item->Link);\r
+  InsertHeadList (&Map->Recycled, &Item->Link);\r
 \r
   if (Value != NULL) {\r
     *Value = Item->Value;\r
@@ -724,12 +724,12 @@ NetMapRemoveHead (
   // Often, it indicates a programming error to remove\r
   // the first entry in an empty list\r
   //\r
-  ASSERT (Map && !NetListIsEmpty (&Map->Used));\r
+  ASSERT (Map && !IsListEmpty (&Map->Used));\r
 \r
   Item = NET_LIST_HEAD (&Map->Used, NET_MAP_ITEM, Link);\r
-  NetListRemoveEntry (&Item->Link);\r
+  RemoveEntryList (&Item->Link);\r
   Map->Count--;\r
-  NetListInsertHead (&Map->Recycled, &Item->Link);\r
+  InsertHeadList (&Map->Recycled, &Item->Link);\r
 \r
   if (Value != NULL) {\r
     *Value = Item->Value;\r
@@ -760,12 +760,12 @@ NetMapRemoveTail (
   // Often, it indicates a programming error to remove\r
   // the last entry in an empty list\r
   //\r
-  ASSERT (Map && !NetListIsEmpty (&Map->Used));\r
+  ASSERT (Map && !IsListEmpty (&Map->Used));\r
 \r
   Item = NET_LIST_TAIL (&Map->Used, NET_MAP_ITEM, Link);\r
-  NetListRemoveEntry (&Item->Link);\r
+  RemoveEntryList (&Item->Link);\r
   Map->Count--;\r
-  NetListInsertHead (&Map->Recycled, &Item->Link);\r
+  InsertHeadList (&Map->Recycled, &Item->Link);\r
 \r
   if (Value != NULL) {\r
     *Value = Item->Value;\r
@@ -796,9 +796,9 @@ NetMapIterate (
   )\r
 {\r
 \r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
-  NET_LIST_ENTRY            *Head;\r
+  LIST_ENTRY            *Entry;\r
+  LIST_ENTRY            *Next;\r
+  LIST_ENTRY            *Head;\r
   NET_MAP_ITEM              *Item;\r
   EFI_STATUS                Result;\r
 \r
@@ -806,7 +806,7 @@ NetMapIterate (
 \r
   Head = &Map->Used;\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1088,7 +1088,7 @@ NetLibGetMacString (
   // It takes 2 unicode characters to represent a 1 byte binary buffer.\r
   // Plus one unicode character for the null-terminator.\r
   //\r
-  MacAddress = NetAllocatePool ((2 * Mode->HwAddressSize + 1) * sizeof (CHAR16));\r
+  MacAddress = AllocatePool ((2 * Mode->HwAddressSize + 1) * sizeof (CHAR16));\r
   if (MacAddress == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1146,7 +1146,7 @@ NetLibDefaultAddressIsStatic (
     return TRUE;\r
   }\r
 \r
-  ConfigInfo = NetAllocatePool (Len);\r
+  ConfigInfo = AllocatePool (Len);\r
   if (ConfigInfo == NULL) {\r
     return TRUE;\r
   }\r
@@ -1161,7 +1161,7 @@ NetLibDefaultAddressIsStatic (
 \r
 ON_EXIT:\r
 \r
-  NetFreePool (ConfigInfo);\r
+  gBS->FreePool (ConfigInfo);\r
 \r
   return IsStatic;\r
 }\r
@@ -1196,8 +1196,8 @@ NetLibCreateIPv4DPathNode (
   Node->Header.SubType = MSG_IPv4_DP;\r
   SetDevicePathNodeLength (&Node->Header, 19);\r
 \r
-  NetCopyMem (&Node->LocalIpAddress, &LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&Node->RemoteIpAddress, &RemoteIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Node->LocalIpAddress, &LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Node->RemoteIpAddress, &RemoteIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   Node->LocalPort  = LocalPort;\r
   Node->RemotePort = RemotePort;\r