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

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index 6b2da72b42ca9697076c770cc749073c824c58d8..f2d8eecfe2b1cb335a65f8064db5670723259e48 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -1033,7 +1033,7 @@ PxeBcBuildDhcpOptions (
   OptList[Index]->OpCode  = PXEBC_PXE_DHCP4_TAG_ARCH;\r
   OptList[Index]->Length  = sizeof (PXEBC_DHCP4_OPTION_ARCH);\r
   OptEnt.Arch             = (PXEBC_DHCP4_OPTION_ARCH *) OptList[Index]->Data;\r
-  Value                   = HTONS (SYS_ARCH);\r
+  Value                   = HTONS (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE);\r
   CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
   OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
@@ -1045,7 +1045,7 @@ PxeBcBuildDhcpOptions (
   OptList[Index]->Length  = sizeof (PXEBC_DHCP4_OPTION_CLID);\r
   OptEnt.Clid             = (PXEBC_DHCP4_OPTION_CLID *) OptList[Index]->Data;\r
   CopyMem (OptEnt.Clid, DEFAULT_CLASS_ID_DATA, sizeof (PXEBC_DHCP4_OPTION_CLID));\r
-  CvtNum (SYS_ARCH, OptEnt.Clid->ArchitectureType, sizeof (OptEnt.Clid->ArchitectureType));\r
+  CvtNum (EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE, OptEnt.Clid->ArchitectureType, sizeof (OptEnt.Clid->ArchitectureType));\r
 \r
   if (Private->Nii != NULL) {\r
     //\r

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

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