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

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

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
index b065a53f3a31d290ae671187ce08bf7de5fc2020..702d5fef34ca56441062cb60ba28a1f99e281d85 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
@@ -32,7 +32,7 @@ Revision History
 //\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-#include "bc.h"\r
+#include "Bc.h"\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 UINT64\r
@@ -77,7 +77,6 @@ Swap64 (
   @return other :=\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 TftpUdpRead (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -167,7 +166,6 @@ TftpUdpRead (
 \r
 \r
 **/\r
-STATIC\r
 VOID\r
 SendError (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -207,7 +205,6 @@ SendError (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 SendAckAndGetData (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -336,7 +333,6 @@ SendAckAndGetData (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 LockStepReceive (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -478,12 +474,12 @@ LockStepReceive (
 //\r
 // some literals\r
 //\r
-STATIC UINT8                      Mode[]          = MODE_BINARY;\r
-STATIC UINT8                      BlockSizeOp[]   = OP_BLKSIZE;\r
-STATIC UINT8                      TsizeOp[]       = OP_TFRSIZE;\r
-STATIC UINT8                      OverwriteOp[]   = OP_OVERWRITE;\r
-STATIC UINT8                      BigBlkNumOp[]   = OP_BIGBLKNUM;\r
-STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;\r
+UINT8                      Mode[]          = MODE_BINARY;\r
+UINT8                      BlockSizeOp[]   = OP_BLKSIZE;\r
+UINT8                      TsizeOp[]       = OP_TFRSIZE;\r
+UINT8                      OverwriteOp[]   = OP_OVERWRITE;\r
+UINT8                      BigBlkNumOp[]   = OP_BIGBLKNUM;\r
+EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
@@ -492,7 +488,6 @@ STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
   @return Pointer to value field if option found or NULL if not found.\r
 \r
 **/\r
-STATIC\r
 UINT8 *\r
 FindOption (\r
   UINT8 *OptionPtr,\r
@@ -521,7 +516,6 @@ FindOption (
 #define TSIZEOP     2 // transfer size\r
 #define OVERWRITEOP 4 // overwrite\r
 #define BIGBLKNUMOP 8 // big block numbers\r
-STATIC\r
 EFI_STATUS\r
 TftpRwReq (\r
   UINT16                      Req,\r
@@ -616,7 +610,6 @@ TftpRwReq (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 TftpRwReqwResp (\r
   UINT16                      Req,\r
@@ -738,7 +731,6 @@ TftpRwReqwResp (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 MtftpListen (\r
   PXE_BASECODE_DEVICE           *Private,\r
@@ -873,7 +865,6 @@ MtftpListen (
   @retval GOTUNI  returns NO_DATA go will go to TFTP session)\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 MtftpOpen (\r
   PXE_BASECODE_DEVICE                                               * Private,\r
@@ -1069,7 +1060,6 @@ MtftpOpen (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 MtftpDownload (\r
   PXE_BASECODE_DEVICE           *Private,\r
@@ -1101,8 +1091,8 @@ MtftpDownload (
 \r
   Filter.Filters    = EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST;\r
   Filter.IpCnt      = 2;\r
-  Filter.IpList[0]  = Private->EfiBc.Mode->StationIp;\r
-  Filter.IpList[1]  = MtftpInfoPtr->MCastIp;\r
+  CopyMem (&Filter.IpList[0], &Private->EfiBc.Mode->StationIp, sizeof (EFI_IP_ADDRESS));\r
+  CopyMem (&Filter.IpList[1], &MtftpInfoPtr->MCastIp, sizeof (EFI_IP_ADDRESS));\r
 \r
   if ((Status = IpFilter (Private, &Filter)) != EFI_SUCCESS) {\r
     return Status;\r
@@ -1127,11 +1117,7 @@ MtftpDownload (
     // test of MTFTP server to make sure it handles mulitple opens correctly.\r
     // This code should NOT be enabled normally.\r
     //\r
-#ifdef SpecialNowaitVersion\r
-#pragma message ("This is special version for MTFTP regression test")\r
-    if (StartBlock || !LastBlock)\r
-#endif\r
-      if (((Status = MtftpListen (\r
+    if (((Status = MtftpListen (\r
                       Private,\r
                       &BufferSize,\r
                       BufferPtrLocal,\r
@@ -1148,7 +1134,7 @@ MtftpDownload (
         //\r
         // failed\r
         //\r
-      }\r
+    }\r
     //\r
     // if none were received, start block is not reset\r
     //\r
@@ -1251,7 +1237,6 @@ MtftpDownload (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 TftpInfo (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -1414,7 +1399,6 @@ TftpInfo (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 TftpDownload (\r
   PXE_BASECODE_DEVICE         *Private,\r
@@ -1582,7 +1566,6 @@ TftpDownload (
 \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 TftpUpload (\r
   PXE_BASECODE_DEVICE *Private,\r