Fixed EBC build issues.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Tcp4Dxe / Tcp4Dispatcher.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index 9039905be655fc573bd46774d186e307c64bd5d8..ea7d732b847e25f58b14ca131c678c21c641df89 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -104,7 +104,7 @@ Tcp4GetMode (
   }\r
 \r
   if (Mode->Tcp4State) {\r
-    *(Mode->Tcp4State) = Tcb->State;\r
+    *(Mode->Tcp4State) = (EFI_TCP4_CONNECTION_STATE) Tcb->State;\r
   }\r
 \r
   if (Mode->Tcp4ConfigData) {\r
@@ -139,9 +139,10 @@ Tcp4GetMode (
       Option->KeepAliveTime           = Tcb->KeepAliveIdle / TCP_TICK_HZ;\r
       Option->KeepAliveInterval       = Tcb->KeepAlivePeriod / TCP_TICK_HZ;\r
 \r
-      Option->EnableNagle      = !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE);\r
-      Option->EnableTimeStamp     = !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS);\r
-      Option->EnableWindowScaling = !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS);\r
+      Option->EnableNagle         = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
+      Option->EnableTimeStamp     = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
+      Option->EnableWindowScaling = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS))\r
+;\r
 \r
       Option->EnableSelectiveAck      = FALSE;\r
       Option->EnablePathMtuDiscovery  = FALSE;\r
@@ -341,7 +342,6 @@ Tcp4ConfigurePcb (
   IN EFI_TCP4_CONFIG_DATA *CfgData\r
   )\r
 {\r
-  IP_IO               *IpIo;\r
   EFI_IP4_CONFIG_DATA IpCfgData;\r
   EFI_STATUS          Status;\r
   EFI_TCP4_OPTION     *Option;\r
@@ -352,14 +352,13 @@ Tcp4ConfigurePcb (
 \r
   TcpProto = (TCP4_PROTO_DATA *) Sk->ProtoReserved;\r
   Tcb      = TcpProto->TcpPcb;\r
-  IpIo     = TcpProto->TcpService->IpIo;\r
 \r
   ASSERT (Tcb != NULL);\r
 \r
   //\r
   // Add Ip for send pkt to the peer\r
   //\r
-  IpCfgData                   = mIpIoDefaultIpConfigData;\r
+  CopyMem (&IpCfgData, &mIpIoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
   IpCfgData.DefaultProtocol   = EFI_IP_PROTO_TCP;\r
   IpCfgData.UseDefaultAddress = CfgData->AccessPoint.UseDefaultAddress;\r
   IpCfgData.StationAddress    = CfgData->AccessPoint.StationAddress;\r
@@ -441,25 +440,34 @@ Tcp4ConfigurePcb (
   if (Option != NULL) {\r
     SET_RCV_BUFFSIZE (\r
       Sk,\r
-      TCP_COMP_VAL (TCP_RCV_BUF_SIZE_MIN,\r
-      TCP_RCV_BUF_SIZE,\r
-      TCP_RCV_BUF_SIZE,\r
-      Option->ReceiveBufferSize)\r
+      (UINT32) (TCP_COMP_VAL (\r
+                  TCP_RCV_BUF_SIZE_MIN,\r
+                  TCP_RCV_BUF_SIZE,\r
+                  TCP_RCV_BUF_SIZE,\r
+                  Option->ReceiveBufferSize\r
+                  )\r
+               )\r
       );\r
     SET_SND_BUFFSIZE (\r
       Sk,\r
-      TCP_COMP_VAL (TCP_SND_BUF_SIZE_MIN,\r
-      TCP_SND_BUF_SIZE,\r
-      TCP_SND_BUF_SIZE,\r
-      Option->SendBufferSize)\r
+      (UINT32) (TCP_COMP_VAL (\r
+                  TCP_SND_BUF_SIZE_MIN,\r
+                  TCP_SND_BUF_SIZE,\r
+                  TCP_SND_BUF_SIZE,\r
+                  Option->SendBufferSize\r
+                  )\r
+               )\r
       );\r
 \r
     SET_BACKLOG (\r
       Sk,\r
-      TCP_COMP_VAL (TCP_BACKLOG_MIN,\r
-      TCP_BACKLOG,\r
-      TCP_BACKLOG,\r
-      Option->MaxSynBackLog)\r
+      (UINT32) (TCP_COMP_VAL (\r
+                  TCP_BACKLOG_MIN,\r
+                  TCP_BACKLOG,\r
+                  TCP_BACKLOG,\r
+                  Option->MaxSynBackLog\r
+                  )\r
+               )\r
       );\r
 \r
     Tcb->MaxRexmit = (UINT16) TCP_COMP_VAL (\r
@@ -472,7 +480,7 @@ Tcp4ConfigurePcb (
                               TCP_FIN_WAIT2_TIME,\r
                               TCP_FIN_WAIT2_TIME_MAX,\r
                               TCP_FIN_WAIT2_TIME,\r
-                              Option->FinTimeout * TCP_TICK_HZ\r
+                              (UINT32) (Option->FinTimeout * TCP_TICK_HZ)\r
                               );\r
 \r
     if (Option->TimeWaitTimeout != 0) {\r
@@ -480,7 +488,7 @@ Tcp4ConfigurePcb (
                                TCP_TIME_WAIT_TIME,\r
                                TCP_TIME_WAIT_TIME_MAX,\r
                                TCP_TIME_WAIT_TIME,\r
-                               Option->TimeWaitTimeout * TCP_TICK_HZ\r
+                               (UINT32) (Option->TimeWaitTimeout * TCP_TICK_HZ)\r
                                );\r
     } else {\r
       Tcb->TimeWaitTimeout = 0;\r
@@ -499,13 +507,13 @@ Tcp4ConfigurePcb (
                              TCP_KEEPALIVE_IDLE_MIN,\r
                              TCP_KEEPALIVE_IDLE_MAX,\r
                              TCP_KEEPALIVE_IDLE_MIN,\r
-                             Option->KeepAliveTime * TCP_TICK_HZ\r
+                             (UINT32) (Option->KeepAliveTime * TCP_TICK_HZ)\r
                              );\r
       Tcb->KeepAlivePeriod = TCP_COMP_VAL (\r
                                TCP_KEEPALIVE_PERIOD_MIN,\r
                                TCP_KEEPALIVE_PERIOD,\r
                                TCP_KEEPALIVE_PERIOD,\r
-                               Option->KeepAliveInterval * TCP_TICK_HZ\r
+                               (UINT32) (Option->KeepAliveInterval * TCP_TICK_HZ)\r
                                );\r
     }\r
 \r
@@ -513,7 +521,7 @@ Tcp4ConfigurePcb (
                             TCP_CONNECT_TIME_MIN,\r
                             TCP_CONNECT_TIME,\r
                             TCP_CONNECT_TIME,\r
-                            Option->ConnectionTimeout * TCP_TICK_HZ\r
+                            (UINT32) (Option->ConnectionTimeout * TCP_TICK_HZ)\r
                             );\r
 \r
     if (Option->EnableNagle == FALSE) {\r