Add volatile type definition to avoid link error when building with ICC

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

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 4a068eaf72bdc9cd3ae9c33b2cb8d4119d15f783..f377138a1927d1765c557f74d16d5f9e243d2a7a 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -229,7 +229,7 @@ IpIoIcmpHandler (
     case ICMP_CODE_UNREACH_PROTOCOL:\r
     case ICMP_CODE_UNREACH_PORT:\r
     case ICMP_CODE_UNREACH_SRCFAIL:\r
-      IcmpErr = ICMP_ERR_UNREACH_NET + Code;\r
+      IcmpErr = (ICMP_ERROR) (ICMP_ERR_UNREACH_NET + Code);\r
 \r
       break;\r
 \r
@@ -266,7 +266,7 @@ IpIoIcmpHandler (
       return EFI_ABORTED;\r
     }\r
 \r
-    IcmpErr = Code + ICMP_ERR_TIMXCEED_INTRANS;\r
+    IcmpErr = (ICMP_ERROR) (Code + ICMP_ERR_TIMXCEED_INTRANS);\r
 \r
     break;\r
 \r
@@ -362,7 +362,7 @@ IpIoCreateSndEntry (
   EFI_IP4_TRANSMIT_DATA     *TxData;\r
   EFI_STATUS                Status;\r
   EFI_IP4_OVERRIDE_DATA     *OverrideData;\r
-  UINT32                    Index;\r
+  volatile UINT32           Index;\r
 \r
   //\r
   // Allocate resource for SndEntry\r
@@ -429,8 +429,8 @@ IpIoCreateSndEntry (
   TxData->TotalDataLength               = Pkt->TotalSize;\r
   TxData->FragmentCount                 = Pkt->BlockOpNum;\r
 \r
-  for (Index = 0; Index < Pkt->BlockOpNum; Index++) {\r
 \r
+  for (Index = 0; Index < Pkt->BlockOpNum; Index++) {\r
     TxData->FragmentTable[Index].FragmentBuffer = Pkt->BlockOp[Index].Head;\r
     TxData->FragmentTable[Index].FragmentLength = Pkt->BlockOp[Index].Size;\r
   }\r
@@ -654,7 +654,7 @@ IpIoListenHandler (
 \r
   if (EFI_SUCCESS == Status) {\r
 \r
-    IpIo->PktRcvdNotify (EFI_SUCCESS, 0, &Session, Pkt, IpIo->RcvdContext);\r
+    IpIo->PktRcvdNotify (EFI_SUCCESS, (ICMP_ERROR) 0, &Session, Pkt, IpIo->RcvdContext);\r
   } else {\r
     //\r
     // Status is EFI_ICMP_ERROR\r
@@ -857,6 +857,7 @@ IpIoStop (
   //\r
   // Detroy the Ip List used by IpIo\r
   //\r
+\r
   while (!NetListIsEmpty (&(IpIo->IpList))) {\r
     IpInfo = NET_LIST_HEAD (&(IpIo->IpList), IP_IO_IP_INFO, Entry);\r
 \r
@@ -1050,7 +1051,7 @@ IpIoAddIp (
              IpIo->Controller,\r
              IpIo->Image,\r
              &IpInfo->ChildHandle,\r
-             &IpInfo->Ip\r
+             (VOID **) &IpInfo->Ip\r
              );\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseIpInfo;\r