From c7f33ca42470dc87bc41a8583f427883123d67a1 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Thu, 24 Jan 2008 07:10:05 +0000 Subject: 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@4623 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Foundation/Library/Dxe/Include/EfiPrintLib.h | 3 +- .../Foundation/Library/Dxe/Include/EfiRuntimeLib.h | 6 +- .../Foundation/Library/Dxe/Include/EfiScriptLib.h | 76 +++++++++++++++++++++- 3 files changed, 79 insertions(+), 6 deletions(-) (limited to 'EdkCompatibilityPkg/Foundation/Library/Dxe/Include') diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiPrintLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiPrintLib.h index 42a6ec8c8a..c28955bea5 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiPrintLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiPrintLib.h @@ -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,6 +190,7 @@ Returns: ; UINTN +EFIAPI VSPrint ( OUT CHAR16 *StartOfBuffer, IN UINTN StrLen, diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h index 25b0d6e6c9..1231cff703 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h @@ -1513,15 +1513,13 @@ EfiFvbSetVolumeAttributes ( Routine Description: Modifies the current settings of the firmware volume according to the - input parameter, and returns the new setting of the volume + input parameter. Arguments: Instance - The FV instance whose attributes is going to be modified - Attributes - On input, it is a pointer to EFI_FVB_ATTRIBUTES + Attributes - It is a pointer to EFI_FVB_ATTRIBUTES containing the desired firmware volume settings. - On successful return, it contains the new settings - of the firmware volume Returns: Status code diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiScriptLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiScriptLib.h index fbf9699a31..600cbb6a03 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiScriptLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiScriptLib.h @@ -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 @@ -28,6 +28,7 @@ Abstract: EFI_STATUS +EFIAPI BootScriptSaveInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -52,6 +53,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveIoWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -87,6 +89,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveIoReadWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -122,6 +125,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveMemWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -157,6 +161,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveMemReadWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -192,6 +197,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSavePciCfgWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -228,6 +234,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSavePciCfgReadWrite ( IN UINT16 TableName, IN EFI_BOOT_SCRIPT_WIDTH Width, @@ -265,6 +272,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveSmbusExecute ( IN UINT16 TableName, IN EFI_SMBUS_DEVICE_ADDRESS SlaveAddress, @@ -303,6 +311,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveStall ( IN UINT16 TableName, IN UINTN Duration @@ -330,6 +339,7 @@ Returns: ; EFI_STATUS +EFIAPI BootScriptSaveDispatch ( IN UINT16 TableName, IN EFI_PHYSICAL_ADDRESS EntryPoint @@ -355,7 +365,45 @@ Returns: --*/ ; + +EFI_STATUS +EFIAPI +BootScriptMemPoll ( + IN UINT16 TableName, + IN EFI_BOOT_SCRIPT_WIDTH Width, + IN UINT64 Address, + IN VOID *BitMask, + IN VOID *BitValue, + IN UINTN Duration, + IN UINTN LoopTimes + ) +/*++ + +Routine Description: + Polling one memory mapping register + +Arguments: + TableName - Desired boot script table + + Width - The width of the memory operations. + + Address - The base address of the memory operations. + + BitMask - A pointer to the bit mask to be AND-ed with the data read from the register. + + BitValue - A pointer to the data value after to be Masked. + + Duration - Duration in microseconds of the stall. + LoopTimes - The times of the register polling. + +Returns: + + EFI_SUCCESS - The operation was executed successfully + +--*/ +; + EFI_STATUS EFIAPI BootScriptSaveInformation ( @@ -473,6 +521,21 @@ Returns: #define SCRIPT_DISPATCH(TableName, EntryPoint) \ BootScriptSaveDispatch(TableName, EntryPoint) +#define SCRIPT_MEM_POLL(TableName, Width, Address, BitMask, BitValue, Duration, LoopTimes) \ + BootScriptMemPoll(TableName, Width, Address, BitMask, BitValue, Duration, LoopTimes) + +#define SCRIPT_INFORMATION(TableName, Length, Buffer) \ + BootScriptSaveInformation(TableName, Length, Buffer) + +#define SCRIPT_INFORMATION_UNICODE_STRING(TableName, String) \ + BootScriptSaveInformationUnicodeString(TableName, String) + +#define SCRIPT_INFORMATION_ASCII_STRING(TableName, String) \ + BootScriptSaveInformationAsciiString(TableName, String) + +// +// For backward compatibility +// #define SCRIPT_INOFRMATION(TableName, Length, Buffer) \ BootScriptSaveInformation(TableName, Length, Buffer) @@ -506,6 +569,17 @@ Returns: #define SCRIPT_DISPATCH(TableName, EntryPoint) +#define SCRIPT_MEM_POLL(TableName, Width, Address, BitMask, BitValue, Duration, LoopTimes) + +#define SCRIPT_INFORMATION(TableName, Length, Buffer) + +#define SCRIPT_INFORMATION_UNICODE_STRING(TableName, String) + +#define SCRIPT_INFORMATION_ASCII_STRING(TableName, String) + +// +// For backward compatibility +// #define SCRIPT_INOFRMATION(TableName, Length, Buffer) #define SCRIPT_INOFRMATION_UNICODE_STRING(TableName, String) -- cgit v1.2.3