From a8b194b97cd4d0cd46ce9880293c4500bd841fc1 Mon Sep 17 00:00:00 2001 From: xgu3 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 --- EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h | 6 +++--- EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'EdkModulePkg/Bus') diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h index dcf3e56..7ac5d28 100644 --- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h +++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h @@ -1,11 +1,11 @@ /*++ -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 http://opensource.org/licenses/bsd-license.php - + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @@ -189,7 +189,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL gEhciComponentName; // // USB Base Class Code,Sub-Class Code and Programming Interface // -#define PCI_CLASSC_PI_EHCI 0x20 +#define PCI_CLASSC_PI_EHCI PCI_IF_EHCI #define SETUP_PACKET_ID 0x2D #define INPUT_PACKET_ID 0x69 diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c index 3b796a6..0403402 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.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 @@ -255,8 +255,8 @@ Returns: Device, Func ); - if (gFullEnumeration) { - InitializeP2C (PciIoDevice); + if ((PciIoDevice != NULL) && gFullEnumeration) { + InitializeP2C (PciIoDevice); } } else { @@ -289,7 +289,7 @@ Returns: // // Special initialization for PPB including making the PPB quiet // - if (gFullEnumeration) { + if ((PciIoDevice != NULL) && gFullEnumeration) { InitializePpb (PciIoDevice); } } -- cgit v1.1