Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -59,6 +59,11 @@ typedef struct {
|
||||
VOID* CapsulePtr[1];
|
||||
} EFI_CAPSULE_TABLE;
|
||||
|
||||
//
|
||||
// This struct is deprecated because VendorTable entries physical address will not be fixed up when
|
||||
// transitioning from preboot to runtime phase. So we don't need CapsuleInfoTable to record capsule
|
||||
// GUIDs any more for runtime convert.
|
||||
//
|
||||
typedef struct {
|
||||
UINT32 CapsuleGuidNumber;
|
||||
EFI_GUID CapsuleGuidPtr[1];
|
||||
@@ -66,6 +71,7 @@ typedef struct {
|
||||
|
||||
//
|
||||
// This GUID is used for collecting all capsules' Guids who install in ConfigTable.
|
||||
// This GUID is deprecated as well.
|
||||
//
|
||||
#define EFI_CAPSULE_INFO_GUID \
|
||||
{ \
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -50,11 +50,10 @@ typedef enum {
|
||||
} EFI_PEI_PCI_CFG_PPI_WIDTH;
|
||||
|
||||
#define EFI_PEI_PCI_CFG_ADDRESS(bus, dev, func, reg) \
|
||||
( ((bus) << 24) | \
|
||||
((dev) << 16) | \
|
||||
((func) << 8) | \
|
||||
((reg) < 256 ? (reg): ((UINT64)(reg) << 32)))
|
||||
|
||||
(UINT64) ((((UINTN) (bus)) << 24) | \
|
||||
(((UINTN) (dev)) << 16) | \
|
||||
(((UINTN) (func)) << 8) | \
|
||||
((reg) < 256 ? ((UINTN) (reg)): ((UINT64) (reg) << 32)))
|
||||
|
||||
#if (PI_SPECIFICATION_VERSION < 0x00010000)
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -361,8 +361,8 @@ EFI_STATUS
|
||||
(EFIAPI *EFI_PEI_FFS_FIND_NEXT_FILE2) (
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_FV_FILETYPE SearchType,
|
||||
IN CONST EFI_PEI_FV_HANDLE *FwVolHeader,
|
||||
IN OUT EFI_PEI_FILE_HANDLE **FileHandle
|
||||
IN CONST EFI_PEI_FV_HANDLE FvHandle,
|
||||
IN OUT EFI_PEI_FILE_HANDLE *FileHandle
|
||||
);
|
||||
|
||||
typedef
|
||||
@@ -370,7 +370,7 @@ EFI_STATUS
|
||||
(EFIAPI *EFI_PEI_FFS_FIND_SECTION_DATA2) (
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_SECTION_TYPE SectionType,
|
||||
IN EFI_PEI_FILE_HANDLE *FileHandle,
|
||||
IN EFI_PEI_FILE_HANDLE FileHandle,
|
||||
OUT VOID **SectionData
|
||||
);
|
||||
|
||||
@@ -443,7 +443,7 @@ EFI_STATUS
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_PEI_FFS_GET_VOLUME_INFO) (
|
||||
IN EFI_PEI_FV_HANDLE *VolumeHandle,
|
||||
IN EFI_PEI_FV_HANDLE VolumeHandle,
|
||||
OUT EFI_FV_INFO *VolumeInfo
|
||||
);
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -22,28 +22,11 @@ Abstract:
|
||||
#ifndef _TIANO_SPEC_DEVICE_PATH_H
|
||||
#define _TIANO_SPEC_DEVICE_PATH_H
|
||||
|
||||
#pragma pack(1)
|
||||
#include "EfiDevicePath.h"
|
||||
|
||||
#if (EFI_SPECIFICATION_VERSION <= 0x00020000)
|
||||
//
|
||||
// EFI Specification extension on Media Device Path. MEDIA_FW_VOL_FILEPATH_DEVICE_PATH is adopted by UEFI later and added in UEFI2.10.
|
||||
// In EdkCompatibility Package, we only support MEDIA_FW_VOL_FILEPATH_DEVICE_PATH that complies with
|
||||
// EFI 1.10 and UEFI 2.10.
|
||||
// MEDIA_FW_VOL_FILEPATH_DEVICE_PATH and MEDIA_FW_VOL_DEVICE_PATH are defined in
|
||||
// EfiDevicePath.h
|
||||
//
|
||||
#define MEDIA_FV_FILEPATH_DP 0x06
|
||||
typedef struct {
|
||||
EFI_DEVICE_PATH_PROTOCOL Header;
|
||||
EFI_GUID NameGuid;
|
||||
} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;
|
||||
#endif
|
||||
|
||||
|
||||
#if (EFI_SPECIFICATION_VERSION > 0x00020000)
|
||||
//
|
||||
// EFI Specification extension on Media Device Path was added to UEFI 2.1 specification,
|
||||
// so the definition is moved to EfiDevicePath.h
|
||||
//
|
||||
#endif
|
||||
|
||||
#pragma pack()
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user