Fixed the issue of duplicated SYS_ARCH in MdeModulePkg\UefiPxeBcDxe.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9848 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ljin6 2010-01-28 08:15:00 +00:00
parent 5fb89a0b2f
commit ecd28a61d6
3 changed files with 8 additions and 24 deletions

View File

@ -1033,7 +1033,7 @@ PxeBcBuildDhcpOptions (
OptList[Index]->OpCode = PXEBC_PXE_DHCP4_TAG_ARCH;
OptList[Index]->Length = sizeof (PXEBC_DHCP4_OPTION_ARCH);
OptEnt.Arch = (PXEBC_DHCP4_OPTION_ARCH *) OptList[Index]->Data;
Value = HTONS (SYS_ARCH);
Value = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);
CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));
Index++;
OptList[Index] = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);
@ -1045,7 +1045,7 @@ PxeBcBuildDhcpOptions (
OptList[Index]->Length = sizeof (PXEBC_DHCP4_OPTION_CLID);
OptEnt.Clid = (PXEBC_DHCP4_OPTION_CLID *) OptList[Index]->Data;
CopyMem (OptEnt.Clid, DEFAULT_CLASS_ID_DATA, sizeof (PXEBC_DHCP4_OPTION_CLID));
CvtNum (SYS_ARCH, OptEnt.Clid->ArchitectureType, sizeof (OptEnt.Clid->ArchitectureType));
CvtNum (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE, OptEnt.Clid->ArchitectureType, sizeof (OptEnt.Clid->ArchitectureType));
if (Private->Nii != NULL) {
//

View File

@ -1,6 +1,6 @@
/** @file
Copyright (c) 2007 - 2008, Intel Corporation.<BR>
Copyright (c) 2007 - 2010, Intel Corporation.<BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -42,7 +42,6 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA;
#include <Library/DpcLib.h>
#include "PxeBcDriver.h"
#include "PxeArch.h"
#include "PxeBcDhcp.h"
#include "PxeBcMtftp.h"
#include "PxeBcSupport.h"

View File

@ -1,7 +1,7 @@
#/** @file
## @file
# Component name for module UefiPxeBc
#
# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.
# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
#**/
##
[Defines]
@ -26,7 +26,7 @@
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
# VALID_ARCHITECTURES = IA32 X64 IPF
#
# DRIVER_BINDING = gPxeBcDriverBinding
# COMPONENT_NAME = gPxeBcComponentName
@ -45,22 +45,7 @@
PxeBcDhcp.c
PxeBcMtftp.h
PxeBcDriver.h
[Sources.IA32]
Ia32/PxeArch.h
[Sources.X64]
X64/PxeArch.h
[Sources.IPF]
Ipf/PxeArch.h
[Sources.ARM]
Arm/PxeArch.h
[Sources.EBC]
Ebc/PxeArch.h
Ebc/PxeArch.c
[Packages]
MdePkg/MdePkg.dec