1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:
1.1) Bug fixes. (For details, please check Documents & files: Snapshot/Release Notes at https://edk.tianocore.org/servlets/ProjectDocumentList?folderID=43&expandFolder=43&folderID=6) 1.2) Add new UEFI protocol definitions for AbsolutePointer, FormBrowser2, HiiConfigAccess, HiiConfigRouting, HiiDatabase, HiiFont, HiiImage, HiiString, SimpleTextInputEx, DPC protocol. 1.3) Add Smbios 2.5, 2.6 supports. Incompatible changes hilighted: 1) EFI_MANAGED_NETWORK_PROTOCOL_GUID changed. 2) EFI_IP4_IPCONFIG_DATA changed. 2) Add in EdkCompatibilityPkg/EdkCompatibilityPkg.dsc to build all libraries in this package. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4622 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004, Intel Corporation
|
||||
Copyright (c) 2004 - 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
|
||||
@@ -29,8 +29,11 @@ Abstract:
|
||||
#ifndef _DATAHUB_RECORDS_H_
|
||||
#define _DATAHUB_RECORDS_H_
|
||||
|
||||
|
||||
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
|
||||
#include "TianoHii.h"
|
||||
#else
|
||||
#include "EfiInternalFormRepresentation.h"
|
||||
#endif
|
||||
#include "DataHubSubClass.h"
|
||||
#include "DataHubSubClassProcessor.h"
|
||||
#include "DataHubSubClassCache.h"
|
||||
|
@@ -73,7 +73,8 @@ typedef enum {
|
||||
EfiCacheAssociativity4Way = 5,
|
||||
EfiCacheAssociativityFully = 6,
|
||||
EfiCacheAssociativity8Way = 7,
|
||||
EfiCacheAssociativity16Way = 8
|
||||
EfiCacheAssociativity16Way = 8,
|
||||
EfiCacheAssociativity24Way = 9
|
||||
} EFI_CACHE_ASSOCIATIVITY_DATA;
|
||||
|
||||
typedef struct {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2006, Intel Corporation
|
||||
Copyright (c) 2004 - 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
|
||||
@@ -188,6 +188,7 @@ typedef struct {
|
||||
EFI_MEMORY_TYPE_DETAIL MemoryTypeDetail;
|
||||
UINT16 MemorySpeed;
|
||||
EFI_MEMORY_STATE MemoryState;
|
||||
UINT8 MemoryAttributes;
|
||||
} EFI_MEMORY_ARRAY_LINK;
|
||||
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2006, Intel Corporation
|
||||
Copyright (c) 2004 - 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
|
||||
@@ -43,6 +43,11 @@ typedef struct {
|
||||
UINT8 LastPciBus;
|
||||
} EFI_MISC_LAST_PCI_BUS;
|
||||
|
||||
typedef struct {
|
||||
UINT8 FunctionNum :3;
|
||||
UINT8 DeviceNum :5;
|
||||
} EFI_MISC_DEV_FUNC_NUM;
|
||||
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -225,6 +230,10 @@ typedef enum {
|
||||
EfiMiscChassisTypeRackMountChassis = 0x17,
|
||||
EfiMiscChassisTypeSealedCasePc = 0x18,
|
||||
EfiMiscChassisMultiSystemChassis = 0x19,
|
||||
EfiMiscChassisCompactPCI = 0x1A,
|
||||
EfiMiscChassisAdvancedTCA = 0x1B,
|
||||
EfiMiscChassisBlade = 0x1C,
|
||||
EfiMiscChassisBladeEnclosure = 0x1D
|
||||
} EFI_MISC_CHASSIS_TYPE;
|
||||
|
||||
typedef struct {
|
||||
@@ -323,6 +332,7 @@ typedef enum {
|
||||
EfiPortConnectorTypeHeadPhoneMiniJack = 0x1F,
|
||||
EfiPortConnectorTypeBNC = 0x20,
|
||||
EfiPortConnectorType1394 = 0x21,
|
||||
EfiPortConnectorTypeSasSata = 0x22,
|
||||
EfiPortConnectorTypePC98 = 0xA0,
|
||||
EfiPortConnectorTypePC98Hireso = 0xA1,
|
||||
EfiPortConnectorTypePCH98 = 0xA2,
|
||||
@@ -364,6 +374,8 @@ typedef enum {
|
||||
EfiPortTypeAudioPort = 0x1D,
|
||||
EfiPortTypeModemPort = 0x1E,
|
||||
EfiPortTypeNetworkPort = 0x1F,
|
||||
EfiPortTypeSata = 0x20,
|
||||
EfiPortTypeSas = 0x21,
|
||||
EfiPortType8251Compatible = 0xA0,
|
||||
EfiPortType8251FifoCompatible = 0xA1,
|
||||
EfiPortTypeOther = 0xFF,
|
||||
@@ -412,6 +424,11 @@ typedef enum {
|
||||
EfiSlotTypePC98LocalBus = 0xA3,
|
||||
EfiSlotTypePC98Card = 0xA4,
|
||||
EfiSlotTypePciExpress = 0xA5,
|
||||
EfiSlotTypePciExpressX1 = 0xA6,
|
||||
EfiSlotTypePciExpressX2 = 0xA7,
|
||||
EfiSlotTypePciExpressX4 = 0xA8,
|
||||
EfiSlotTypePciExpressX8 = 0xA9,
|
||||
EfiSlotTypePciExpressX16 = 0xAA
|
||||
} EFI_MISC_SLOT_TYPE;
|
||||
|
||||
typedef enum {
|
||||
@@ -469,6 +486,9 @@ typedef struct {
|
||||
UINT16 SlotId;
|
||||
EFI_MISC_SLOT_CHARACTERISTICS SlotCharacteristics;
|
||||
EFI_DEVICE_PATH_PROTOCOL SlotDevicePath;
|
||||
UINT16 SegmentGroupNum;
|
||||
UINT8 BusNum;
|
||||
EFI_MISC_DEV_FUNC_NUM DevFuncNum;
|
||||
} EFI_MISC_SYSTEM_SLOT_DESIGNATION;
|
||||
|
||||
//
|
||||
@@ -486,6 +506,9 @@ typedef enum {
|
||||
EfiOnBoardDeviceTypeEthernet = 5,
|
||||
EfiOnBoardDeviceTypeTokenRing = 6,
|
||||
EfiOnBoardDeviceTypeSound = 7,
|
||||
EfiOnBoardDeviceTypePataController = 8,
|
||||
EfiOnBoardDeviceTypeSataController = 9,
|
||||
EfiOnBoardDeviceTypeSasController = 10
|
||||
} EFI_MISC_ONBOARD_DEVICE_TYPE;
|
||||
|
||||
typedef struct {
|
||||
@@ -1007,6 +1030,48 @@ typedef struct {
|
||||
|
||||
#define EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER 0x0000001E
|
||||
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
//Additional Information Record - SMBIOS Type 40
|
||||
//
|
||||
typedef struct {
|
||||
UINT8 EntryLength;
|
||||
UINT8 ReferencedSmbiosType;
|
||||
EFI_INTER_LINK_DATA ReferencedLink;
|
||||
UINT8 ReferencedOffset;
|
||||
STRING_REF EntryString;
|
||||
EFI_PHYSICAL_ADDRESS ValueAddress;
|
||||
} EFI_MISC_ADDITIONAL_INFORMATION_ENTRY;
|
||||
|
||||
typedef struct {
|
||||
UINT8 NumberOfAdditionalInformationEntries;
|
||||
EFI_PHYSICAL_ADDRESS AdditionalInfoEntriesAddr;
|
||||
} EFI_MISC_ADDITIONAL_INFORMATION;
|
||||
|
||||
#define EFI_MISC_ADDITIONAL_INFORMATION_RECORD_NUMBER 0x00000022
|
||||
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
//Onboard Devices Extended Infomation Record - SMBIOS Type 41
|
||||
//
|
||||
typedef struct {
|
||||
UINT8 TypeOfDevice:7;
|
||||
UINT8 DeviceStatus:1;
|
||||
} EFI_MISC_DEVICE_TYPE;
|
||||
|
||||
typedef struct {
|
||||
STRING_REF ReferenceDesignation;
|
||||
EFI_MISC_DEVICE_TYPE DeviceType;
|
||||
UINT8 DeviceTypeInstance;
|
||||
UINT16 SegmentGroupNum;
|
||||
UINT8 BusNum;
|
||||
EFI_MISC_DEV_FUNC_NUM DevFuncNum;
|
||||
} EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION;
|
||||
|
||||
#define EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION_RECORD_NUMBER 0x00000023
|
||||
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -1113,7 +1178,9 @@ typedef union {
|
||||
EFI_MISC_IPMI_INTERFACE_TYPE_DATA MiscIpmiInterfaceTypeData;
|
||||
EFI_MISC_SYSTEM_POWER_SUPPLY MiscPowerSupplyInfo;
|
||||
EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION MiscSmbiosStructEncapsulation;
|
||||
EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD MiscManagementDeviceThreshold;
|
||||
EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD MiscManagementDeviceThreshold;
|
||||
EFI_MISC_ADDITIONAL_INFORMATION MiscAdditionalInformation;
|
||||
EFI_MISC_ONBOARD_DEVICES_EXTENDED_INFORMATION MiscOnBoardDevicesExtendedInformation;
|
||||
} EFI_MISC_SUBCLASS_RECORDS;
|
||||
|
||||
//
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2006, Intel Corporation
|
||||
Copyright (c) 2004 - 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
|
||||
@@ -190,10 +190,16 @@ typedef enum {
|
||||
EfiProcessorFamilyHobbit = 0x70,
|
||||
EfiProcessorFamilyCrusoeTM5000 = 0x78,
|
||||
EfiProcessorFamilyCrusoeTM3000 = 0x79,
|
||||
EfiProcessorFamilyEfficeonTM8000 = 0x7A,
|
||||
EfiProcessorFamilyWeitek = 0x80,
|
||||
EfiProcessorFamilyItanium = 0x82,
|
||||
EfiProcessorFamilyAmdAthlon64 = 0x83,
|
||||
EfiProcessorFamilyAmdOpteron = 0x84,
|
||||
EfiProcessorFamilyAmdSempron = 0x85,
|
||||
EfiProcessorFamilyAmdTurion64Mobile = 0x86,
|
||||
EfiProcessorFamilyDualCoreAmdOpteron = 0x87,
|
||||
EfiProcessorFamilyAmdAthlon64X2DualCore = 0x88,
|
||||
EfiProcessorFamilyAmdTurion64X2Mobile = 0x89,
|
||||
EfiProcessorFamilyPARISC = 0x90,
|
||||
EfiProcessorFamilyPaRisc8500 = 0x91,
|
||||
EfiProcessorFamilyPaRisc8000 = 0x92,
|
||||
@@ -215,13 +221,35 @@ typedef enum {
|
||||
EfiProcessorFamilyIntelCeleronD = 0xBA,
|
||||
EfiProcessorFamilyIntelPentiumD = 0xBB,
|
||||
EfiProcessorFamilyIntelPentiumEx = 0xBC,
|
||||
EfiProcessorFamilyIntelCoreBrand = 0xBD,
|
||||
EfiProcessorFamilyReserved = 0xBE,
|
||||
EfiProcessorFamilyIntelCore2 = 0xBF,
|
||||
EfiProcessorFamilyIBM390 = 0xC8,
|
||||
EfiProcessorFamilyG4 = 0xC9,
|
||||
EfiProcessorFamilyG5 = 0xCA,
|
||||
EfiProcessorFamilyG6 = 0xCB,
|
||||
EfiProcessorFamilyzArchitectur = 0xCC,
|
||||
EfiProcessorFamilyViaC7M = 0xD2,
|
||||
EfiProcessorFamilyViaC7D = 0xD3,
|
||||
EfiProcessorFamilyViaC7 = 0xD4,
|
||||
EfiProcessorFamilyViaEden = 0xD5,
|
||||
EfiProcessorFamilyi860 = 0xFA,
|
||||
EfiProcessorFamilyi960 = 0xFB
|
||||
EfiProcessorFamilyi960 = 0xFB,
|
||||
EfiProcessorFamilyIndicatorFamily2 = 0xFE
|
||||
} EFI_PROCESSOR_FAMILY_DATA;
|
||||
|
||||
typedef enum {
|
||||
EfiProcessorFamilySh3 = 0x104,
|
||||
EfiProcessorFamilySh4 = 0x105,
|
||||
EfiProcessorFamilyArm = 0x118,
|
||||
EfiProcessorFamilyStrongArm = 0x119,
|
||||
EfiProcessorFamily6x86 = 0x12C,
|
||||
EfiProcessorFamilyMediaGx = 0x12D,
|
||||
EfiProcessorFamilyMii = 0x12E,
|
||||
EfiProcessorFamilyWinChip = 0x140,
|
||||
EfiProcessorFamilyDsp = 0x15E,
|
||||
EfiProcessorFamilyVideo = 0x1F4
|
||||
} EFI_PROCESSOR_FAMILY2_DATA;
|
||||
|
||||
typedef EFI_EXP_BASE10_DATA EFI_PROCESSOR_VOLTAGE_DATA;
|
||||
|
||||
@@ -282,7 +310,10 @@ typedef enum {
|
||||
EfiProcessorSocket939 = 0x12,
|
||||
EfiProcessorSocketmPGA604 = 0x13,
|
||||
EfiProcessorSocketLGA771 = 0x14,
|
||||
EfiProcessorSocketLGA775 = 0x15
|
||||
EfiProcessorSocketLGA775 = 0x15,
|
||||
EfiProcessorSocketS1 = 0x16,
|
||||
EfiProcessorSocketAm2 = 0x17,
|
||||
EfiProcessorSocketF = 0x18
|
||||
} EFI_PROCESSOR_SOCKET_TYPE_DATA;
|
||||
|
||||
typedef STRING_REF EFI_PROCESSOR_SOCKET_NAME_DATA;
|
||||
@@ -297,8 +328,19 @@ typedef enum {
|
||||
|
||||
typedef UINTN EFI_PROCESSOR_PACKAGE_NUMBER_DATA;
|
||||
|
||||
typedef UINT8 EFI_PROCESSOR_CORE_COUNT_DATA;
|
||||
typedef UINT8 EFI_PROCESSOR_ENABLED_CORE_COUNT_DATA;
|
||||
typedef UINT8 EFI_PROCESSOR_THREAD_COUNT_DATA;
|
||||
|
||||
typedef EFI_EXP_BASE10_DATA EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;
|
||||
|
||||
typedef struct {
|
||||
UINT16 Reserved :1;
|
||||
UINT16 Unknown :1;
|
||||
UINT16 Capable64Bit :1;
|
||||
UINT16 Reserved2 :13;
|
||||
} EFI_PROCESSOR_CHARACTERISTICS_DATA;
|
||||
|
||||
typedef enum {
|
||||
ProcessorCoreFrequencyRecordType = 1,
|
||||
ProcessorFsbFrequencyRecordType = 2,
|
||||
@@ -323,7 +365,12 @@ typedef enum {
|
||||
ProcessorPackageNumberRecordType = 21,
|
||||
ProcessorCoreFrequencyListRecordType = 22,
|
||||
ProcessorFsbFrequencyListRecordType = 23,
|
||||
ProcessorHealthStatusRecordType = 24
|
||||
ProcessorHealthStatusRecordType = 24,
|
||||
ProcessorCoreCountRecordType = 25,
|
||||
ProcessorEnabledCoreCountRecordType = 26,
|
||||
ProcessorThreadCountRecordType = 27,
|
||||
ProcessorCharacteristicsRecordType = 28,
|
||||
ProcessorFamily2RecordType = 29
|
||||
} EFI_CPU_VARIABLE_RECORD_TYPE;
|
||||
|
||||
typedef union {
|
||||
@@ -350,6 +397,11 @@ typedef union {
|
||||
EFI_PROCESSOR_ASSET_TAG_DATA ProcessorAssetTag;
|
||||
EFI_PROCESSOR_HEALTH_STATUS ProcessorHealthStatus;
|
||||
EFI_PROCESSOR_PACKAGE_NUMBER_DATA ProcessorPackageNumber;
|
||||
EFI_PROCESSOR_CORE_COUNT_DATA ProcessorCoreCount;
|
||||
EFI_PROCESSOR_ENABLED_CORE_COUNT_DATA ProcessorEnabledCoreCount;
|
||||
EFI_PROCESSOR_THREAD_COUNT_DATA ProcessorThreadCount;
|
||||
EFI_PROCESSOR_CHARACTERISTICS_DATA ProcessorCharacteristics;
|
||||
EFI_PROCESSOR_FAMILY2_DATA ProcessorFamily2;
|
||||
} EFI_CPU_VARIABLE_RECORD;
|
||||
|
||||
typedef struct {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2004 - 2006, Intel Corporation
|
||||
Copyright (c) 2004 - 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
|
||||
@@ -25,7 +25,11 @@ Abstract:
|
||||
|
||||
#include "EfiStatusCode.h"
|
||||
#include EFI_PROTOCOL_DEFINITION (DebugSupport)
|
||||
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
|
||||
#include EFI_PROTOCOL_DEFINITION (HiiDatabase)
|
||||
#else
|
||||
#include EFI_PROTOCOL_DEFINITION (Hii)
|
||||
#endif
|
||||
//
|
||||
// The size of string
|
||||
//
|
||||
|
Reference in New Issue
Block a user