From a8b194b97cd4d0cd46ce9880293c4500bd841fc1 Mon Sep 17 00:00:00 2001
From: xgu3 <xgu3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 31 Jan 2007 07:18:41 +0000
Subject: 1. PEI core needs to check image machine type 2. In BDS, Legacy free
 may make BdsLibConnectAllDefaultConsoles fail. 3. Pci22.h, we need to add
 more definition in that 4. EBC: EBC Exception Subclass should add
 EFI_SUBCLASS_SPECIFIC 5. PciEnumeratorSupport Null Pointer Error

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2340 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c   | 15 ++++++--
 .../PeCoffGetEntryPoint.c                          | 44 ++++++++++++++++++++--
 2 files changed, 52 insertions(+), 7 deletions(-)

(limited to 'EdkUnixPkg')

diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
index 6c9097f142..47a79ff34e 100644
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -367,11 +367,18 @@ Returns:
   //
   // Connect all default console variables
   //
-  Status = BdsLibConnectConsoleVariable (L"ConIn");
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
 
+  //
+  // Because possibly the platform is legacy free, in such case,
+  // ConIn devices (Serial Port and PS2 Keyboard ) does not exist, 
+  // so we need not check the status.
+  //  
+  BdsLibConnectConsoleVariable (L"ConIn");
+
+  // 
+  // It seems impossible not to have any ConOut device on platform,
+  // so we check the status here.
+  //
   Status = BdsLibConnectConsoleVariable (L"ConOut");
   if (EFI_ERROR (Status)) {
     return Status;
diff --git a/EdkUnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/EdkUnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index c0d0a01d3e..c5f2453b3d 100644
--- a/EdkUnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/EdkUnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
 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
@@ -32,7 +32,9 @@ PeCoffLoaderGetEntryPoint (
 
 Routine Description:
 
-  Loads a PE/COFF image into memory
+  Loads a PE/COFF image into memory, this is not follow the original purpose of 
+  PeCoffGetEntryPoint library class.  But it's ok that Unix package not run on a real 
+  platform and this is for source level debug.
 
 Arguments:
 
@@ -72,4 +74,40 @@ Returns:
                            );
   *EntryPoint = (VOID*)(UINTN)ImageEntryPoint;
   return Status;
-}
+}
+
+/**
+  Returns the machine type of PE/COFF image. 
+  This is copied from MDE BasePeCoffGetEntryPointLib, the code should be sync with it.
+  The reason is Unix package needs to load the image to memory to support source
+  level debug.
+   
+
+  @param  Image   Pointer to a PE/COFF header
+
+  @return         Machine type or zero if not a valid iamge
+
+**/
+UINT16
+EFIAPI
+PeCoffLoaderGetMachineType (
+  IN  VOID  *Pe32Data
+  )
+{  
+  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr;
+  EFI_IMAGE_DOS_HEADER                 *DosHdr;
+
+  DosHdr = (EFI_IMAGE_DOS_HEADER  *)Pe32Data;
+  if (DosHdr->e_magic == EFI_IMAGE_DOS_SIGNATURE) {
+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data + DosHdr->e_lfanew);
+  } else {
+    Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Pe32Data);
+  }
+
+  if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {
+    return Hdr.Pe32->FileHeader.Machine;
+  }
+
+  return 0x0000;
+}
+
-- 
cgit v1.2.3