Clean up Network Components to support GCC build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4062 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 12d060048903a2ba53ee7f98c3d6c666faa24bf7..0defe736cb26c5f8f9e19d585be994766f20a6d4 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1188,7 +1188,7 @@ Returns:
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  if (0x1e >= InquiryData.Peripheral_Type >= 0xa) {\r
+  if (0x1e >= InquiryData.Peripheral_Type && InquiryData.Peripheral_Type >= 0xa) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 1359fe99bc9ca176b78adeae502b572e568782b7..32474cb441c10f501c121ae43f60ceb96dd099df 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -346,7 +346,7 @@ DxeIplAddEncapsulatedFirmwareVolumes (
           PeiServicesFfsGetVolumeInfo (&VolumeHandle, &VolumeInfo);\r
 \r
           PeiPiLibBuildPiFvInfoPpi (\r
           PeiServicesFfsGetVolumeInfo (&VolumeHandle, &VolumeInfo);\r
 \r
           PeiPiLibBuildPiFvInfoPpi (\r

-            (EFI_PHYSICAL_ADDRESS) FvHeader,\r
+            (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,\r

             FvHeader->FvLength,\r
             &(VolumeInfo.FvName),\r
             &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name)\r
             FvHeader->FvLength,\r
             &(VolumeInfo.FvName),\r
             &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name)\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 958263b522e79f4bc0ad788ab9d085a49f14358f..34fe0a1d9e3262ada45814a11d725b0c1cc6f194 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -142,8 +142,8 @@ PeiFileHandleToVolume (
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   for (Index = 0; Index < PrivateData->FvCount; Index++) {\r
     FwVolHeader = PrivateData->Fv[Index].FvHeader;\r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   for (Index = 0; Index < PrivateData->FvCount; Index++) {\r
     FwVolHeader = PrivateData->Fv[Index].FvHeader;\r

-    if (((UINT64) FileHandle > (UINT64) FwVolHeader ) &&   \\r
-        ((UINT64) FileHandle <= ((UINT64) FwVolHeader + FwVolHeader->FvLength - 1))) {\r
+    if (((UINT64) (UINTN) FileHandle > (UINT64) (UINTN) FwVolHeader ) &&   \\r
+        ((UINT64) (UINTN) FileHandle <= ((UINT64) (UINTN) FwVolHeader + FwVolHeader->FvLength - 1))) {\r

       *VolumeHandle = (EFI_PEI_FV_HANDLE)FwVolHeader;\r
       return TRUE;\r
     }\r
       *VolumeHandle = (EFI_PEI_FV_HANDLE)FwVolHeader;\r
       return TRUE;\r
     }\r

diff --git a/MdeModulePkg/Library/DxeNetLib/NetDebug.c b/MdeModulePkg/Library/DxeNetLib/NetDebug.c
index ffaac1dbf76c2a270cf9e58279979427885c7068..e182b741f5c0d38ffc26353298f0d4d75f690e53 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/NetDebug.c
+++ b/MdeModulePkg/Library/DxeNetLib/NetDebug.c
@@ -54,7 +54,7 @@ UINT8  mSyslogDstMac [NET_ETHER_ADDR_LEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
 UINT32 mSyslogDstIp                       = 0xffffffff;\r
 UINT32 mSyslogSrcIp                       = 0;\r
 \r
 UINT32 mSyslogDstIp                       = 0xffffffff;\r
 UINT32 mSyslogSrcIp                       = 0;\r
 \r

-UINT8 *\r
+CHAR8 *\r

 MonthName[] = {\r
   "Jan",\r
   "Feb",\r
 MonthName[] = {\r
   "Jan",\r
   "Feb",\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index d9ee3229cdc66ccc4913a6c8b32abe2ed8439393..69598f15c3c77b6199276916e45c5b44811d049f 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -559,7 +559,7 @@ EfiDhcp4RenewRebind (
              DhcpSb->Selected,\r
              DhcpSb->Para,\r
              DHCP_MSG_REQUEST,\r
              DhcpSb->Selected,\r
              DhcpSb->Para,\r
              DHCP_MSG_REQUEST,\r

-             "Extra renew/rebind by the application"\r
+             (UINT8 *) "Extra renew/rebind by the application"\r

              );\r
 \r
   if (EFI_ERROR (Status)) {\r
              );\r
 \r
   if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 64e3bd8fd7241659d233f45cacab1b13464d46d5..17c61007f1c902d39408a1cd9ac49892ac756329 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -756,14 +756,14 @@ DhcpHandleRequest (
   Message = NULL;\r
 \r
   if (!EFI_IP4_EQUAL (&Head->YourAddr, &Selected->YourAddr)) {\r
   Message = NULL;\r
 \r
   if (!EFI_IP4_EQUAL (&Head->YourAddr, &Selected->YourAddr)) {\r

-    Message = "Lease confirmed isn't the same as that in the offer";\r
+    Message = (UINT8 *) "Lease confirmed isn't the same as that in the offer";\r

     goto REJECT;\r
   }\r
 \r
   Status = DhcpCallUser (DhcpSb, Dhcp4RcvdAck, Packet, NULL);\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto REJECT;\r
   }\r
 \r
   Status = DhcpCallUser (DhcpSb, Dhcp4RcvdAck, Packet, NULL);\r
 \r
   if (EFI_ERROR (Status)) {\r

-    Message = "Lease is denied upon received ACK";\r
+    Message = (UINT8 *) "Lease is denied upon received ACK";\r

     goto REJECT;\r
   }\r
 \r
     goto REJECT;\r
   }\r
 \r


@@ -773,7 +773,7 @@ DhcpHandleRequest (
   Status = DhcpLeaseAcquired (DhcpSb);\r
 \r
   if (EFI_ERROR (Status)) {\r
   Status = DhcpLeaseAcquired (DhcpSb);\r
 \r
   if (EFI_ERROR (Status)) {\r

-    Message = "Lease is denied upon entering bound";\r
+    Message = (UINT8 *) "Lease is denied upon entering bound";\r

     goto REJECT;\r
   }\r
 \r
     goto REJECT;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index fdd50b35354fa1a014e3c835af68bc3a59d80741..081db47d49caf1146547d48641f0723ddbca5dd0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -225,8 +225,8 @@ Ip4ConfigDriverBindingStart (
   Instance->Controller        = ControllerHandle;\r
   Instance->Image             = This->DriverBindingHandle;\r
 \r
   Instance->Controller        = ControllerHandle;\r
   Instance->Image             = This->DriverBindingHandle;\r
 \r

-  Instance->Ip4ConfigProtocol = mIp4ConfigProtocolTemplate;\r
-  Instance->NicIp4Protocol    = mNicIp4ConfigProtocolTemplate;\r
+  CopyMem (&Instance->Ip4ConfigProtocol, &mIp4ConfigProtocolTemplate, sizeof (mIp4ConfigProtocolTemplate));\r
+  CopyMem (&Instance->NicIp4Protocol, &mNicIp4ConfigProtocolTemplate, sizeof (mNicIp4ConfigProtocolTemplate));\r

 \r
   Instance->State             = IP4_CONFIG_STATE_IDLE;\r
   Instance->Mnp               = Mnp;\r
 \r
   Instance->State             = IP4_CONFIG_STATE_IDLE;\r
   Instance->Mnp               = Mnp;\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index c1529d26209d2e84f2d89b4fcc2133d05c6f2257..3d26ec2a4c8f763c7ec64281c02ffcf1f32ebfce 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -795,6 +795,8 @@ MnpEnqueuePacket (
   MNP_GROUP_ADDRESS                 *GroupAddress;\r
   MNP_RXDATA_WRAP                   *RxDataWrap;\r
 \r
   MNP_GROUP_ADDRESS                 *GroupAddress;\r
   MNP_RXDATA_WRAP                   *RxDataWrap;\r
 \r

+\r
+  GroupAddress = NULL;\r

   //\r
   // First, analyse the packet header.\r
   //\r
   //\r
   // First, analyse the packet header.\r
   //\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index ca6d83f0428109cd7d30bbd8b7475a98b6b240f5..3ce879253751426fc25531595a08e076c33112f5 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -61,7 +61,7 @@ EfiMtftp4GetModeData (
   Instance                         = MTFTP4_PROTOCOL_FROM_THIS (This);\r
   CopyMem(&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));\r
   ModeData->SupportedOptionCount   = MTFTP4_SUPPORTED_OPTIONS;\r
   Instance                         = MTFTP4_PROTOCOL_FROM_THIS (This);\r
   CopyMem(&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));\r
   ModeData->SupportedOptionCount   = MTFTP4_SUPPORTED_OPTIONS;\r

-  ModeData->SupportedOptoins       = mMtftp4SupportedOptions;\r
+  ModeData->SupportedOptoins       = (UINT8 **) mMtftp4SupportedOptions;\r

   ModeData->UnsupportedOptionCount = 0;\r
   ModeData->UnsupportedOptoins     = NULL;\r
 \r
   ModeData->UnsupportedOptionCount = 0;\r
   ModeData->UnsupportedOptoins     = NULL;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
index b85784a926977a4f56ebee4a5a3bac6ec18fe690..64932ae8a22634e376e11223adafdd61098febcf 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
@@ -21,7 +21,7 @@ Abstract:
 \r
 #include "Mtftp4Impl.h"\r
 \r
 \r
 #include "Mtftp4Impl.h"\r
 \r

-UINT8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {\r
+CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {\r

   "blksize",\r
   "timeout",\r
   "tsize",\r
   "blksize",\r
   "timeout",\r
   "tsize",\r


@@ -438,7 +438,7 @@ Mtftp4ParseOption (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r

-    if (NetStringEqualNoCase (This->OptionStr, "blksize")) {\r
+    if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "blksize")) {\r

       //\r
       // block size option, valid value is between [8, 65464]\r
       //\r
       //\r
       // block size option, valid value is between [8, 65464]\r
       //\r


@@ -451,7 +451,7 @@ Mtftp4ParseOption (
       MtftpOption->BlkSize = (UINT16) Value;\r
       MtftpOption->Exist |= MTFTP4_BLKSIZE_EXIST;\r
 \r
       MtftpOption->BlkSize = (UINT16) Value;\r
       MtftpOption->Exist |= MTFTP4_BLKSIZE_EXIST;\r
 \r

-    } else if (NetStringEqualNoCase (This->OptionStr, "timeout")) {\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "timeout")) {\r

       //\r
       // timeout option, valid value is between [1, 255]\r
       //\r
       //\r
       // timeout option, valid value is between [1, 255]\r
       //\r


@@ -463,14 +463,14 @@ Mtftp4ParseOption (
 \r
       MtftpOption->Timeout = (UINT8) Value;\r
 \r
 \r
       MtftpOption->Timeout = (UINT8) Value;\r
 \r

-    } else if (NetStringEqualNoCase (This->OptionStr, "tsize")) {\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "tsize")) {\r

       //\r
       // tsize option, the biggest transfer supported is 4GB with block size option\r
       //\r
       MtftpOption->Tsize = NetStringToU32 (This->ValueStr);\r
       MtftpOption->Exist |= MTFTP4_TSIZE_EXIST;\r
 \r
       //\r
       // tsize option, the biggest transfer supported is 4GB with block size option\r
       //\r
       MtftpOption->Tsize = NetStringToU32 (This->ValueStr);\r
       MtftpOption->Exist |= MTFTP4_TSIZE_EXIST;\r
 \r

-    } else if (NetStringEqualNoCase (This->OptionStr, "multicast")) {\r
+    } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "multicast")) {\r

       //\r
       // Multicast option, if it is a request, the value must be a zero\r
       // length string, otherwise, it is formated like "204.0.0.1,1857,1\0"\r
       //\r
       // Multicast option, if it is a request, the value must be a zero\r
       // length string, otherwise, it is formated like "204.0.0.1,1857,1\0"\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
index 2595dc2795a42cb6175a821e6f6e790c108e8683..22b7c7d92382fe6e3e177d230eb2a31fa25a15b1 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
@@ -69,5 +69,5 @@ Mtftp4ParseOptionOack (
   OUT MTFTP4_OPTION         *Option\r
   );\r
 \r
   OUT MTFTP4_OPTION         *Option\r
   );\r
 \r

-extern UINT8  *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS];\r
+extern CHAR8  *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS];\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 665114c7f8a3e2b415dfb9377fd900cab88d8a32..906cce8deb508863e14fa02ede3f57431d50fbcf 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -172,7 +172,7 @@ Mtftp4RrqSaveBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r

-        "User aborted download"\r
+        (UINT8 *) "User aborted download"\r

         );\r
 \r
       return EFI_ABORTED;\r
         );\r
 \r
       return EFI_ABORTED;\r


@@ -203,7 +203,7 @@ Mtftp4RrqSaveBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_DISK_FULL,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_DISK_FULL,\r

-        "User provided memory block is too small"\r
+        (UINT8 *) "User provided memory block is too small"\r

         );\r
 \r
       return EFI_BUFFER_TOO_SMALL;\r
         );\r
 \r
       return EFI_BUFFER_TOO_SMALL;\r


@@ -480,7 +480,7 @@ Mtftp4RrqHandleOack (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r

-        "Mal-formated OACK packet"\r
+        (UINT8 *) "Mal-formated OACK packet"\r

         );\r
     }\r
 \r
         );\r
     }\r
 \r


@@ -501,7 +501,7 @@ Mtftp4RrqHandleOack (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r

-          "Illegal multicast setting"\r
+          (UINT8 *) "Illegal multicast setting"\r

           );\r
 \r
         return EFI_TFTP_ERROR;\r
           );\r
 \r
         return EFI_TFTP_ERROR;\r


@@ -529,7 +529,7 @@ Mtftp4RrqHandleOack (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ACCESS_VIOLATION,\r
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_ACCESS_VIOLATION,\r

-          "Failed to create socket to receive multicast packet"\r
+          (UINT8 *) "Failed to create socket to receive multicast packet"\r

           );\r
 \r
         return Status;\r
           );\r
 \r
         return Status;\r


@@ -675,7 +675,7 @@ Mtftp4RrqInput (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r

-          "User aborted the transfer"\r
+          (UINT8 *) "User aborted the transfer"\r

           );\r
       }\r
 \r
           );\r
       }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index 28082db04290bfb6527105b2db02dce33604345e..ce9db682d9da47aaedff45e4752084aabfeb1213 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -278,7 +278,7 @@ Mtftp4SendRequest (
   Mode    = Instance->Token->ModeStr;\r
 \r
   if (Mode == NULL) {\r
   Mode    = Instance->Token->ModeStr;\r
 \r
   if (Mode == NULL) {\r

-    Mode = "octet";\r
+    Mode = (UINT8 *) "octet";\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -583,7 +583,7 @@ Mtftp4OnTimerTick (
       Mtftp4SendError (\r
          Instance,\r
          EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
       Mtftp4SendError (\r
          Instance,\r
          EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r

-         "User aborted the transfer in time out"\r
+         (UINT8 *) "User aborted the transfer in time out"\r

          );\r
 \r
       Mtftp4CleanOperation (Instance, EFI_ABORTED);\r
          );\r
 \r
       Mtftp4CleanOperation (Instance, EFI_ABORTED);\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index a3b308f2666e0df0282124e3f94e3a40acecdef9..e61b7b59f8a4313c90a5b0018d308ef73ecbc44b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -149,7 +149,7 @@ Mtftp4WrqSendBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r

-        "User aborted the transfer"\r
+        (UINT8 *) "User aborted the transfer"\r

         );\r
 \r
       return EFI_ABORTED;\r
         );\r
 \r
       return EFI_ABORTED;\r


@@ -235,7 +235,7 @@ Mtftp4WrqHandleAck (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r

-        "Block number rolls back, not supported, try blksize option"\r
+        (UINT8 *) "Block number rolls back, not supported, try blksize option"\r

         );\r
 \r
       return EFI_TFTP_ERROR;\r
         );\r
 \r
       return EFI_TFTP_ERROR;\r


@@ -339,7 +339,7 @@ Mtftp4WrqHandleOack (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r

-        "Mal-formated OACK packet"\r
+        (UINT8 *) "Mal-formated OACK packet"\r

         );\r
     }\r
 \r
         );\r
     }\r
 \r


@@ -465,7 +465,7 @@ Mtftp4WrqInput (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r

-          "User aborted the transfer"\r
+          (UINT8 *) "User aborted the transfer"\r

           );\r
       }\r
 \r
           );\r
       }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
index d14dbd91528c80361652a2c8ff74dfc5120a88fd..63d11d2fe1b82b24de19fe8dad027b27298a875b 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
@@ -1662,7 +1662,7 @@ IpFilter (
       Enable = EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST;\r
 \r
       for (Index = 0; Index < Filter->IpCnt; ++Index) {\r
       Enable = EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST;\r
 \r
       for (Index = 0; Index < Filter->IpCnt; ++Index) {\r

-        PxebcMode->IpFilter.IpList[Index] = Filter->IpList[Index];\r
+        CopyMem (&PxebcMode->IpFilter.IpList[Index], &Filter->IpList[Index], sizeof (EFI_IP_ADDRESS));\r

 \r
         if (IS_MULTICAST (&Filter->IpList[Index])) {\r
           EFI_IP_ADDRESS  *TmpIp;\r
 \r
         if (IS_MULTICAST (&Filter->IpList[Index])) {\r
           EFI_IP_ADDRESS  *TmpIp;\r


@@ -1674,7 +1674,7 @@ IpFilter (
           //\r
           if (!Index2)\r
           {\r
           //\r
           if (!Index2)\r
           {\r

-              TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;\r
+            TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;\r

             --Index;\r
           } else {\r
             TmpIp = (EFI_IP_ADDRESS *) &Filter->IpList[Index];\r
             --Index;\r
           } else {\r
             TmpIp = (EFI_IP_ADDRESS *) &Filter->IpList[Index];\r


@@ -2009,8 +2009,8 @@ BcSetStationIP (
     goto RELEASE_LOCK;\r
   }\r
 \r
     goto RELEASE_LOCK;\r
   }\r
 \r

-  PxebcMode->StationIp   = *StationIpPtr;\r
-  PxebcMode->SubnetMask  = *SubnetMaskPtr;\r
+  CopyMem (&PxebcMode->StationIp, StationIpPtr, sizeof (EFI_IP_ADDRESS));\r
+  CopyMem (&PxebcMode->SubnetMask, SubnetMaskPtr, sizeof (EFI_IP_ADDRESS));\r

   Private->GoodStationIp = TRUE;\r
 \r
 RELEASE_LOCK:\r
   Private->GoodStationIp = TRUE;\r
 \r
 RELEASE_LOCK:\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
index b065a53f3a31d290ae671187ce08bf7de5fc2020..d9fa36896dc5c2b4bdaebbb1e7da50c49903551b 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
@@ -1101,8 +1101,8 @@ MtftpDownload (
 \r
   Filter.Filters    = EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST;\r
   Filter.IpCnt      = 2;\r
 \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
 \r
   if ((Status = IpFilter (Private, &Filter)) != EFI_SUCCESS) {\r
     return Status;\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_udp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_udp.c
index fcb55acfa0548396038a8dcf74cd01ef258b329a..eb2951abd8e42168bce604e914ba9f45222ca6ad 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_udp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_udp.c
@@ -317,7 +317,7 @@ UdpRead (
 \r
   if (DestIpPtr == NULL) {\r
     DestIpPtr = &TmpDestIp;\r
 \r
   if (DestIpPtr == NULL) {\r
     DestIpPtr = &TmpDestIp;\r

-    TmpDestIp = Private->EfiBc.Mode->StationIp;\r
+    CopyMem (&TmpDestIp, &Private->EfiBc.Mode->StationIp, sizeof (EFI_IP_ADDRESS));\r

   }\r
 \r
 #if SUPPORT_IPV6\r
   }\r
 \r
 #if SUPPORT_IPV6\r


@@ -384,7 +384,7 @@ UdpRead (
           DEBUG (\r
             (DEBUG_INFO,\r
             "\nUdpRead()  Hdrs.Udpv4PseudoHeader == %Xh",\r
           DEBUG (\r
             (DEBUG_INFO,\r
             "\nUdpRead()  Hdrs.Udpv4PseudoHeader == %Xh",\r

-            Hdrs.Udpv4PseudoHeader)\r
+            &Hdrs.Udpv4PseudoHeader)\r

             );\r
           DEBUG (\r
             (DEBUG_INFO,\r
             );\r
           DEBUG (\r
             (DEBUG_INFO,\r