Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

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

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index b813db37ccae2fb46d1c88c4abe384b51b691509..58e3541a2db3c4cc5acb41ee6367be4aa1adb02f 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -43,7 +43,7 @@ EFI_DPC_PROTOCOL *mDpc = NULL;
 //\r
 // All the supported IP4 maskes in host byte order.\r
 //\r
-IP4_ADDR  mIp4AllMasks[IP4_MASK_NUM] = {\r
+IP4_ADDR  gIp4AllMasks[IP4_MASK_NUM] = {\r
   0x00000000,\r
   0x80000000,\r
   0xC0000000,\r
@@ -84,33 +84,6 @@ IP4_ADDR  mIp4AllMasks[IP4_MASK_NUM] = {
 \r
 EFI_IPv4_ADDRESS  mZeroIp4Addr = {{0, 0, 0, 0}};\r
 \r
-/**\r
-  Converts the low nibble of a byte  to hex unicode character.\r
-\r
-  @param  Nibble  lower nibble of a byte.\r
-\r
-  @return Hex unicode character.\r
-\r
-**/\r
-CHAR16\r
-NibbleToHexChar (\r
-  IN UINT8      Nibble\r
-  )\r
-{\r
-  //\r
-  // Porting Guide:\r
-  // This library interface is simply obsolete.\r
-  // Include the source code to user code.\r
-  //\r
-\r
-  Nibble &= 0x0F;\r
-  if (Nibble <= 0x9) {\r
-    return (CHAR16)(Nibble + L'0');\r
-  }\r
-\r
-  return (CHAR16)(Nibble - 0xA + L'A');\r
-}\r
-\r
 /**\r
   Return the length of the mask. If the mask is invalid,\r
   return the invalid length 33, which is IP4_MASK_NUM.\r
@@ -123,6 +96,7 @@ NibbleToHexChar (
 \r
 **/\r
 INTN\r
+EFIAPI\r
 NetGetMaskLength (\r
   IN IP4_ADDR               NetMask\r
   )\r
@@ -130,7 +104,7 @@ NetGetMaskLength (
   INTN                      Index;\r
 \r
   for (Index = 0; Index < IP4_MASK_NUM; Index++) {\r
-    if (NetMask == mIp4AllMasks[Index]) {\r
+    if (NetMask == gIp4AllMasks[Index]) {\r
       break;\r
     }\r
   }\r
@@ -150,6 +124,7 @@ NetGetMaskLength (
 \r
 **/\r
 INTN\r
+EFIAPI\r
 NetGetIpClass (\r
   IN IP4_ADDR               Addr\r
   )\r
@@ -189,6 +164,7 @@ NetGetIpClass (
 \r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 Ip4IsUnicast (\r
   IN IP4_ADDR               Ip,\r
   IN IP4_ADDR               NetMask\r
@@ -203,7 +179,7 @@ Ip4IsUnicast (
   }\r
 \r
   if (NetMask == 0) {\r
-    NetMask = mIp4AllMasks[Class << 3];\r
+    NetMask = gIp4AllMasks[Class << 3];\r
   }\r
 \r
   if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {\r
@@ -223,6 +199,7 @@ Ip4IsUnicast (
 \r
 **/\r
 UINT32\r
+EFIAPI\r
 NetRandomInitSeed (\r
   VOID\r
   )\r
@@ -249,6 +226,7 @@ NetRandomInitSeed (
 \r
 **/\r
 UINT32\r
+EFIAPI\r
 NetGetUint32 (\r
   IN UINT8                  *Buf\r
   )\r
@@ -271,6 +249,7 @@ NetGetUint32 (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 NetPutUint32 (\r
   IN UINT8                  *Buf,\r
   IN UINT32                 Data\r
@@ -290,6 +269,7 @@ NetPutUint32 (
 \r
 **/\r
 LIST_ENTRY *\r
+EFIAPI\r
 NetListRemoveHead (\r
   LIST_ENTRY            *Head\r
   )\r
@@ -324,6 +304,7 @@ NetListRemoveHead (
 \r
 **/\r
 LIST_ENTRY *\r
+EFIAPI\r
 NetListRemoveTail (\r
   LIST_ENTRY            *Head\r
   )\r
@@ -359,6 +340,7 @@ NetListRemoveTail (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 NetListInsertAfter (\r
   IN LIST_ENTRY         *PrevEntry,\r
   IN LIST_ENTRY         *NewEntry\r
@@ -381,6 +363,7 @@ NetListInsertAfter (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 NetListInsertBefore (\r
   IN LIST_ENTRY     *PostEntry,\r
   IN LIST_ENTRY     *NewEntry\r
@@ -402,6 +385,7 @@ NetListInsertBefore (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 NetMapInit (\r
   IN NET_MAP                *Map\r
   )\r
@@ -423,6 +407,7 @@ NetMapInit (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 NetMapClean (\r
   IN NET_MAP                *Map\r
   )\r
@@ -464,6 +449,7 @@ NetMapClean (
 \r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 NetMapIsEmpty (\r
   IN NET_MAP                *Map\r
   )\r
@@ -482,6 +468,7 @@ NetMapIsEmpty (
 \r
 **/\r
 UINTN\r
+EFIAPI\r
 NetMapGetCount (\r
   IN NET_MAP                *Map\r
   )\r
@@ -499,7 +486,6 @@ NetMapGetCount (
   @return The allocated item or NULL\r
 \r
 **/\r
-STATIC\r
 NET_MAP_ITEM *\r
 NetMapAllocItem (\r
   IN NET_MAP                *Map\r
@@ -548,6 +534,7 @@ NetMapAllocItem (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetMapInsertHead (\r
   IN NET_MAP                *Map,\r
   IN VOID                   *Key,\r
@@ -585,6 +572,7 @@ NetMapInsertHead (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetMapInsertTail (\r
   IN NET_MAP                *Map,\r
   IN VOID                   *Key,\r
@@ -620,7 +608,6 @@ NetMapInsertTail (
   @return TRUE if the item is in the netmap, otherwise FALSE.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 NetItemInMap (\r
   IN NET_MAP                *Map,\r
@@ -649,6 +636,7 @@ NetItemInMap (
 \r
 **/\r
 NET_MAP_ITEM *\r
+EFIAPI\r
 NetMapFindKey (\r
   IN  NET_MAP               *Map,\r
   IN  VOID                  *Key\r
@@ -682,6 +670,7 @@ NetMapFindKey (
 \r
 **/\r
 VOID *\r
+EFIAPI\r
 NetMapRemoveItem (\r
   IN  NET_MAP             *Map,\r
   IN  NET_MAP_ITEM        *Item,\r
@@ -713,6 +702,7 @@ NetMapRemoveItem (
 \r
 **/\r
 VOID *\r
+EFIAPI\r
 NetMapRemoveHead (\r
   IN  NET_MAP               *Map,\r
   OUT VOID                  **Value         OPTIONAL\r
@@ -749,6 +739,7 @@ NetMapRemoveHead (
 \r
 **/\r
 VOID *\r
+EFIAPI\r
 NetMapRemoveTail (\r
   IN  NET_MAP               *Map,\r
   OUT VOID                  **Value       OPTIONAL\r
@@ -789,6 +780,7 @@ NetMapRemoveTail (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetMapIterate (\r
   IN NET_MAP                *Map,\r
   IN NET_MAP_CALLBACK       CallBack,\r
@@ -950,6 +942,7 @@ NetLibDefaultUnload (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetLibCreateServiceChild (\r
   IN  EFI_HANDLE            Controller,\r
   IN  EFI_HANDLE            Image,\r
@@ -1000,6 +993,7 @@ NetLibCreateServiceChild (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetLibDestroyServiceChild (\r
   IN  EFI_HANDLE            Controller,\r
   IN  EFI_HANDLE            Image,\r
@@ -1053,6 +1047,7 @@ NetLibDestroyServiceChild (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetLibGetMacString (\r
   IN           EFI_HANDLE  SnpHandle,\r
   IN           EFI_HANDLE  ImageHandle,\r
@@ -1119,7 +1114,6 @@ NetLibGetMacString (
   @retval FALSE          If the default address is acquired from DHCP.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 NetLibDefaultAddressIsStatic (\r
   IN EFI_HANDLE  Controller\r
@@ -1181,6 +1175,7 @@ ON_EXIT:
   @retval None\r
 **/\r
 VOID\r
+EFIAPI\r
 NetLibCreateIPv4DPathNode (\r
   IN OUT IPv4_DEVICE_PATH  *Node,\r
   IN EFI_HANDLE            Controller,\r
@@ -1229,6 +1224,7 @@ NetLibCreateIPv4DPathNode (
 \r
 **/\r
 EFI_HANDLE\r
+EFIAPI\r
 NetLibGetNicHandle (\r
   IN EFI_HANDLE             Controller,\r
   IN EFI_GUID               *ProtocolGuid\r
@@ -1280,6 +1276,7 @@ NetLibGetNicHandle (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetLibQueueDpc (\r
   IN EFI_TPL            DpcTpl,\r
   IN EFI_DPC_PROCEDURE  DpcProcedure,\r
@@ -1297,6 +1294,7 @@ NetLibQueueDpc (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 NetLibDispatchDpc (\r
   VOID\r
   )\r