From 8f586b85c3f617ba802e663b4b3b303e06140863 Mon Sep 17 00:00:00 2001
From: Randy Pawell <randy_pawell@hp.com>
Date: Thu, 4 Dec 2014 00:55:50 +0000
Subject: NetworkPkg: Source fixes and cleanup for ARMGCC compiles

- Fix EFI_IPv4_ADDRESS usages to use a macro to copy the structure
   instead of direct assignment, to avoid runtime alignment errors.
- Delete excess local variables that are initialized but otherwise unused.
- Add LibraryClasses.ARM & AARCH64 section in NetworkPkg.dsc file,
   containing a CompilerIntrinsicsLib null-library, required for successful
  standalone package builds (copied from MdeModulePkg.dsc).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Randy Pawell <randy_pawell@hp.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16472 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c  | 3 +--
 NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'NetworkPkg/UefiPxeBcDxe')

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
index b71998b405..111224cea2 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
@@ -1,6 +1,7 @@
 /** @file
   Functions implementation related with DHCPv6 for UefiPxeBc Driver.
 
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -664,7 +665,6 @@ PxeBcRequestBootService (
 {
   EFI_PXE_BASE_CODE_UDP_PORT          SrcPort;
   EFI_PXE_BASE_CODE_UDP_PORT          DestPort;
-  EFI_PXE_BASE_CODE_MODE              *Mode;
   EFI_PXE_BASE_CODE_PROTOCOL          *PxeBc;
   EFI_PXE_BASE_CODE_DHCPV6_PACKET     *Discover;
   UINTN                               DiscoverLen;
@@ -682,7 +682,6 @@ PxeBcRequestBootService (
   UINT8                               *Option;
 
   PxeBc       = &Private->PxeBc;
-  Mode        = PxeBc->Mode;
   Request     = Private->Dhcp6Request;
   ProxyOffer = &Private->OfferBuffer[Index].Dhcp6.Packet.Offer;
   SrcPort     = PXEBC_BS_DISCOVER_PORT;
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index 8ee831f521..92fd1f19df 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -1,6 +1,7 @@
 /** @file
   Driver Binding functions implementationfor for UefiPxeBc Driver.
 
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
@@ -1400,7 +1401,6 @@ PxeBcStop (
   EFI_LOAD_FILE_PROTOCOL          *LoadFile;
   EFI_STATUS                      Status;
   EFI_HANDLE                      NicHandle;
-  BOOLEAN                         IsIpv6;
   PXEBC_PRIVATE_PROTOCOL          *Id;
 
   Private    = NULL;
@@ -1408,7 +1408,6 @@ PxeBcStop (
   VirtualNic = NULL;
   LoadFile   = NULL;
   Id         = NULL;
-  IsIpv6     = FALSE;
 
   Status = gBS->OpenProtocol (
                   ControllerHandle,
-- 
cgit v1.2.3