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 a1525ee69f5699356f3472eecc868299b2d34b3f..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
@@ -131,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
@@ -206,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
@@ -513,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
@@ -636,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
@@ -1143,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