Fixed EBC build issues.

Fixed ICC build issues.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
index c0cc15f3de..326fb4dc33 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
@@ -66,7 +66,7 @@ EfiNicIp4ConfigGetName (
   }

 

   if (NicAddr != NULL) {

-    *NicAddr = Instance->NicAddr;

+    CopyMem (NicAddr, &Instance->NicAddr, sizeof (NIC_ADDR));

   }

 

   return EFI_SUCCESS;

@@ -628,7 +628,7 @@ Ip4ConfigOnDhcp4Complete (
       goto ON_EXIT;

     }

 

-    Instance->NicConfig->NicAddr = Instance->NicAddr;

+    CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (NIC_ADDR));

     Instance->NicConfig->Source  = IP4_CONFIG_SOURCE_DHCP;

     Instance->NicConfig->Perment = Perment;

 

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
index 90e55993c2..8c58c8078c 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
@@ -52,7 +52,7 @@ enum {
 
   DHCP_TAG_PARA_LIST            = 55,
   DHCP_TAG_NETMASK              = 1,
-  DHCP_TAG_ROUTER               = 3,
+  DHCP_TAG_ROUTER               = 3
 };
 
 //
@@ -66,7 +66,7 @@ typedef struct {
 } IP4_CONFIG_DHCP4_OPTION;
 #pragma pack()
 
-typedef struct _IP4_CONFIG_INSTANCE {
+struct _IP4_CONFIG_INSTANCE {
   UINT32                        Signature;
   EFI_HANDLE                    Controller;
   EFI_HANDLE                    Image;
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 342b7d96b8..265135a117 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -173,7 +173,7 @@ Ip4ConfigDriverBindingStart (
   Status = gBS->OpenProtocol (

                   ControllerHandle,

                   &gEfiIp4ConfigProtocolGuid,

-                  &Ip4Config,

+                  (VOID **) &Ip4Config,

                   This->DriverBindingHandle,

                   ControllerHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -252,7 +252,7 @@ Ip4ConfigDriverBindingStart (
 

   Instance->NicAddr.Type    = (UINT16) SnpMode.IfType;

   Instance->NicAddr.Len     = (UINT8) SnpMode.HwAddressSize;

-  Instance->NicAddr.MacAddr = SnpMode.CurrentAddress;

+  CopyMem (&Instance->NicAddr.MacAddr, &SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));

 

   //

   // Add it to the global list, and compose the name

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
index ac5283f6d6..d6e617eaa7 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
@@ -150,7 +150,7 @@ Ip4ConfigReadVariable (
   //

   // Verify the checksum, variable size and count

   //

-  CheckSum = ~NetblockChecksum ((UINT8 *) Variable, (UINT32)Size);

+  CheckSum = (UINT16) (~NetblockChecksum ((UINT8 *) Variable, (UINT32)Size));

 

   if ((CheckSum != 0) || (Size != Variable->Len)) {

     goto REMOVE_VARIABLE;

@@ -378,6 +378,6 @@ Ip4ConfigModifyVariable (
 

   ASSERT (Next + Len == (UINT8 *) NewVar + TotalLen);

 

-  NewVar->CheckSum = ~NetblockChecksum ((UINT8 *) NewVar, TotalLen);

+  NewVar->CheckSum = (UINT16) (~NetblockChecksum ((UINT8 *) NewVar, TotalLen));

   return NewVar;

 }