UEFI HII: Merge UEFI HII support changes from branch.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4598 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -33,7 +33,7 @@ EFIAPI
|
||||
DriverCallback (
|
||||
IN EFI_FORM_CALLBACK_PROTOCOL *This,
|
||||
IN UINT16 KeyValue,
|
||||
IN EFI_IFR_DATA_ARRAY *Data,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data,
|
||||
OUT EFI_HII_CALLBACK_PACKET **Packet
|
||||
)
|
||||
/*++
|
||||
@@ -260,14 +260,14 @@ Returns:
|
||||
&UpdateData->Data // Buffer location to place op-codes
|
||||
);
|
||||
|
||||
Location = Location + ((EFI_IFR_OP_HEADER *) &UpdateData->Data)->Length;
|
||||
Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) &UpdateData->Data)->Length;
|
||||
|
||||
CreateCheckBoxOpCode (
|
||||
QuestionId, // Question ID
|
||||
1, // Data width (BOOLEAN = 1)
|
||||
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_PROMPT), // Token value for the Prompt
|
||||
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_HELP), // Token value for the Help
|
||||
EFI_IFR_FLAG_INTERACTIVE, // Flags
|
||||
FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE, // Flags
|
||||
0x1236, // Key
|
||||
Location // Buffer location to place op-codes
|
||||
);
|
||||
@@ -375,7 +375,7 @@ Returns:
|
||||
|
||||
DataPacket->DataArray.EntryCount = 1;
|
||||
DataPacket->DataArray.NvRamMap = NULL;
|
||||
((EFI_IFR_DATA_ENTRY *) (&DataPacket->DataArray + 1))->Flags = EXIT_REQUIRED;
|
||||
((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&DataPacket->DataArray + 1))->Flags = EXIT_REQUIRED;
|
||||
break;
|
||||
|
||||
case 0x1555:
|
||||
@@ -437,7 +437,7 @@ DriverSampleInit (
|
||||
// EFI_FORM_BROWSER_PROTOCOL *FormConfig;
|
||||
//
|
||||
EFI_HII_PACKAGES *PackageList;
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
FRAMEWORK_EFI_HII_HANDLE HiiHandle;
|
||||
STRING_REF TokenToUpdate;
|
||||
STRING_REF TokenToUpdate2;
|
||||
STRING_REF TokenToUpdate3;
|
||||
|
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
|
||||
|
||||
#include <PiDxe.h>
|
||||
#include <FrameworkDxe.h>
|
||||
|
||||
#include <Protocol/FrameworkFormCallback.h>
|
||||
#include <Protocol/FrameworkHii.h>
|
||||
@@ -60,7 +60,7 @@ typedef struct {
|
||||
EFI_FORM_CALLBACK_PROTOCOL DriverCallback;
|
||||
UINT16 *KeyList;
|
||||
VOID *FormBuffer;
|
||||
EFI_HII_HANDLE RegisteredHandle;
|
||||
FRAMEWORK_EFI_HII_HANDLE RegisteredHandle;
|
||||
EFI_HII_PROTOCOL *Hii;
|
||||
} EFI_CALLBACK_INFO;
|
||||
|
||||
|
@@ -54,7 +54,7 @@ formset
|
||||
|
||||
varstore MyIfrNVData2, key = 0x1234, name = MY_DATA2, guid = FORMSET_GUID;
|
||||
|
||||
varstore MyIfrNVData, key = 0x1324, name = MY_DATA1, guid = FORMSET_GUID;
|
||||
// varstore MyIfrNVData, key = 0x1324, name = MY_DATA1, guid = FORMSET_GUID;
|
||||
|
||||
varstore MyIfrNVData3, key = 0x4321, name = MY_DATA3, guid = FORMSET_GUID;
|
||||
|
||||
|
Reference in New Issue
Block a user