From 4eba0885474e6b29a3985880ac334d368c5b8810 Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 6 Dec 2006 03:33:01 +0000
Subject: Merge PVCS #7739. Drop Ebc arch support for PxeBc module.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2055 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa        |  2 +-
 EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h          | 12 ++++++++++--
 EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c |  7 -------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'EdkModulePkg/Universal')

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 0fff256d95..6a2321ea5c 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>BC</OutputFileBasename>
   </ModuleDefinitions>
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
index fcfc264763..69bfe6d6de 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
@@ -19,8 +19,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Client architecture types
 //
-#define IA64            2
-#define SYS_ARCH_EFI32  6
+#if defined   MDE_CPU_IA32    
+#define       SYS_ARCH  0x6
+#elif defined MDE_CPU_X64
+#define       SYS_ARCH  0x7
+#elif defined MDE_CPU_IPF
+#define       SYS_ARCH  0x2
+#else
+#error Unsupported Client Processor Type
+#endif
+
 
 //
 // portability macros
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 79bce9d4d8..57664d81e2 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -43,13 +43,6 @@ typedef union {
   UINT8                     *BytePtr;
 } UNION_PTR;
 
-//
-// 1 for Itanium-based, 0 for IA32
-//
-#define IA64SZ    ((sizeof (UINTN) / sizeof (UINT32)) - 1)
-
-#define SYS_ARCH  (SYS_ARCH_EFI32 - (SYS_ARCH_EFI32 - IA64) * IA64SZ)
-
 #pragma pack(1)
 //
 // option structure for DHCPREQUEST at end of DISCOVER options
-- 
cgit v1.2.3