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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Pxe_bc_dhcp.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index a30d8c7f7f31dd6caac8f9fce4626c3d7cbe824b..7d8518a2ce52ce29b049f353b2b15e92876a3d14 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -22,12 +22,12 @@ Abstract:
 \r
 #include "PxeArch.h"\r
 \r
-STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;\r
-STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;\r
-STATIC EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;\r
+EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;\r
+EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;\r
+EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;\r
 #define PSEUDO_DHCP_CLIENT_PORT PseudoDhcpServerPort\r
-STATIC EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};\r
-STATIC EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};\r
+EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};\r
+EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};\r
 \r
 typedef union {\r
   DHCPV4_OP_STRUCT          *OpPtr;\r
@@ -50,7 +50,7 @@ typedef union {
 // option structure for DHCPREQUEST at end of DISCOVER options\r
 // and for DHCPDECLINE\r
 //\r
-STATIC const struct requestopendstr {\r
+const struct requestopendstr {\r
   DHCPV4_OP_REQUESTED_IP  OpReqIP;\r
   DHCPV4_OP_SERVER_IP     DhcServerIpPtr;\r
   UINT8                   End[1];\r
@@ -87,7 +87,7 @@ PXE_OP_BOOT_ITEM                DefaultBootItem = {
 //\r
 // PXE discovery control default structure\r
 //\r
-STATIC PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {\r
+PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {\r
   { VEND_PXE_DISCOVERY_CONTROL, DHCPV4_OPTION_LENGTH(PXE_OP_DISCOVERY_CONTROL) },\r
   0\r
 };\r
@@ -120,7 +120,7 @@ typedef struct {            // discoveropendstr {
 // common option beginning for all our DHCP messages except\r
 // DHCPDECLINE and DHCPRELEASE\r
 //\r
-STATIC struct optionsstr {\r
+struct optionsstr {\r
   UINT8                       DhcpCookie[4];\r
   DHCPV4_OP_MESSAGE_TYPE      DhcpMessageType;\r
   DHCPV4_OP_MAX_MESSAGE_SIZE  DhcpMaxMessageSize;\r
@@ -246,7 +246,7 @@ struct opreleasestr {
 // value 0 -> not of interest, else value is index into PXE OPTION array\r
 // option values from 1 to MAX_OUR_PXE_OPT\r
 //\r
-STATIC UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {\r
+UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {\r
   VEND_PXE_MTFTP_IP_IX,             // multicast IP address of bootfile for MTFTP listen\r
   VEND_PXE_MTFTP_CPORT_IX,          // UDP Port to monitor for MTFTP responses - Intel order\r
   VEND_PXE_MTFTP_SPORT_IX,          // Server UDP Port for MTFTP open - Intel order\r
@@ -327,7 +327,7 @@ STATIC UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {
 // value 0 -> not of interest, else value is index into OPTION array\r
 // option values from 1 to MAX_OUR_OPT\r
 //\r
-STATIC UINT8  OurDhcpOptions[MAX_OUR_OPT] = {\r
+UINT8  OurDhcpOptions[MAX_OUR_OPT] = {\r
   OP_SUBNET_MASK_IX,                      // OP_SUBNET_MASK   1   // data is the subnet mask\r
   OP_TIME_OFFSET_IX,                      // OP_TIME_OFFSET   2   // data is the time offset of subnet to UTC in seconds\r
   OP_ROUTER_LIST_IX,                      // OP_ROUTER_LIST   3   // list of routers on subnet\r
@@ -527,7 +527,6 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
 //\r
 // add router list to list\r
 //\r
-STATIC\r
 VOID\r
 Ip4AddRouterList (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -553,7 +552,6 @@ Ip4AddRouterList (
 //\r
 // send ARP for our IP - fail if someone has it\r
 //\r
-STATIC\r
 BOOLEAN\r
 SetStationIP (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -613,7 +611,6 @@ SetStationIP (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 VOID\r
 AddRouters (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -627,7 +624,6 @@ AddRouters (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 EFI_STATUS\r
 DoUdpWrite (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -665,7 +661,6 @@ typedef struct {
   UINT8 x[4];\r
 } C4Str;\r
 \r
-STATIC\r
 VOID\r
 InitDhcpv4TxBuf (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -741,7 +736,6 @@ InitDhcpv4TxBuf (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 UINT32\r
 DecodePxeOptions (\r
   DHCP_RECEIVE_BUFFER *RxBufPtr,\r
@@ -789,7 +783,6 @@ DecodePxeOptions (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 VOID\r
 DecodeOptions (\r
   DHCP_RECEIVE_BUFFER *RxBufPtr,\r
@@ -897,7 +890,6 @@ Parse (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 VOID\r
 CopyParseRxBuf (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -919,7 +911,6 @@ CopyParseRxBuf (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 VOID\r
 CopyProxyRxBuf (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -931,7 +922,6 @@ CopyProxyRxBuf (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 VOID\r
 CopyParse (\r
   PXE_BASECODE_DEVICE       *Private,\r
@@ -1401,7 +1391,6 @@ GetOffers (
 //\r
 // send DHCPDECLINE\r
 //\r
-STATIC\r
 VOID\r
 DeclineOffer (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -1447,7 +1436,6 @@ DeclineOffer (
 //\r
 // send DHCPRELEASE\r
 //\r
-STATIC\r
 BOOLEAN\r
 Release (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -1498,7 +1486,6 @@ Release (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 BOOLEAN\r
 GetBINLAck (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1583,7 +1570,6 @@ GetBINLAck (
 // make sure we can get BINL\r
 // send DHCPREQUEST to PXE server\r
 //\r
-STATIC\r
 BOOLEAN\r
 TryBINL (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1672,7 +1658,6 @@ TryBINL (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 BOOLEAN\r
 TryFinishBINL (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1687,7 +1672,6 @@ TryFinishBINL (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 BOOLEAN\r
 TryFinishProxyBINL (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -1709,7 +1693,6 @@ TryFinishProxyBINL (
 //\r
 // try to finish DORA - send DHCP request, wait for ACK, check with ARP\r
 //\r
-STATIC\r
 BOOLEAN\r
 TryFinishDORA (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1848,7 +1831,6 @@ TryFinishDORA (
 //\r
 // try a DHCP server of appropriate type\r
 //\r
-STATIC\r
 BOOLEAN\r
 TryDHCPFinishDORA (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1878,7 +1860,6 @@ TryDHCPFinishDORA (
 //\r
 // try a DHCP only server and a proxy of appropriate type\r
 //\r
-STATIC\r
 BOOLEAN\r
 TryProxyFinishDORA (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -1919,7 +1900,6 @@ TryProxyFinishDORA (
 //\r
 // getting to the bottom of the barrel\r
 //\r
-STATIC\r
 BOOLEAN\r
 TryAnyWithBootfileFinishDORA (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -1970,7 +1950,6 @@ TryAnyWithBootfileFinishDORA (
 \r
 /* DoDhcpDora()\r
  */\r
-STATIC\r
 EFI_STATUS\r
 DoDhcpDora (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -2390,7 +2369,6 @@ BcDhcp (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-STATIC\r
 BOOLEAN\r
 VerifyCredentialOption (\r
   UINT8 *tx,\r
@@ -2728,7 +2706,6 @@ DoDiscover (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 Discover (\r
   PXE_BASECODE_DEVICE                 *Private,\r