sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UEFI HII: Merge UEFI HII support changes from branch.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4598 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12
2008-01-21 14:37:05 +00:00
parent dc7b4a5c43
commit f79314fa8f
17 changed files with 708 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
View File

@ -33,7 +33,7 @@ EFIAPI
DriverCallback ( DriverCallback (
IN EFI_FORM_CALLBACK_PROTOCOL *This, IN EFI_FORM_CALLBACK_PROTOCOL *This,
IN UINT16 KeyValue, IN UINT16 KeyValue,
IN EFI_IFR_DATA_ARRAY *Data, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data,
OUT EFI_HII_CALLBACK_PACKET **Packet OUT EFI_HII_CALLBACK_PACKET **Packet
) )
/*++ /*++
@ -260,14 +260,14 @@ Returns:
&UpdateData->Data // Buffer location to place op-codes &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 ( CreateCheckBoxOpCode (
QuestionId, // Question ID QuestionId, // Question ID
1, // Data width (BOOLEAN = 1) 1, // Data width (BOOLEAN = 1)
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_PROMPT), // Token value for the Prompt (UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_PROMPT), // Token value for the Prompt
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_HELP), // Token value for the Help (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 0x1236, // Key
Location // Buffer location to place op-codes Location // Buffer location to place op-codes
); );
@ -375,7 +375,7 @@ Returns:
DataPacket->DataArray.EntryCount = 1; DataPacket->DataArray.EntryCount = 1;
DataPacket->DataArray.NvRamMap = NULL; 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; break;
case 0x1555: case 0x1555:
@ -437,7 +437,7 @@ DriverSampleInit (
// EFI_FORM_BROWSER_PROTOCOL *FormConfig; // EFI_FORM_BROWSER_PROTOCOL *FormConfig;
// //
EFI_HII_PACKAGES *PackageList; EFI_HII_PACKAGES *PackageList;
EFI_HII_HANDLE HiiHandle; FRAMEWORK_EFI_HII_HANDLE HiiHandle;
STRING_REF TokenToUpdate; STRING_REF TokenToUpdate;
STRING_REF TokenToUpdate2; STRING_REF TokenToUpdate2;
STRING_REF TokenToUpdate3; STRING_REF TokenToUpdate3;

4
IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
View File

@ -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/FrameworkFormCallback.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
@ -60,7 +60,7 @@ typedef struct {
EFI_FORM_CALLBACK_PROTOCOL DriverCallback; EFI_FORM_CALLBACK_PROTOCOL DriverCallback;
UINT16 *KeyList; UINT16 *KeyList;
VOID *FormBuffer; VOID *FormBuffer;
EFI_HII_HANDLE RegisteredHandle; FRAMEWORK_EFI_HII_HANDLE RegisteredHandle;
EFI_HII_PROTOCOL *Hii; EFI_HII_PROTOCOL *Hii;
} EFI_CALLBACK_INFO; } EFI_CALLBACK_INFO;

2
IntelFrameworkModulePkg/Universal/DriverSampleDxe/Vfr.vfr
View File

@ -54,7 +54,7 @@ formset
varstore MyIfrNVData2, key = 0x1234, name = MY_DATA2, guid = FORMSET_GUID; 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; varstore MyIfrNVData3, key = 0x4321, name = MY_DATA3, guid = FORMSET_GUID;

224
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Forms.c
View File

@ -169,14 +169,14 @@ Returns:
CallbackHandle = 0; CallbackHandle = 0;
ExportBuffer = *ExportBufferPtr; ExportBuffer = *ExportBufferPtr;
for (Index = 0; IfrData[Index] != EFI_IFR_END_FORM_SET_OP;) { for (Index = 0; IfrData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
VariableContents = (EFI_HII_VARIABLE_PACK *) ExportBuffer; VariableContents = (EFI_HII_VARIABLE_PACK *) ExportBuffer;
switch (IfrData[Index]) { switch (IfrData[Index]) {
case EFI_IFR_FORM_SET_OP: case FRAMEWORK_EFI_IFR_FORM_SET_OP:
TempValue = EFI_HII_VARIABLE; TempValue = EFI_HII_VARIABLE;
CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16)); CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16));
CopyMem (&TempValue, &((EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));
// //
// If the variable has 0 size, do not process it // If the variable has 0 size, do not process it
@ -193,7 +193,7 @@ Returns:
CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32)); CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32));
CopyMem ( CopyMem (
&CallbackHandle, &CallbackHandle,
&((EFI_IFR_FORM_SET *) &IfrData[Index])->CallbackHandle, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->CallbackHandle,
sizeof (EFI_PHYSICAL_ADDRESS) sizeof (EFI_PHYSICAL_ADDRESS)
); );
if (CallbackHandle != 0) { if (CallbackHandle != 0) {
@ -211,7 +211,7 @@ Returns:
// //
TempValue = 0; TempValue = 0;
CopyMem (&VariableContents->VariableId, &TempValue, sizeof (UINT16)); CopyMem (&VariableContents->VariableId, &TempValue, sizeof (UINT16));
CopyMem (&VariableContents->VariableGuid, &((EFI_IFR_FORM_SET *) &IfrData[Index])->Guid, sizeof (EFI_GUID)); CopyMem (&VariableContents->VariableGuid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->Guid, sizeof (EFI_GUID));
TempValue = sizeof (SETUP_MAP_NAME); TempValue = sizeof (SETUP_MAP_NAME);
CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32)); CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32));
@ -227,7 +227,7 @@ Returns:
CopyMem (ExportBuffer, SETUP_MAP_NAME, sizeof (SETUP_MAP_NAME)); CopyMem (ExportBuffer, SETUP_MAP_NAME, sizeof (SETUP_MAP_NAME));
ExportBuffer = ExportBuffer + sizeof (SETUP_MAP_NAME); ExportBuffer = ExportBuffer + sizeof (SETUP_MAP_NAME);
CopyMem (&TempValue, &((EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));
if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) { if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) {
Status = FormCallback->NvRead ( Status = FormCallback->NvRead (
@ -254,10 +254,10 @@ Returns:
DataTable->NumberOfVariableData++; DataTable->NumberOfVariableData++;
break; break;
case EFI_IFR_VARSTORE_OP: case FRAMEWORK_EFI_IFR_VARSTORE_OP:
TempValue = EFI_HII_VARIABLE; TempValue = EFI_HII_VARIABLE;
CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16)); CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16));
CopyMem (&TempValue, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));
// //
// If the variable has 0 size, do not process it // If the variable has 0 size, do not process it
@ -272,9 +272,9 @@ Returns:
TempValue = TempValue + sizeof (EFI_HII_VARIABLE_PACK); TempValue = TempValue + sizeof (EFI_HII_VARIABLE_PACK);
CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32)); CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32));
CopyMem (&VariableContents->VariableId, &((EFI_IFR_VARSTORE *) &IfrData[Index])->VarId, sizeof (UINT16)); CopyMem (&VariableContents->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->VarId, sizeof (UINT16));
CopyMem (&VariableContents->VariableGuid, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Guid, sizeof (EFI_GUID)); CopyMem (&VariableContents->VariableGuid, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Guid, sizeof (EFI_GUID));
TempValue = (UINTN) ((EFI_IFR_VARSTORE *) &IfrData[Index])->Header.Length - sizeof (EFI_IFR_VARSTORE); TempValue = (UINTN) ((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Header.Length - sizeof (FRAMEWORK_EFI_IFR_VARSTORE);
TempValue = TempValue * 2; TempValue = TempValue * 2;
CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32)); CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32));
@ -289,13 +289,13 @@ Returns:
ExportBuffer = ExportBuffer + sizeof (EFI_HII_VARIABLE_PACK); ExportBuffer = ExportBuffer + sizeof (EFI_HII_VARIABLE_PACK);
String = (CHAR16 *) ExportBuffer; String = (CHAR16 *) ExportBuffer;
for (Index2 = 0; Index2 < TempValue / 2; Index2++) { for (Index2 = 0; Index2 < TempValue / 2; Index2++) {
ExportBuffer[Index2 * 2] = IfrData[Index + sizeof (EFI_IFR_VARSTORE) + Index2]; ExportBuffer[Index2 * 2] = IfrData[Index + sizeof (FRAMEWORK_EFI_IFR_VARSTORE) + Index2];
ExportBuffer[Index2 * 2 + 1] = 0; ExportBuffer[Index2 * 2 + 1] = 0;
} }
ExportBuffer = ExportBuffer + TempValue; ExportBuffer = ExportBuffer + TempValue;
CopyMem (&TempValue, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));
if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) { if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) {
Status = FormCallback->NvRead ( Status = FormCallback->NvRead (
@ -344,7 +344,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiExportDatabase ( HiiExportDatabase (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
OUT VOID *Buffer OUT VOID *Buffer
) )
@ -433,23 +433,23 @@ Returns:
RawData = (UINT8 *) FormPack; RawData = (UINT8 *) FormPack;
for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) { for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
switch (RawData[Index]) { switch (RawData[Index]) {
case EFI_IFR_FORM_SET_OP: case FRAMEWORK_EFI_IFR_FORM_SET_OP:
CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) &RawData[Index])->NvDataSize, sizeof (UINT16)); CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->NvDataSize, sizeof (UINT16));
SizeNeeded = SizeNeeded + VariableSize + sizeof (SETUP_MAP_NAME) + sizeof (EFI_HII_VARIABLE_PACK); SizeNeeded = SizeNeeded + VariableSize + sizeof (SETUP_MAP_NAME) + sizeof (EFI_HII_VARIABLE_PACK);
VariableExist = TRUE; VariableExist = TRUE;
break; break;
case EFI_IFR_VARSTORE_OP: case FRAMEWORK_EFI_IFR_VARSTORE_OP:
CopyMem (&VariableSize, &((EFI_IFR_VARSTORE *) &RawData[Index])->Size, sizeof (UINT16)); CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) &RawData[Index])->Size, sizeof (UINT16));
SizeNeeded = SizeNeeded + VariableSize + sizeof (EFI_HII_VARIABLE_PACK); SizeNeeded = SizeNeeded + VariableSize + sizeof (EFI_HII_VARIABLE_PACK);
// //
// We will be expanding the stored ASCII name to a Unicode string. This will cause some memory overhead // We will be expanding the stored ASCII name to a Unicode string. This will cause some memory overhead
// Since the VARSTORE size already takes in consideration the ASCII size, we need to size it and add another // Since the VARSTORE size already takes in consideration the ASCII size, we need to size it and add another
// instance of it. Essentially, 2 ASCII strings == 1 Unicode string in size. // instance of it. Essentially, 2 ASCII strings == 1 Unicode string in size.
// //
TempValue = (UINTN) ((EFI_IFR_VARSTORE *) &RawData[Index])->Header.Length - sizeof (EFI_IFR_VARSTORE); TempValue = (UINTN) ((FRAMEWORK_EFI_IFR_VARSTORE *) &RawData[Index])->Header.Length - sizeof (FRAMEWORK_EFI_IFR_VARSTORE);
SizeNeeded = SizeNeeded + TempValue * 2; SizeNeeded = SizeNeeded + TempValue * 2;
VariableExist = TRUE; VariableExist = TRUE;
break; break;
@ -683,7 +683,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetForms ( HiiGetForms (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_ID FormId, IN EFI_FORM_ID FormId,
IN OUT UINTN *BufferLengthTemp, IN OUT UINTN *BufferLengthTemp,
OUT UINT8 *Buffer OUT UINT8 *Buffer
@ -698,7 +698,7 @@ Routine Description:
Arguments: Arguments:
This - A pointer to the EFI_HII_PROTOCOL instance. This - A pointer to the EFI_HII_PROTOCOL instance.
Handle - Handle on which the form resides. Type EFI_HII_HANDLE is defined in Handle - Handle on which the form resides. Type FRAMEWORK_EFI_HII_HANDLE is defined in
EFI_HII_PROTOCOL.NewPack() in the Packages section. EFI_HII_PROTOCOL.NewPack() in the Packages section.
FormId - The ID of the form to return. If the ID is zero, the entire form package is returned. FormId - The ID of the form to return. If the ID is zero, the entire form package is returned.
@ -728,8 +728,8 @@ Returns:
EFI_HII_DATA *HiiData; EFI_HII_DATA *HiiData;
EFI_HII_HANDLE_DATABASE *HandleDatabase; EFI_HII_HANDLE_DATABASE *HandleDatabase;
EFI_HII_IFR_PACK *FormPack; EFI_HII_IFR_PACK *FormPack;
EFI_IFR_FORM *Form; FRAMEWORK_EFI_IFR_FORM *Form;
EFI_IFR_OP_HEADER *Location; FRAMEWORK_EFI_IFR_OP_HEADER *Location;
UINT16 *BufferLength = (UINT16 *) BufferLengthTemp; UINT16 *BufferLength = (UINT16 *) BufferLengthTemp;
UINTN FormLength; UINTN FormLength;
@ -791,15 +791,15 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} else { } else {
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER)); FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));
Location = (EFI_IFR_OP_HEADER *) FormPack; Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) FormPack;
// //
// Look for the FormId requested // Look for the FormId requested
// //
for (; Location->OpCode != EFI_IFR_END_FORM_SET_OP;) { for (; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
switch (Location->OpCode) { switch (Location->OpCode) {
case EFI_IFR_FORM_OP: case FRAMEWORK_EFI_IFR_FORM_OP:
Form = (EFI_IFR_FORM *) Location; Form = (FRAMEWORK_EFI_IFR_FORM *) Location;
// //
// If we found a Form Op-code and it is of the correct Id, copy it and return // If we found a Form Op-code and it is of the correct Id, copy it and return
@ -808,12 +808,12 @@ Returns:
// //
// Calculate the total size of form // Calculate the total size of form
// //
for (FormLength = 0; Location->OpCode != EFI_IFR_END_FORM_OP; ) { for (FormLength = 0; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_OP; ) {
FormLength += Location->Length; FormLength += Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
} }
FormLength += Location->Length; FormLength += Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
if ((Buffer == NULL) || (FormLength > *BufferLength)) { if ((Buffer == NULL) || (FormLength > *BufferLength)) {
*BufferLengthTemp = FormLength; *BufferLengthTemp = FormLength;
@ -823,7 +823,7 @@ Returns:
// //
// Rewind to start offset of the found Form // Rewind to start offset of the found Form
// //
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *)Location - FormLength); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *)Location - FormLength);
CopyMem (Buffer, Location, FormLength); CopyMem (Buffer, Location, FormLength);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -834,7 +834,7 @@ Returns:
// //
// Go to the next Op-Code // Go to the next Op-Code
// //
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
} }
} }
@ -849,7 +849,7 @@ STATIC
UINT8* UINT8*
HiiGetDefaultImageInitPack ( HiiGetDefaultImageInitPack (
IN OUT EFI_HII_VARIABLE_PACK_LIST *VariablePackItem, IN OUT EFI_HII_VARIABLE_PACK_LIST *VariablePackItem,
IN EFI_IFR_VARSTORE *VarStore IN FRAMEWORK_EFI_IFR_VARSTORE *VarStore
) )
/*++ /*++
@ -910,8 +910,8 @@ STATIC
VOID VOID
HiiGetDefaultImagePopulateMap ( HiiGetDefaultImagePopulateMap (
IN OUT UINT8 *Map, IN OUT UINT8 *Map,
IN EFI_IFR_OP_HEADER *FormSet, IN FRAMEWORK_EFI_IFR_OP_HEADER *FormSet,
IN EFI_IFR_VARSTORE *VarStore, IN FRAMEWORK_EFI_IFR_VARSTORE *VarStore,
IN UINTN DefaultMask IN UINTN DefaultMask
) )
/*++ /*++
@ -923,7 +923,7 @@ HiiGetDefaultImagePopulateMap (
Arguments: Arguments:
Map - Memory pointer to hold the default values. Map - Memory pointer to hold the default values.
FormSet - The starting EFI_IFR_OP_HEADER to begin retriving default values. FormSet - The starting FRAMEWORK_EFI_IFR_OP_HEADER to begin retriving default values.
VarStore - IFR variable storage. VarStore - IFR variable storage.
DefaultMask - The mask used to get the default variable. DefaultMask - The mask used to get the default variable.
@ -934,15 +934,15 @@ HiiGetDefaultImagePopulateMap (
--*/ --*/
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_IFR_OP_HEADER *IfrItem; FRAMEWORK_EFI_IFR_OP_HEADER *IfrItem;
UINT16 VarId; UINT16 VarId;
EFI_IFR_VARSTORE_SELECT *VarSelect; FRAMEWORK_EFI_IFR_VARSTORE_SELECT *VarSelect;
EFI_IFR_ONE_OF_OPTION *OneOfOpt; FRAMEWORK_EFI_IFR_ONE_OF_OPTION *OneOfOpt;
EFI_IFR_CHECKBOX *CheckBox; FRAMEWORK_EFI_IFR_CHECKBOX *CheckBox;
EFI_IFR_NUMERIC *Numeric; FRAMEWORK_EFI_IFR_NUMERIC *Numeric;
UINTN Size; UINTN Size;
UINTN SizeTmp; UINTN SizeTmp;
EFI_IFR_NV_DATA *IfrNvData; FRAMEWORK_EFI_IFR_NV_DATA *IfrNvData;
EFI_GUID Guid; EFI_GUID Guid;
CHAR16 *Name16; CHAR16 *Name16;
CHAR8 *Name8; CHAR8 *Name8;
@ -963,7 +963,7 @@ HiiGetDefaultImagePopulateMap (
// //
// First, check if the map exists in the NV. If so, get it from NV and exit. // First, check if the map exists in the NV. If so, get it from NV and exit.
// //
if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) { if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {
// //
// Check if Manufaturing Defaults exist in the NV. // Check if Manufaturing Defaults exist in the NV.
// //
@ -1002,7 +1002,7 @@ HiiGetDefaultImagePopulateMap (
// Ignore status. Either it gets read or not. // Ignore status. Either it gets read or not.
// //
FormCallbackProt = NULL; FormCallbackProt = NULL;
CopyMem (&CallbackHandle, &((EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle)); CopyMem (&CallbackHandle, &((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle));
if (CallbackHandle != NULL) { if (CallbackHandle != NULL) {
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
(EFI_HANDLE) (UINTN) CallbackHandle, (EFI_HANDLE) (UINTN) CallbackHandle,
@ -1052,15 +1052,15 @@ HiiGetDefaultImagePopulateMap (
// Iterate all IFR statements and for applicable, retrieve the default into the Map. // Iterate all IFR statements and for applicable, retrieve the default into the Map.
// //
for (IfrItem = FormSet, VarId = 0; for (IfrItem = FormSet, VarId = 0;
IfrItem->OpCode != EFI_IFR_END_FORM_SET_OP; IfrItem->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;
IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length) IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length)
) { ) {
// //
// Observe VarStore switch. // Observe VarStore switch.
// //
if (EFI_IFR_VARSTORE_SELECT_OP == IfrItem->OpCode) { if (FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP == IfrItem->OpCode) {
VarSelect = (EFI_IFR_VARSTORE_SELECT *) IfrItem; VarSelect = (FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) IfrItem;
VarId = VarSelect->VarId; VarId = VarSelect->VarId;
continue; continue;
} }
@ -1076,28 +1076,28 @@ HiiGetDefaultImagePopulateMap (
// //
// Extract the default value from this opcode if applicable, and apply it to the map. // Extract the default value from this opcode if applicable, and apply it to the map.
// //
IfrNvData = (EFI_IFR_NV_DATA *) IfrItem; IfrNvData = (FRAMEWORK_EFI_IFR_NV_DATA *) IfrItem;
switch (IfrItem->OpCode) { switch (IfrItem->OpCode) {
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size); ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);
// //
// Get to the first EFI_IFR_ONE_OF_OPTION_OP // Get to the first FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP
// //
IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length); IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length);
ASSERT (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode); ASSERT (FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode);
OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem; OneOfOpt = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *)IfrItem;
// //
// In the worst case, the first will be the default. // In the worst case, the first will be the default.
// //
CopyMem (Map + IfrNvData->QuestionId, &OneOfOpt->Value, IfrNvData->StorageWidth); CopyMem (Map + IfrNvData->QuestionId, &OneOfOpt->Value, IfrNvData->StorageWidth);
while (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode) { while (FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode) {
OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem; OneOfOpt = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *)IfrItem;
if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) { if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {
if (0 != (OneOfOpt->Flags & EFI_IFR_FLAG_MANUFACTURING)) { if (0 != (OneOfOpt->Flags & FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) {
// //
// In the worst case, the first will be the default. // In the worst case, the first will be the default.
// //
@ -1105,7 +1105,7 @@ HiiGetDefaultImagePopulateMap (
break; break;
} }
} else { } else {
if (OneOfOpt->Flags & EFI_IFR_FLAG_DEFAULT) { if (OneOfOpt->Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {
// //
// In the worst case, the first will be the default. // In the worst case, the first will be the default.
// //
@ -1114,34 +1114,34 @@ HiiGetDefaultImagePopulateMap (
} }
} }
IfrItem = (EFI_IFR_OP_HEADER *)((UINT8*)IfrItem + IfrItem->Length); IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *)((UINT8*)IfrItem + IfrItem->Length);
} }
continue; continue;
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size); ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);
CheckBox = (EFI_IFR_CHECK_BOX *)IfrItem; CheckBox = (FRAMEWORK_EFI_IFR_CHECK_BOX *)IfrItem;
if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) { if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {
if (0 != (CheckBox->Flags & EFI_IFR_FLAG_MANUFACTURING)) { if (0 != (CheckBox->Flags & FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) {
*(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE; *(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;
} }
} else { } else {
if (CheckBox->Flags & EFI_IFR_FLAG_DEFAULT) { if (CheckBox->Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {
*(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE; *(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;
} }
} }
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size); ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);
Numeric = (EFI_IFR_NUMERIC *) IfrItem; Numeric = (FRAMEWORK_EFI_IFR_NUMERIC *) IfrItem;
CopyMem (Map + IfrNvData->QuestionId, &Numeric->Default, IfrNvData->StorageWidth); CopyMem (Map + IfrNvData->QuestionId, &Numeric->Default, IfrNvData->StorageWidth);
break; break;
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
// //
// No support for default value for these opcodes. // No support for default value for these opcodes.
// //
@ -1158,7 +1158,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetDefaultImage ( HiiGetDefaultImage (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN UINTN DefaultMask, IN UINTN DefaultMask,
OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList
) )
@ -1186,10 +1186,10 @@ HiiGetDefaultImage (
{ {
EFI_HII_HANDLE_DATABASE *HandleDatabase; EFI_HII_HANDLE_DATABASE *HandleDatabase;
EFI_HII_PACKAGE_INSTANCE *PackageInstance; EFI_HII_PACKAGE_INSTANCE *PackageInstance;
EFI_IFR_OP_HEADER *FormSet; FRAMEWORK_EFI_IFR_OP_HEADER *FormSet;
EFI_IFR_OP_HEADER *IfrItem; FRAMEWORK_EFI_IFR_OP_HEADER *IfrItem;
EFI_IFR_VARSTORE *VarStore; FRAMEWORK_EFI_IFR_VARSTORE *VarStore;
EFI_IFR_VARSTORE *VarStoreDefault; FRAMEWORK_EFI_IFR_VARSTORE *VarStoreDefault;
UINTN SetupMapNameSize; UINTN SetupMapNameSize;
UINTN SizeOfMaps; UINTN SizeOfMaps;
EFI_HII_VARIABLE_PACK_LIST *PackList; EFI_HII_VARIABLE_PACK_LIST *PackList;
@ -1212,7 +1212,7 @@ HiiGetDefaultImage (
if (PackageInstance == NULL) { if (PackageInstance == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
FormSet = (EFI_IFR_OP_HEADER *) ((UINT8 *) &PackageInstance->IfrData + sizeof (EFI_HII_IFR_PACK)); FormSet = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) &PackageInstance->IfrData + sizeof (EFI_HII_IFR_PACK));
// //
// Get the sizes of all the VARSTOREs in this VFR. // Get the sizes of all the VARSTOREs in this VFR.
@ -1220,10 +1220,10 @@ HiiGetDefaultImage (
// //
SizeOfMaps = 0; SizeOfMaps = 0;
IfrItem = FormSet; IfrItem = FormSet;
while (EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) { while (FRAMEWORK_EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {
if (EFI_IFR_VARSTORE_OP == IfrItem->OpCode) { if (FRAMEWORK_EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {
VarStore = (EFI_IFR_VARSTORE *) IfrItem; VarStore = (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem;
// //
// Size of the map // Size of the map
// //
@ -1242,7 +1242,7 @@ HiiGetDefaultImage (
SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST); SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST);
} }
IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length); IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);
} }
// //
@ -1252,14 +1252,14 @@ HiiGetDefaultImage (
SetupMapNameSize = StrLen (SETUP_MAP_NAME) + 1; SetupMapNameSize = StrLen (SETUP_MAP_NAME) + 1;
VarStoreDefault = AllocateZeroPool (sizeof (*VarStoreDefault) + SetupMapNameSize); VarStoreDefault = AllocateZeroPool (sizeof (*VarStoreDefault) + SetupMapNameSize);
if (0 != ((EFI_IFR_FORM_SET*)FormSet)->NvDataSize) { if (0 != ((FRAMEWORK_EFI_IFR_FORM_SET*)FormSet)->NvDataSize) {
VarStoreDefault->Header.OpCode = EFI_IFR_VARSTORE_OP; VarStoreDefault->Header.OpCode = FRAMEWORK_EFI_IFR_VARSTORE_OP;
VarStoreDefault->Header.Length = (UINT8) (sizeof (*VarStoreDefault) + SetupMapNameSize); VarStoreDefault->Header.Length = (UINT8) (sizeof (*VarStoreDefault) + SetupMapNameSize);
Unicode2Ascii ((CHAR8 *) (VarStoreDefault + 1), SETUP_MAP_NAME); Unicode2Ascii ((CHAR8 *) (VarStoreDefault + 1), SETUP_MAP_NAME);
CopyMem (&VarStoreDefault->Guid, &((EFI_IFR_FORM_SET*) FormSet)->Guid, sizeof (EFI_GUID)); CopyMem (&VarStoreDefault->Guid, &((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->Guid, sizeof (EFI_GUID));
VarStoreDefault->VarId = 0; VarStoreDefault->VarId = 0;
VarStoreDefault->Size = ((EFI_IFR_FORM_SET*) FormSet)->NvDataSize; VarStoreDefault->Size = ((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->NvDataSize;
// //
// Size of the map // Size of the map
@ -1314,20 +1314,20 @@ HiiGetDefaultImage (
// Handle the explicit varstore(s) // Handle the explicit varstore(s)
// //
IfrItem = FormSet; IfrItem = FormSet;
while (EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) { while (FRAMEWORK_EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {
if (EFI_IFR_VARSTORE_OP == IfrItem->OpCode) { if (FRAMEWORK_EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {
Map = HiiGetDefaultImageInitPack (PackListNext, (EFI_IFR_VARSTORE *) IfrItem); Map = HiiGetDefaultImageInitPack (PackListNext, (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem);
HiiGetDefaultImagePopulateMap (Map, FormSet, (EFI_IFR_VARSTORE *) IfrItem, DefaultMask); HiiGetDefaultImagePopulateMap (Map, FormSet, (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem, DefaultMask);
PackListNext->NextVariablePack = (EFI_HII_VARIABLE_PACK_LIST *) ((UINT8 *) PackListNext->VariablePack + PackListNext->VariablePack->Header.Length); PackListNext->NextVariablePack = (EFI_HII_VARIABLE_PACK_LIST *) ((UINT8 *) PackListNext->VariablePack + PackListNext->VariablePack->Header.Length);
PackListLast = PackListNext; PackListLast = PackListNext;
PackListNext = PackListNext->NextVariablePack; PackListNext = PackListNext->NextVariablePack;
} }
IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length); IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);
} }
PackListLast->NextVariablePack = NULL; PackListLast->NextVariablePack = NULL;
@ -1341,7 +1341,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiUpdateForm ( HiiUpdateForm (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_LABEL Label, IN EFI_FORM_LABEL Label,
IN BOOLEAN AddData, IN BOOLEAN AddData,
IN EFI_HII_UPDATE_DATA *Data IN EFI_HII_UPDATE_DATA *Data
@ -1368,8 +1368,8 @@ Returns:
EFI_HII_DATA *HiiData; EFI_HII_DATA *HiiData;
EFI_HII_HANDLE_DATABASE *HandleDatabase; EFI_HII_HANDLE_DATABASE *HandleDatabase;
EFI_HII_IFR_PACK *FormPack; EFI_HII_IFR_PACK *FormPack;
EFI_IFR_OP_HEADER *Location; FRAMEWORK_EFI_IFR_OP_HEADER *Location;
EFI_IFR_OP_HEADER *DataLocation; FRAMEWORK_EFI_IFR_OP_HEADER *DataLocation;
UINT8 *OtherBuffer; UINT8 *OtherBuffer;
UINT8 *TempBuffer; UINT8 *TempBuffer;
UINT8 *OrigTempBuffer; UINT8 *OrigTempBuffer;
@ -1409,12 +1409,12 @@ Returns:
// //
// Calculate and allocate space for retrieval of IFR data // Calculate and allocate space for retrieval of IFR data
// //
DataLocation = (EFI_IFR_OP_HEADER *) &Data->Data; DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) &Data->Data;
TempBufferSize = (CHAR8 *) (&PackageInstance->IfrData) - (CHAR8 *) (PackageInstance); TempBufferSize = (CHAR8 *) (&PackageInstance->IfrData) - (CHAR8 *) (PackageInstance);
for (Index = 0; Index < Data->DataCount; Index++) { for (Index = 0; Index < Data->DataCount; Index++) {
TempBufferSize += DataLocation->Length; TempBufferSize += DataLocation->Length;
DataLocation = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length); DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);
} }
TempBufferSize += PackageInstance->IfrSize + PackageInstance->StringSize; TempBufferSize += PackageInstance->IfrSize + PackageInstance->StringSize;
@ -1444,42 +1444,42 @@ Returns:
// what the location is of the beginning of the string data. // what the location is of the beginning of the string data.
// //
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER)); FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));
Location = (EFI_IFR_OP_HEADER *) FormPack; Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) FormPack;
// //
// Look for the FormId requested // Look for the FormId requested
// //
for (; Location->OpCode != EFI_IFR_END_FORM_SET_OP;) { for (; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
switch (Location->OpCode) { switch (Location->OpCode) {
case EFI_IFR_FORM_SET_OP: case FRAMEWORK_EFI_IFR_FORM_SET_OP:
// //
// If the FormSet has an update pending, pay attention. // If the FormSet has an update pending, pay attention.
// //
if (Data->FormSetUpdate) { if (Data->FormSetUpdate) {
((EFI_IFR_FORM_SET *) Location)->CallbackHandle = Data->FormCallbackHandle; ((FRAMEWORK_EFI_IFR_FORM_SET *) Location)->CallbackHandle = Data->FormCallbackHandle;
} }
CopyMem (TempBuffer, Location, Location->Length); CopyMem (TempBuffer, Location, Location->Length);
TempBuffer = TempBuffer + Location->Length; TempBuffer = TempBuffer + Location->Length;
break; break;
case EFI_IFR_FORM_OP: case FRAMEWORK_EFI_IFR_FORM_OP:
// //
// If the Form has an update pending, pay attention. // If the Form has an update pending, pay attention.
// //
if (Data->FormUpdate) { if (Data->FormUpdate) {
((EFI_IFR_FORM *) Location)->FormTitle = Data->FormTitle; ((FRAMEWORK_EFI_IFR_FORM *) Location)->FormTitle = Data->FormTitle;
} }
CopyMem (TempBuffer, Location, Location->Length); CopyMem (TempBuffer, Location, Location->Length);
TempBuffer = TempBuffer + Location->Length; TempBuffer = TempBuffer + Location->Length;
break; break;
case EFI_IFR_LABEL_OP: case FRAMEWORK_EFI_IFR_LABEL_OP:
// //
// If the label does not match the requested update point, ignore it // If the label does not match the requested update point, ignore it
// //
if (((EFI_IFR_LABEL *) Location)->LabelId != Label) { if (((FRAMEWORK_EFI_IFR_LABEL *) Location)->LabelId != Label) {
// //
// Copy the label // Copy the label
// //
@ -1489,7 +1489,7 @@ Returns:
// //
// Go to the next Op-Code // Go to the next Op-Code
// //
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
continue; continue;
} }
@ -1503,19 +1503,19 @@ Returns:
// //
// Add the DataCount amount of opcodes to TempBuffer // Add the DataCount amount of opcodes to TempBuffer
// //
DataLocation = (EFI_IFR_OP_HEADER *) &Data->Data; DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) &Data->Data;
for (Index = 0; Index < Data->DataCount; Index++) { for (Index = 0; Index < Data->DataCount; Index++) {
CopyMem (TempBuffer, DataLocation, DataLocation->Length); CopyMem (TempBuffer, DataLocation, DataLocation->Length);
((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize += DataLocation->Length; ((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize += DataLocation->Length;
OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN)); OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN));
CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2); CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2);
TempBuffer = TempBuffer + DataLocation->Length; TempBuffer = TempBuffer + DataLocation->Length;
DataLocation = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length); DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);
} }
// //
// Go to the next Op-Code // Go to the next Op-Code
// //
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
continue; continue;
} else { } else {
// //
@ -1523,7 +1523,7 @@ Returns:
// //
CopyMem (TempBuffer, Location, Location->Length); CopyMem (TempBuffer, Location, Location->Length);
TempBuffer = TempBuffer + Location->Length; TempBuffer = TempBuffer + Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
// //
// Remove the DataCount amount of opcodes unless we run into an end of form or a label // Remove the DataCount amount of opcodes unless we run into an end of form or a label
@ -1532,7 +1532,7 @@ Returns:
// //
// If we are about to skip an end form - bail out, since that is illegal // If we are about to skip an end form - bail out, since that is illegal
// //
if ((Location->OpCode == EFI_IFR_END_FORM_OP) || (Location->OpCode == EFI_IFR_LABEL_OP)) { if ((Location->OpCode == FRAMEWORK_EFI_IFR_END_FORM_OP) || (Location->OpCode == FRAMEWORK_EFI_IFR_LABEL_OP)) {
break; break;
} }
// //
@ -1541,7 +1541,7 @@ Returns:
((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize -= Location->Length; ((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize -= Location->Length;
OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN)); OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN));
CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2); CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2);
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
} }
} }
@ -1553,7 +1553,7 @@ Returns:
// //
// Go to the next Op-Code // Go to the next Op-Code
// //
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
} }
// //
// Copy the last op-code left behind from the for loop // Copy the last op-code left behind from the for loop
@ -1564,7 +1564,7 @@ Returns:
// Advance to beginning of strings and copy them // Advance to beginning of strings and copy them
// //
TempBuffer = TempBuffer + Location->Length; TempBuffer = TempBuffer + Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length); Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
CopyMem (TempBuffer, Location, PackageInstance->StringSize); CopyMem (TempBuffer, Location, PackageInstance->StringSize);
// //

17
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
View File

@ -135,7 +135,7 @@ EFIAPI
HiiFindHandles ( HiiFindHandles (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN OUT UINT16 *HandleBufferLength, IN OUT UINT16 *HandleBufferLength,
OUT EFI_HII_HANDLE Handle[1] OUT FRAMEWORK_EFI_HII_HANDLE Handle[1]
) )
/*++ /*++
@ -171,31 +171,31 @@ Returns:
// //
// Is there a sufficient buffer for the data being passed back? // Is there a sufficient buffer for the data being passed back?
// //
if (*HandleBufferLength >= (sizeof (EFI_HII_HANDLE) * HandleCount)) { if (*HandleBufferLength >= (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount)) {
Database = HiiData->DatabaseHead; Database = HiiData->DatabaseHead;
// //
// Copy the Head information // Copy the Head information
// //
if (Database->Handle != 0) { if (Database->Handle != 0) {
CopyMem (&Handle[0], &Database->Handle, sizeof (EFI_HII_HANDLE)); CopyMem (&Handle[0], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));
Database = Database->NextHandleDatabase; Database = Database->NextHandleDatabase;
} }
// //
// Copy more data if appropriate // Copy more data if appropriate
// //
for (HandleCount = 1; Database != NULL; HandleCount++) { for (HandleCount = 1; Database != NULL; HandleCount++) {
CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (EFI_HII_HANDLE)); CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));
Database = Database->NextHandleDatabase; Database = Database->NextHandleDatabase;
} }
*HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount); *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);
return EFI_SUCCESS; return EFI_SUCCESS;
} else { } else {
// //
// Insufficient buffer length // Insufficient buffer length
// //
*HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount); *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;
} }
} }
@ -204,7 +204,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetPrimaryLanguages ( HiiGetPrimaryLanguages (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
OUT EFI_STRING *LanguageString OUT EFI_STRING *LanguageString
) )
/*++ /*++
@ -301,7 +301,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetSecondaryLanguages ( HiiGetSecondaryLanguages (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN CHAR16 *PrimaryLanguage, IN CHAR16 *PrimaryLanguage,
OUT EFI_STRING *LanguageString OUT EFI_STRING *LanguageString
) )
@ -399,3 +399,4 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }

42
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
View File

@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define _HIIDATABASE_H #define _HIIDATABASE_H
#include <PiDxe.h> #include <FrameworkDxe.h>
#include <Guid/GlobalVariable.h> #include <Guid/GlobalVariable.h>
#include <Protocol/FrameworkFormCallback.h> #include <Protocol/FrameworkFormCallback.h>
@ -49,7 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
typedef struct _EFI_HII_HANDLE_DATABASE { typedef struct _EFI_HII_HANDLE_DATABASE {
VOID *Buffer; // Actual buffer pointer VOID *Buffer; // Actual buffer pointer
EFI_HII_HANDLE Handle; // Monotonically increasing value to signify the value returned to caller FRAMEWORK_EFI_HII_HANDLE Handle; // Monotonically increasing value to signify the value returned to caller
UINT32 NumberOfTokens; // The initial number of tokens when first registered UINT32 NumberOfTokens; // The initial number of tokens when first registered
struct _EFI_HII_HANDLE_DATABASE *NextHandleDatabase; struct _EFI_HII_HANDLE_DATABASE *NextHandleDatabase;
} EFI_HII_HANDLE_DATABASE; } EFI_HII_HANDLE_DATABASE;
@ -57,8 +57,8 @@ typedef struct _EFI_HII_HANDLE_DATABASE {
typedef struct { typedef struct {
EFI_NARROW_GLYPH NarrowGlyphs[MAX_GLYPH_COUNT]; EFI_NARROW_GLYPH NarrowGlyphs[MAX_GLYPH_COUNT];
EFI_WIDE_GLYPH WideGlyphs[MAX_GLYPH_COUNT]; EFI_WIDE_GLYPH WideGlyphs[MAX_GLYPH_COUNT];
EFI_KEY_DESCRIPTOR SystemKeyboardLayout[106]; FRAMEWORK_EFI_KEY_DESCRIPTOR SystemKeyboardLayout[106];
EFI_KEY_DESCRIPTOR OverrideKeyboardLayout[106]; FRAMEWORK_EFI_KEY_DESCRIPTOR OverrideKeyboardLayout[106];
BOOLEAN SystemKeyboardUpdate; // Has the SystemKeyboard been updated? BOOLEAN SystemKeyboardUpdate; // Has the SystemKeyboard been updated?
} EFI_HII_GLOBAL_DATA; } EFI_HII_GLOBAL_DATA;
@ -71,7 +71,7 @@ typedef struct {
} EFI_HII_DATA; } EFI_HII_DATA;
typedef struct { typedef struct {
EFI_HII_HANDLE Handle; FRAMEWORK_EFI_HII_HANDLE Handle;
EFI_GUID Guid; EFI_GUID Guid;
EFI_HII_HANDLE_PACK HandlePack; EFI_HII_HANDLE_PACK HandlePack;
UINTN IfrSize; UINTN IfrSize;
@ -82,8 +82,8 @@ typedef struct {
typedef struct { typedef struct {
EFI_HII_PACK_HEADER Header; EFI_HII_PACK_HEADER Header;
EFI_IFR_FORM_SET FormSet; FRAMEWORK_EFI_IFR_FORM_SET FormSet;
EFI_IFR_END_FORM_SET EndFormSet; FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;
} EFI_FORM_SET_STUB; } EFI_FORM_SET_STUB;
#define EFI_HII_DATA_FROM_THIS(a) CR (a, EFI_HII_DATA, Hii, EFI_HII_DATA_SIGNATURE) #define EFI_HII_DATA_FROM_THIS(a) CR (a, EFI_HII_DATA, Hii, EFI_HII_DATA_SIGNATURE)
@ -129,7 +129,7 @@ EFIAPI
HiiNewPack ( HiiNewPack (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_PACKAGES *PackageList, IN EFI_HII_PACKAGES *PackageList,
OUT EFI_HII_HANDLE *Handle OUT FRAMEWORK_EFI_HII_HANDLE *Handle
) )
; ;
@ -137,7 +137,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiRemovePack ( HiiRemovePack (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
; ;
@ -146,7 +146,7 @@ EFIAPI
HiiFindHandles ( HiiFindHandles (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN OUT UINT16 *HandleBufferLength, IN OUT UINT16 *HandleBufferLength,
OUT EFI_HII_HANDLE *Handle OUT FRAMEWORK_EFI_HII_HANDLE *Handle
) )
; ;
@ -154,7 +154,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiExportDatabase ( HiiExportDatabase (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
OUT VOID *Buffer OUT VOID *Buffer
) )
@ -191,7 +191,7 @@ EFIAPI
HiiNewString ( HiiNewString (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *Language, IN CHAR16 *Language,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT STRING_REF *Reference, IN OUT STRING_REF *Reference,
IN CHAR16 *NewString IN CHAR16 *NewString
) )
@ -201,7 +201,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetString ( HiiGetString (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
IN BOOLEAN Raw, IN BOOLEAN Raw,
IN CHAR16 *LanguageString, IN CHAR16 *LanguageString,
@ -214,7 +214,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiResetStrings ( HiiResetStrings (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
; ;
@ -232,7 +232,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetPrimaryLanguages ( HiiGetPrimaryLanguages (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
OUT EFI_STRING *LanguageString OUT EFI_STRING *LanguageString
) )
; ;
@ -241,7 +241,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetSecondaryLanguages ( HiiGetSecondaryLanguages (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN CHAR16 *PrimaryLanguage, IN CHAR16 *PrimaryLanguage,
OUT EFI_STRING *LanguageString OUT EFI_STRING *LanguageString
) )
@ -251,7 +251,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetLine ( HiiGetLine (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
IN OUT UINT16 *Index, IN OUT UINT16 *Index,
IN UINT16 LineWidth, IN UINT16 LineWidth,
@ -265,7 +265,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetForms ( HiiGetForms (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_ID FormId, IN EFI_FORM_ID FormId,
IN OUT UINTN *BufferLength, IN OUT UINTN *BufferLength,
OUT UINT8 *Buffer OUT UINT8 *Buffer
@ -276,7 +276,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetDefaultImage ( HiiGetDefaultImage (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN UINTN DefaultMask, IN UINTN DefaultMask,
OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList
) )
@ -286,7 +286,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiUpdateForm ( HiiUpdateForm (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_LABEL Label, IN EFI_FORM_LABEL Label,
IN BOOLEAN AddData, IN BOOLEAN AddData,
IN EFI_HII_UPDATE_DATA *Data IN EFI_HII_UPDATE_DATA *Data
@ -298,7 +298,7 @@ EFIAPI
HiiGetKeyboardLayout ( HiiGetKeyboardLayout (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
OUT UINT16 *DescriptorCount, OUT UINT16 *DescriptorCount,
OUT EFI_KEY_DESCRIPTOR *Descriptor OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor
) )
; ;

2
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Keyboard.c
View File

@ -21,7 +21,7 @@ EFIAPI
HiiGetKeyboardLayout ( HiiGetKeyboardLayout (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
OUT UINT16 *DescriptorCount, OUT UINT16 *DescriptorCount,
OUT EFI_KEY_DESCRIPTOR *Descriptor OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor
) )
/*++ /*++

42
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
View File

@ -141,12 +141,12 @@ Returns:
RawData = (UINT8 *) FormPack; RawData = (UINT8 *) FormPack;
for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) { for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
if (RawData[Index] == EFI_IFR_FORM_SET_OP) { if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {
// //
// Cache the guid for this formset // Cache the guid for this formset
// //
CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID)); CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));
break; break;
} }
@ -171,12 +171,12 @@ Returns:
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&HandlePackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER)); FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&HandlePackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));
RawData = (UINT8 *) FormPack; RawData = (UINT8 *) FormPack;
for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) { for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
if (RawData[Index] == EFI_IFR_FORM_SET_OP) { if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {
// //
// Cache the guid for this formset // Cache the guid for this formset
// //
CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID)); CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));
break; break;
} }
@ -209,7 +209,7 @@ EFIAPI
HiiNewPack ( HiiNewPack (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_PACKAGES *Packages, IN EFI_HII_PACKAGES *Packages,
OUT EFI_HII_HANDLE *Handle OUT FRAMEWORK_EFI_HII_HANDLE *Handle
) )
/*++ /*++
@ -334,13 +334,13 @@ Returns:
// //
// Advance to the Form Set Op-code // Advance to the Form Set Op-code
// //
for (Count = 0; ((EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != EFI_IFR_FORM_SET_OP;) { for (Count = 0; ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != FRAMEWORK_EFI_IFR_FORM_SET_OP;) {
Count = Count + ((EFI_IFR_OP_HEADER *) &Location[Count])->Length; Count = Count + ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->Length;
} }
// //
// Copy to local variable // Copy to local variable
// //
CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID)); CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID));
// //
// Check to see if IfrPack->Guid != GuidId // Check to see if IfrPack->Guid != GuidId
@ -364,16 +364,16 @@ Returns:
FormSetStub.Header.Type = EFI_HII_IFR; FormSetStub.Header.Type = EFI_HII_IFR;
FormSetStub.Header.Length = sizeof (EFI_FORM_SET_STUB); FormSetStub.Header.Length = sizeof (EFI_FORM_SET_STUB);
FormSetStub.FormSet.Header.OpCode = EFI_IFR_FORM_SET_OP; FormSetStub.FormSet.Header.OpCode = FRAMEWORK_EFI_IFR_FORM_SET_OP;
FormSetStub.FormSet.Header.Length = (UINT8) sizeof (EFI_IFR_FORM_SET); FormSetStub.FormSet.Header.Length = (UINT8) sizeof (FRAMEWORK_EFI_IFR_FORM_SET);
// //
// Dummy string // Dummy string
// //
FormSetStub.FormSet.FormSetTitle = 0x02; FormSetStub.FormSet.FormSetTitle = 0x02;
CopyMem (&FormSetStub.FormSet.Guid, Packages->GuidId, sizeof (EFI_GUID)); CopyMem (&FormSetStub.FormSet.Guid, Packages->GuidId, sizeof (EFI_GUID));
FormSetStub.EndFormSet.Header.OpCode = EFI_IFR_END_FORM_SET_OP; FormSetStub.EndFormSet.Header.OpCode = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;
FormSetStub.EndFormSet.Header.Length = (UINT8) sizeof (EFI_IFR_END_FORM_SET); FormSetStub.EndFormSet.Header.Length = (UINT8) sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);
IfrPack = (EFI_HII_IFR_PACK *) &FormSetStub; IfrPack = (EFI_HII_IFR_PACK *) &FormSetStub;
} }
@ -432,7 +432,7 @@ Returns:
// we go down one level deeper, increment the handle value that will be passed back. // we go down one level deeper, increment the handle value that will be passed back.
// //
if (Database->Handle >= *Handle) { if (Database->Handle >= *Handle) {
*Handle = (EFI_HII_HANDLE) (Database->Handle + 1); *Handle = (FRAMEWORK_EFI_HII_HANDLE ) (Database->Handle + 1);
} }
} }
@ -543,7 +543,7 @@ Returns:
// If someone updates the Descriptors with a count of 0, blow aware the overrides. // If someone updates the Descriptors with a count of 0, blow aware the overrides.
// //
if (KeyboardPack->DescriptorCount == 0) { if (KeyboardPack->DescriptorCount == 0) {
ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106); ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);
} }
if (KeyboardPack->DescriptorCount < 106 && KeyboardPack->DescriptorCount > 0) { if (KeyboardPack->DescriptorCount < 106 && KeyboardPack->DescriptorCount > 0) {
@ -551,26 +551,26 @@ Returns:
// If SystemKeyboard was updated already, then steer changes to the override database // If SystemKeyboard was updated already, then steer changes to the override database
// //
if (GlobalData->SystemKeyboardUpdate) { if (GlobalData->SystemKeyboardUpdate) {
ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106); ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);
for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) { for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {
CopyMem (&Member, &KeyboardPack->Descriptor[Count].Key, sizeof (UINT16)); CopyMem (&Member, &KeyboardPack->Descriptor[Count].Key, sizeof (UINT16));
CopyMem ( CopyMem (
&GlobalData->OverrideKeyboardLayout[Member], &GlobalData->OverrideKeyboardLayout[Member],
&KeyboardPack->Descriptor[Count], &KeyboardPack->Descriptor[Count],
sizeof (EFI_KEY_DESCRIPTOR) sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)
); );
} }
} else { } else {
// //
// SystemKeyboard was never updated, so this is likely the keyboard driver setting the System database. // SystemKeyboard was never updated, so this is likely the keyboard driver setting the System database.
// //
ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106); ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);
for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) { for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {
CopyMem (&Member, &KeyboardPack->Descriptor->Key, sizeof (UINT16)); CopyMem (&Member, &KeyboardPack->Descriptor->Key, sizeof (UINT16));
CopyMem ( CopyMem (
&GlobalData->SystemKeyboardLayout[Member], &GlobalData->SystemKeyboardLayout[Member],
&KeyboardPack->Descriptor[Count], &KeyboardPack->Descriptor[Count],
sizeof (EFI_KEY_DESCRIPTOR) sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)
); );
} }
// //
@ -593,7 +593,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiRemovePack ( HiiRemovePack (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
/*++ /*++

10
IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Strings.c
View File

@ -131,7 +131,7 @@ EFI_STATUS
HiiNewString2 ( HiiNewString2 (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *Language, IN CHAR16 *Language,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT STRING_REF *Reference, IN OUT STRING_REF *Reference,
IN CHAR16 *NewString, IN CHAR16 *NewString,
IN BOOLEAN ResetStrings IN BOOLEAN ResetStrings
@ -639,7 +639,7 @@ EFIAPI
HiiNewString ( HiiNewString (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *Language, IN CHAR16 *Language,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT STRING_REF *Reference, IN OUT STRING_REF *Reference,
IN CHAR16 *NewString IN CHAR16 *NewString
) )
@ -714,7 +714,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiResetStrings ( HiiResetStrings (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
/*++ /*++
@ -766,7 +766,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetString ( HiiGetString (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
IN BOOLEAN Raw, IN BOOLEAN Raw,
IN CHAR16 *LanguageString, IN CHAR16 *LanguageString,
@ -1028,7 +1028,7 @@ EFI_STATUS
EFIAPI EFIAPI
HiiGetLine ( HiiGetLine (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
IN OUT UINT16 *Index, IN OUT UINT16 *Index,
IN UINT16 LineWidth, IN UINT16 LineWidth,

120
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
View File

@ -261,9 +261,9 @@ Returns:
// We need to rewind to the beginning of the Inconsistent expression // We need to rewind to the beginning of the Inconsistent expression
// //
for (; for (;
(InconsistentTags->Operand != EFI_IFR_INCONSISTENT_IF_OP) && (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP) &&
(InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP) && (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP) &&
(InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP); (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP);
) { ) {
InconsistentTags = InconsistentTags->Previous; InconsistentTags = InconsistentTags->Previous;
} }
@ -278,9 +278,9 @@ Returns:
// consistency check like grayout/suppress // consistency check like grayout/suppress
// //
for (; for (;
InconsistentTags->Operand != EFI_IFR_END_IF_OP && InconsistentTags->Operand != FRAMEWORK_EFI_IFR_END_IF_OP &&
InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP && InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP &&
InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP; InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP;
) { ) {
GrowBooleanExpression (InconsistentTags, BooleanExpression, BooleanExpressionLength); GrowBooleanExpression (InconsistentTags, BooleanExpression, BooleanExpressionLength);
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
@ -397,16 +397,16 @@ Returns:
// while Operand means ideqval, TRUE, or other what can be evaluated to True or False, // while Operand means ideqval, TRUE, or other what can be evaluated to True or False,
// and Opcode means AND or OR. // and Opcode means AND or OR.
// //
if (Iterator->Operand == EFI_IFR_NOT_OP || if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP ||
Iterator->Operand == 0) { Iterator->Operand == 0) {
return 0x1; return 0x1;
} else if (Iterator->Operand == EFI_IFR_EQ_VAR_VAL_OP || } else if (Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||
Iterator->Operand == EFI_IFR_EQ_ID_VAL_OP || Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||
Iterator->Operand == EFI_IFR_EQ_ID_ID_OP || Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||
Iterator->Operand == EFI_IFR_EQ_ID_LIST_OP) { Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP) {
Iterator++; Iterator++;
if (Iterator->Operand == EFI_IFR_AND_OP || if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP ||
Iterator->Operand == EFI_IFR_OR_OP) { Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {
Iterator--; Iterator--;
return 0x1; return 0x1;
} }
@ -507,7 +507,7 @@ Returns:
} }
switch ((*PIterator)->Operand) { switch ((*PIterator)->Operand) {
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
UnicodeValueToString ( UnicodeValueToString (
VariableName, VariableName,
FALSE, FALSE,
@ -539,9 +539,9 @@ Returns:
// //
MapValue2 = (*PIterator)->Value; MapValue2 = (*PIterator)->Value;
(*PIterator)++; (*PIterator)++;
if ((*PIterator)->Operand == EFI_IFR_GT_OP) { if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
PushValue = (BOOLEAN) (MapValue > MapValue2); PushValue = (BOOLEAN) (MapValue > MapValue2);
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) { } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
PushValue = (BOOLEAN) (MapValue >= MapValue2); PushValue = (BOOLEAN) (MapValue >= MapValue2);
} else { } else {
(*PIterator)--; (*PIterator)--;
@ -552,15 +552,15 @@ Returns:
break; break;
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
// //
// Do operation after knowing the compare operator. // Do operation after knowing the compare operator.
// //
MapValue2 = (*PIterator)->Value; MapValue2 = (*PIterator)->Value;
(*PIterator)++; (*PIterator)++;
if ((*PIterator)->Operand == EFI_IFR_GT_OP) { if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
PushValue = (BOOLEAN) (MapValue > MapValue2); PushValue = (BOOLEAN) (MapValue > MapValue2);
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) { } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
PushValue = (BOOLEAN) (MapValue >= MapValue2); PushValue = (BOOLEAN) (MapValue >= MapValue2);
} else { } else {
(*PIterator)--; (*PIterator)--;
@ -569,14 +569,14 @@ Returns:
PushBool (StackPtr, PushValue); PushBool (StackPtr, PushValue);
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
// //
// Do operation after knowing the compare operator. // Do operation after knowing the compare operator.
// //
(*PIterator)++; (*PIterator)++;
if ((*PIterator)->Operand == EFI_IFR_GT_OP) { if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
PushValue = (BOOLEAN) (MapValue > MapValue2); PushValue = (BOOLEAN) (MapValue > MapValue2);
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) { } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
PushValue = (BOOLEAN) (MapValue >= MapValue2); PushValue = (BOOLEAN) (MapValue >= MapValue2);
} else { } else {
(*PIterator)--; (*PIterator)--;
@ -585,7 +585,7 @@ Returns:
PushBool (StackPtr, PushValue); PushBool (StackPtr, PushValue);
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
for (Index = 0; Index < (*PIterator)->ListLength; Index++) { for (Index = 0; Index < (*PIterator)->ListLength; Index++) {
Operator = (BOOLEAN) (MapValue == (*PIterator)->ValueList[Index]); Operator = (BOOLEAN) (MapValue == (*PIterator)->ValueList[Index]);
if (Operator) { if (Operator) {
@ -596,32 +596,32 @@ Returns:
PushBool (StackPtr, Operator); PushBool (StackPtr, Operator);
break; break;
case EFI_IFR_TRUE_OP: case FRAMEWORK_EFI_IFR_TRUE_OP:
PushBool (StackPtr, TRUE); PushBool (StackPtr, TRUE);
break; break;
case EFI_IFR_FALSE_OP: case FRAMEWORK_EFI_IFR_FALSE_OP:
PushBool (StackPtr, FALSE); PushBool (StackPtr, FALSE);
break; break;
case EFI_IFR_AND_OP: case FRAMEWORK_EFI_IFR_AND_OP:
Operator = PopBool (StackPtr); Operator = PopBool (StackPtr);
Operator2 = PopBool (StackPtr); Operator2 = PopBool (StackPtr);
PushBool (StackPtr, (BOOLEAN) (Operator && Operator2)); PushBool (StackPtr, (BOOLEAN) (Operator && Operator2));
break; break;
case EFI_IFR_OR_OP: case FRAMEWORK_EFI_IFR_OR_OP:
Operator = PopBool (StackPtr); Operator = PopBool (StackPtr);
Operator2 = PopBool (StackPtr); Operator2 = PopBool (StackPtr);
PushBool (StackPtr, (BOOLEAN) (Operator || Operator2)); PushBool (StackPtr, (BOOLEAN) (Operator || Operator2));
break; break;
case EFI_IFR_NOT_OP: case FRAMEWORK_EFI_IFR_NOT_OP:
Operator = PopBool (StackPtr); Operator = PopBool (StackPtr);
PushBool (StackPtr, (BOOLEAN) (!Operator)); PushBool (StackPtr, (BOOLEAN) (!Operator));
break; break;
case EFI_IFR_SUPPRESS_IF_OP: case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
case EFI_IFR_GRAYOUT_IF_OP: case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
case EFI_IFR_INCONSISTENT_IF_OP: case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
default: default:
// //
// Return to the previous tag if runs out of boolean expression. // Return to the previous tag if runs out of boolean expression.
@ -750,7 +750,7 @@ Returns:
} }
switch (Iterator->Operand) { switch (Iterator->Operand) {
case EFI_IFR_SUPPRESS_IF_OP: case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
// //
// Must have hit a suppress followed by a grayout or vice-versa // Must have hit a suppress followed by a grayout or vice-versa
// //
@ -768,7 +768,7 @@ Returns:
*PopUp = Iterator->Popup; *PopUp = Iterator->Popup;
break; break;
case EFI_IFR_GRAYOUT_IF_OP: case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
// //
// Must have hit a suppress followed by a grayout or vice-versa // Must have hit a suppress followed by a grayout or vice-versa
// //
@ -786,7 +786,7 @@ Returns:
*PopUp = Iterator->Popup; *PopUp = Iterator->Popup;
break; break;
case EFI_IFR_INCONSISTENT_IF_OP: case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
CosmeticConsistency = FALSE; CosmeticConsistency = FALSE;
*PopUp = Iterator->Popup; *PopUp = Iterator->Popup;
break; break;
@ -795,7 +795,7 @@ Returns:
// In the case of external variable values, we must read the variable which is // In the case of external variable values, we must read the variable which is
// named by the human readable version of the OpCode->VariableId and the guid of the formset // named by the human readable version of the OpCode->VariableId and the guid of the formset
// //
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -838,7 +838,7 @@ Returns:
break; break;
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -853,7 +853,7 @@ Returns:
PushBool (&StackPtr, (BOOLEAN) (MapValue == Iterator->Value)); PushBool (&StackPtr, (BOOLEAN) (MapValue == Iterator->Value));
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -868,7 +868,7 @@ Returns:
PushBool (&StackPtr, (BOOLEAN) (MapValue == MapValue2)); PushBool (&StackPtr, (BOOLEAN) (MapValue == MapValue2));
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -890,9 +890,9 @@ Returns:
PushBool (&StackPtr, Operator); PushBool (&StackPtr, Operator);
break; break;
case EFI_IFR_AND_OP: case FRAMEWORK_EFI_IFR_AND_OP:
Iterator++; Iterator++;
if (Iterator->Operand == EFI_IFR_NOT_OP) { if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {
NotOperator = TRUE; NotOperator = TRUE;
Iterator++; Iterator++;
} }
@ -922,7 +922,7 @@ Returns:
} }
switch (Iterator->Operand) { switch (Iterator->Operand) {
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
// //
// If Not - flip the results // If Not - flip the results
// //
@ -939,7 +939,7 @@ Returns:
// In the case of external variable values, we must read the variable which is // In the case of external variable values, we must read the variable which is
// named by the human readable version of the OpCode->VariableId and the guid of the formset // named by the human readable version of the OpCode->VariableId and the guid of the formset
// //
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
UnicodeValueToString ( UnicodeValueToString (
VariableName, VariableName,
FALSE, FALSE,
@ -976,7 +976,7 @@ Returns:
} }
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
// //
// If Not - flip the results // If Not - flip the results
// //
@ -989,7 +989,7 @@ Returns:
PushBool (&StackPtr, Operator); PushBool (&StackPtr, Operator);
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
for (Index = 0; Index < Iterator->ListLength; Index++) { for (Index = 0; Index < Iterator->ListLength; Index++) {
// //
// If Not - flip the results // If Not - flip the results
@ -1026,9 +1026,9 @@ Returns:
PushBool (&StackPtr, (BOOLEAN) (Operator && Operator2)); PushBool (&StackPtr, (BOOLEAN) (Operator && Operator2));
break; break;
case EFI_IFR_OR_OP: case FRAMEWORK_EFI_IFR_OR_OP:
Iterator++; Iterator++;
if (Iterator->Operand == EFI_IFR_NOT_OP) { if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {
NotOperator = TRUE; NotOperator = TRUE;
Iterator++; Iterator++;
} }
@ -1058,7 +1058,7 @@ Returns:
} }
switch (Iterator->Operand) { switch (Iterator->Operand) {
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
// //
// If Not - flip the results // If Not - flip the results
// //
@ -1075,7 +1075,7 @@ Returns:
// In the case of external variable values, we must read the variable which is // In the case of external variable values, we must read the variable which is
// named by the human readable version of the OpCode->VariableId and the guid of the formset // named by the human readable version of the OpCode->VariableId and the guid of the formset
// //
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
UnicodeValueToString ( UnicodeValueToString (
VariableName, VariableName,
FALSE, FALSE,
@ -1112,7 +1112,7 @@ Returns:
} }
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
// //
// If Not - flip the results // If Not - flip the results
// //
@ -1125,7 +1125,7 @@ Returns:
PushBool (&StackPtr, Operator); PushBool (&StackPtr, Operator);
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
for (Index = 0; Index < Iterator->ListLength; Index++) { for (Index = 0; Index < Iterator->ListLength; Index++) {
// //
// If Not - flip the results // If Not - flip the results
@ -1162,7 +1162,7 @@ Returns:
PushBool (&StackPtr, (BOOLEAN) (Operator || Operator2)); PushBool (&StackPtr, (BOOLEAN) (Operator || Operator2));
break; break;
case EFI_IFR_NOT_OP: case FRAMEWORK_EFI_IFR_NOT_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -1179,12 +1179,12 @@ Returns:
// //
Iterator++; Iterator++;
if (Iterator->Operand == EFI_IFR_OR_OP) { if (Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {
OrOperator = TRUE; OrOperator = TRUE;
Iterator++; Iterator++;
} }
if (Iterator->Operand == EFI_IFR_AND_OP) { if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP) {
AndOperator = TRUE; AndOperator = TRUE;
Iterator++; Iterator++;
} }
@ -1214,7 +1214,7 @@ Returns:
} }
switch (Iterator->Operand) { switch (Iterator->Operand) {
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
Operator = (BOOLEAN)!(MapValue == Iterator->Value); Operator = (BOOLEAN)!(MapValue == Iterator->Value);
PushBool (&StackPtr, Operator); PushBool (&StackPtr, Operator);
break; break;
@ -1223,7 +1223,7 @@ Returns:
// In the case of external variable values, we must read the variable which is // In the case of external variable values, we must read the variable which is
// named by the human readable version of the OpCode->VariableId and the guid of the formset // named by the human readable version of the OpCode->VariableId and the guid of the formset
// //
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
UnicodeValueToString ( UnicodeValueToString (
VariableName, VariableName,
FALSE, FALSE,
@ -1254,12 +1254,12 @@ Returns:
} }
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
Operator = (BOOLEAN)!(MapValue == MapValue2); Operator = (BOOLEAN)!(MapValue == MapValue2);
PushBool (&StackPtr, Operator); PushBool (&StackPtr, Operator);
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
for (Index = 0; Index < Iterator->ListLength; Index++) { for (Index = 0; Index < Iterator->ListLength; Index++) {
Operator = (BOOLEAN)!(MapValue == Iterator->ValueList[Index]); Operator = (BOOLEAN)!(MapValue == Iterator->ValueList[Index]);
if (Operator) { if (Operator) {
@ -1290,7 +1290,7 @@ Returns:
} }
break; break;
case EFI_IFR_TRUE_OP: case FRAMEWORK_EFI_IFR_TRUE_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -1303,7 +1303,7 @@ Returns:
} }
break; break;
case EFI_IFR_FALSE_OP: case FRAMEWORK_EFI_IFR_FALSE_OP:
// //
// To check whether Ifr is legacy. Once every boolean expression. // To check whether Ifr is legacy. Once every boolean expression.
// //
@ -1316,7 +1316,7 @@ Returns:
} }
break; break;
case EFI_IFR_END_IF_OP: case FRAMEWORK_EFI_IFR_END_IF_OP:
Operator = PopBool (&StackPtr); Operator = PopBool (&StackPtr);
// //
// If there is an error, return, otherwise keep looking - there might // If there is an error, return, otherwise keep looking - there might

82
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
View File

@ -195,7 +195,7 @@ ReadPassword (
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption,
IN BOOLEAN PromptForPassword, IN BOOLEAN PromptForPassword,
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN EFI_IFR_DATA_ARRAY *PageData, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
IN BOOLEAN SecondEntry, IN BOOLEAN SecondEntry,
IN EFI_FILE_FORM_TAGS *FileFormTags, IN EFI_FILE_FORM_TAGS *FileFormTags,
OUT CHAR16 *StringPtr OUT CHAR16 *StringPtr
@ -219,7 +219,7 @@ ReadPassword (
EFI_VARIABLE_DEFINITION *VariableDefinition; EFI_VARIABLE_DEFINITION *VariableDefinition;
UINTN DimensionsWidth; UINTN DimensionsWidth;
UINTN DimensionsHeight; UINTN DimensionsHeight;
EFI_IFR_DATA_ENTRY *DataEntry; FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
UINTN WidthOfString; UINTN WidthOfString;
DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn; DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;
@ -252,12 +252,12 @@ ReadPassword (
ASSERT (TempString); ASSERT (TempString);
ASSERT (TempString2); ASSERT (TempString2);
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
// //
// Password requires a callback to determine if a password exists // Password requires a callback to determine if a password exists
// //
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1); DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
DataEntry->OpCode = EFI_IFR_PASSWORD_OP; DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;
DataEntry->Length = 3; DataEntry->Length = 3;
ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition); ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition);
@ -347,12 +347,12 @@ Error:
break; break;
case CHAR_CARRIAGE_RETURN: case CHAR_CARRIAGE_RETURN:
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
// //
// User just typed a string in // User just typed a string in
// //
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1); DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
DataEntry->OpCode = EFI_IFR_PASSWORD_OP; DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;
// //
// If the user just typed in a password, Data = 1 // If the user just typed in a password, Data = 1
@ -371,7 +371,7 @@ Error:
); );
} }
DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY); DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);
DataEntry->Data = (VOID *) TempString; DataEntry->Data = (VOID *) TempString;
} else { } else {
DataEntry->Length = 3; DataEntry->Length = 3;
@ -386,7 +386,7 @@ Error:
); );
} }
DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY); DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);
DataEntry->Data = (VOID *) TempString2; DataEntry->Data = (VOID *) TempString2;
} }
@ -661,7 +661,7 @@ Returns:
if (ManualInput) { if (ManualInput) {
PrintAt (Column, Row, (CHAR16 *) L"[ ]"); PrintAt (Column, Row, (CHAR16 *) L"[ ]");
Column++; Column++;
if (Tag->Operand != EFI_IFR_TIME_OP) { if (Tag->Operand != FRAMEWORK_EFI_IFR_TIME_OP) {
*Value = BackupValue; *Value = BackupValue;
} }
} }
@ -683,7 +683,7 @@ TheKey2:
switch (Key.UnicodeChar) { switch (Key.UnicodeChar) {
case '+': case '+':
case '-': case '-':
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) { if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
Key.UnicodeChar = CHAR_NULL; Key.UnicodeChar = CHAR_NULL;
if (Key.UnicodeChar == '+') { if (Key.UnicodeChar == '+') {
Key.ScanCode = SCAN_RIGHT; Key.ScanCode = SCAN_RIGHT;
@ -699,7 +699,7 @@ TheKey2:
switch (Key.ScanCode) { switch (Key.ScanCode) {
case SCAN_LEFT: case SCAN_LEFT:
case SCAN_RIGHT: case SCAN_RIGHT:
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) { if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
// //
// By setting this value, we will return back to the caller. // By setting this value, we will return back to the caller.
// We need to do this since an auto-refresh will destroy the adjustment // We need to do this since an auto-refresh will destroy the adjustment
@ -734,7 +734,7 @@ TheKey2:
Number = (UINT16) GetStringWidth (FormattedNumber); Number = (UINT16) GetStringWidth (FormattedNumber);
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) { if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) { for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) {
PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" "); PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" ");
} }
@ -847,7 +847,7 @@ EnterCarriageReturn:
// if two questions are bound by consistency checks and each only has two possible choices, there // if two questions are bound by consistency checks and each only has two possible choices, there
// would be no way for a user to switch the values. Thus we require late checking. // would be no way for a user to switch the values. Thus we require late checking.
// //
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
CopyMem (&Tag->OldValue, &BackupValue, Tag->StorageWidth); CopyMem (&Tag->OldValue, &BackupValue, Tag->StorageWidth);
} else { } else {
// //
@ -1015,7 +1015,7 @@ GetSelectionInputPopUp (
ShowDownArrow = FALSE; ShowDownArrow = FALSE;
ShowUpArrow = FALSE; ShowUpArrow = FALSE;
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth); ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth);
ASSERT (ValueArrayBackup != NULL); ASSERT (ValueArrayBackup != NULL);
CopyMem (ValueArrayBackup, ValueArray, ValueCount); CopyMem (ValueArrayBackup, ValueArray, ValueCount);
@ -1045,8 +1045,8 @@ GetSelectionInputPopUp (
// //
// Get the number of one of options present and its size // Get the number of one of options present and its size
// //
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) { for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP && if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
!MenuOption->Tags[Index].Suppress) { !MenuOption->Tags[Index].Suppress) {
if (!FirstOptionFoundFlag) { if (!FirstOptionFoundFlag) {
FirstOptionFoundFlag = TRUE; FirstOptionFoundFlag = TRUE;
@ -1060,7 +1060,7 @@ GetSelectionInputPopUp (
// //
if (Initialized) { if (Initialized) {
for (ValueBackup = (UINT8) MenuOption->TagIndex; for (ValueBackup = (UINT8) MenuOption->TagIndex;
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_OP; MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_OP;
ValueBackup++ ValueBackup++
) { ) {
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) { if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {
@ -1123,9 +1123,9 @@ GetSelectionInputPopUp (
break; break;
} }
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
for (ValueBackup = (UINT8) MenuOption->TagIndex; for (ValueBackup = (UINT8) MenuOption->TagIndex;
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP; MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
ValueBackup++ ValueBackup++
) { ) {
// //
@ -1190,14 +1190,14 @@ GetSelectionInputPopUp (
// //
Index2 = Top + 1; Index2 = Top + 1;
for (Index = MenuOption->TagIndex + TopOptionIndex; for (Index = MenuOption->TagIndex + TopOptionIndex;
(MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom); (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);
Index++ Index++
) { ) {
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
Token = MenuOption->Tags[Index].Text; Token = MenuOption->Tags[Index].Text;
if (Initialized) { if (Initialized) {
for (ValueBackup = (UINT8) MenuOption->TagIndex; for (ValueBackup = (UINT8) MenuOption->TagIndex;
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP; MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
ValueBackup++ ValueBackup++
) { ) {
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) { if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {
@ -1282,7 +1282,7 @@ GetSelectionInputPopUp (
} }
if (!KeyInitialized) { if (!KeyInitialized) {
if (MenuOption->ThisTag->Operand == EFI_IFR_ONE_OF_OP) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ONE_OF_OP) {
*KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key; *KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key;
} else { } else {
*KeyValue = MenuOption->ThisTag->Key; *KeyValue = MenuOption->ThisTag->Key;
@ -1301,7 +1301,7 @@ TheKey:
// If an ordered list op-code, we will allow for a popup of +/- keys // If an ordered list op-code, we will allow for a popup of +/- keys
// to create an ordered list of items // to create an ordered list of items
// //
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
if (Key.UnicodeChar == '+') { if (Key.UnicodeChar == '+') {
if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) { if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) {
// //
@ -1329,10 +1329,10 @@ TheKey:
} }
for (Index = MenuOption->TagIndex + TopOptionIndex; for (Index = MenuOption->TagIndex + TopOptionIndex;
MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
Index++ Index++
) { ) {
if (MenuOption->Tags[Index].Operand == EFI_IFR_ORDERED_LIST_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
continue; continue;
} }
@ -1348,7 +1348,7 @@ TheKey:
// //
// Is this prior tag a valid choice? If not, bail out // Is this prior tag a valid choice? If not, bail out
// //
if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
// //
// Copy the destination tag to the local variable // Copy the destination tag to the local variable
// //
@ -1434,10 +1434,10 @@ TheKey:
} }
for (Index = MenuOption->TagIndex + TopOptionIndex; for (Index = MenuOption->TagIndex + TopOptionIndex;
MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
Index++ Index++
) { ) {
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
if (Initialized) { if (Initialized) {
for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++) for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++)
; ;
@ -1466,11 +1466,11 @@ TheKey:
// //
// Keep going until meets meaningful tag. // Keep going until meets meaningful tag.
// //
while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP && while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP && MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&
MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP) MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)
|| ||
(MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP && (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) { (MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {
TempIndex--; TempIndex--;
} }
@ -1480,11 +1480,11 @@ TheKey:
// //
// Keep going until meets meaningful tag. // Keep going until meets meaningful tag.
// //
while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP && while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP && MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&
MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP) MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)
|| ||
(MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP && (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) { (MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {
TempIndex++; TempIndex++;
} }
@ -1496,7 +1496,7 @@ TheKey:
// //
// Only if the previous op-code is an option can we select it, otherwise we are at the left-most option // Only if the previous op-code is an option can we select it, otherwise we are at the left-most option
// //
if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
TempValue = MenuOption->Tags[TempIndex].Value; TempValue = MenuOption->Tags[TempIndex].Value;
*KeyValue = MenuOption->Tags[TempIndex].Key; *KeyValue = MenuOption->Tags[TempIndex].Key;
} else { } else {
@ -1528,7 +1528,7 @@ TheKey:
// //
// return the current selection // return the current selection
// //
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
CopyMem (ValueArray, ValueArrayBackup, ValueCount); CopyMem (ValueArray, ValueArrayBackup, ValueCount);
FreePool (ValueArrayBackup); FreePool (ValueArrayBackup);
} else { } else {

220
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
View File

@ -356,7 +356,7 @@ DisplayForm (
UINTN Index; UINTN Index;
UINTN Count; UINTN Count;
UINT16 MenuItemCount; UINT16 MenuItemCount;
EFI_HII_HANDLE Handle; FRAMEWORK_EFI_HII_HANDLE Handle;
UINT16 FormId; UINT16 FormId;
STRING_REF String; STRING_REF String;
EFI_FILE_FORM_TAGS *FileFormTags; EFI_FILE_FORM_TAGS *FileFormTags;
@ -432,14 +432,14 @@ DisplayForm (
// //
FreePool (StringPtr); FreePool (StringPtr);
for (Index = 0; FormTags.Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) { for (Index = 0; FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {
GrayOut = FALSE; GrayOut = FALSE;
Suppress = FALSE; Suppress = FALSE;
SuppressIf = FALSE; SuppressIf = FALSE;
Conditional = FALSE; Conditional = FALSE;
FileFormTags = FileFormTagsHead; FileFormTags = FileFormTagsHead;
if (FormTags.Tags[Index].Operand == EFI_IFR_FORM_OP) { if (FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FORM_OP) {
FormId = FormTags.Tags[Index].Id; FormId = FormTags.Tags[Index].Id;
} }
// //
@ -465,10 +465,10 @@ DisplayForm (
do { do {
switch (FormTags.Tags[Index].Operand) { switch (FormTags.Tags[Index].Operand) {
case EFI_IFR_SUPPRESS_IF_OP: case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
SuppressIf = TRUE; SuppressIf = TRUE;
case EFI_IFR_GRAYOUT_IF_OP: case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
Conditional = TRUE; Conditional = TRUE;
@ -482,11 +482,11 @@ DisplayForm (
// through the AND/OR/NOT data to come up with some meaningful ID data. // through the AND/OR/NOT data to come up with some meaningful ID data.
// //
for (; for (;
FormTags.Tags[Index].Operand == EFI_IFR_AND_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_OR_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_GT_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_GE_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP; FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP;
Index++ Index++
) )
; ;
@ -518,18 +518,18 @@ DisplayForm (
// Advance to the end of the expression (Will land us at a grayoutif/suppressif or the op-code being affected) // Advance to the end of the expression (Will land us at a grayoutif/suppressif or the op-code being affected)
// //
for (; for (;
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_VAL_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_VAR_VAL_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_ID_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_LIST_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_AND_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_OR_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_TRUE_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TRUE_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_FALSE_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FALSE_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_GT_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_GE_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_LABEL_OP; FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_LABEL_OP;
Index++ Index++
) )
; ;
@ -551,7 +551,7 @@ GetOut:
} else { } else {
FormTags.Tags[Index].GrayOut = FALSE; FormTags.Tags[Index].GrayOut = FALSE;
} }
if (Suppress && FormTags.Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (Suppress && FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
// //
// Only need .Suppress field when the tag is a one_of_option. For other cases, omit them directly. // Only need .Suppress field when the tag is a one_of_option. For other cases, omit them directly.
// //
@ -562,8 +562,8 @@ GetOut:
if (( if ((
FormTags.Tags[Index].NumberOfLines > 0 || FormTags.Tags[Index].NumberOfLines > 0 ||
FormTags.Tags[Index].Operand == EFI_IFR_DATE_OP || FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
FormTags.Tags[Index].Operand == EFI_IFR_TIME_OP FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP
) && ) &&
!Suppress !Suppress
) { ) {
@ -604,7 +604,7 @@ GetOut:
// Keep processing menu entries based on the resultant suppress/grayout results until we hit an end-if // Keep processing menu entries based on the resultant suppress/grayout results until we hit an end-if
// //
Index++; Index++;
} while (FormTags.Tags[Index].Operand != EFI_IFR_END_IF_OP && Conditional); } while (FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_IF_OP && Conditional);
// //
// We advanced the index for the above conditional, rewind it to keep harmony with the for loop logic // We advanced the index for the above conditional, rewind it to keep harmony with the for loop logic
@ -612,7 +612,7 @@ GetOut:
Index--; Index--;
} }
Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData); Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);
return Selection; return Selection;
} }
@ -693,11 +693,11 @@ Returns:
gST->ConOut->SetAttribute (gST->ConOut, KEYHELP_TEXT | KEYHELP_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, KEYHELP_TEXT | KEYHELP_BACKGROUND);
switch (Selection->ThisTag->Operand) { switch (Selection->ThisTag->Operand) {
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
case EFI_IFR_TIME_OP: case FRAMEWORK_EFI_IFR_TIME_OP:
case EFI_IFR_DATE_OP: case FRAMEWORK_EFI_IFR_DATE_OP:
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND); ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
if (!Selected) { if (!Selected) {
@ -709,7 +709,7 @@ Returns:
} }
if ((Selection->ThisTag->Operand == EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == EFI_IFR_TIME_OP)) { if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
PrintAt ( PrintAt (
StartColumnOfHelp, StartColumnOfHelp,
BottomRowOfHelp, BottomRowOfHelp,
@ -731,13 +731,13 @@ Returns:
// //
// If it is a selected numeric with manual input, display different message // If it is a selected numeric with manual input, display different message
// //
if ((Selection->ThisTag->Operand == EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) { if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {
PrintStringAt (SecCol, TopRowOfHelp, gNumericInput); PrintStringAt (SecCol, TopRowOfHelp, gNumericInput);
} else if (Selection->ThisTag->Operand != EFI_IFR_ORDERED_LIST_OP) { } else if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight); PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);
} }
if (Selection->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
PrintStringAt (StartColumnOfHelp, TopRowOfHelp, gPlusString); PrintStringAt (StartColumnOfHelp, TopRowOfHelp, gPlusString);
PrintStringAt (ThdCol, TopRowOfHelp, gMinusString); PrintStringAt (ThdCol, TopRowOfHelp, gMinusString);
} }
@ -746,7 +746,7 @@ Returns:
} }
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND); ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
if (gClassOfVfr == EFI_SETUP_APPLICATION_SUBCLASS) { if (gClassOfVfr == EFI_SETUP_APPLICATION_SUBCLASS) {
@ -760,9 +760,9 @@ Returns:
PrintStringAt (SecCol, BottomRowOfHelp, gToggleCheckBox); PrintStringAt (SecCol, BottomRowOfHelp, gToggleCheckBox);
break; break;
case EFI_IFR_REF_OP: case FRAMEWORK_EFI_IFR_REF_OP:
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND); ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
if (!Selected) { if (!Selected) {
@ -776,7 +776,7 @@ Returns:
PrintAt (StartColumnOfHelp, BottomRowOfHelp, (CHAR16 *) L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight); PrintAt (StartColumnOfHelp, BottomRowOfHelp, (CHAR16 *) L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);
PrintStringAt (SecCol, BottomRowOfHelp, gEnterString); PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);
} else { } else {
if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) { if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {
PrintStringAt ( PrintStringAt (
(LocalScreen.RightColumn - GetStringWidth (gEnterCommitString) / 2) / 2, (LocalScreen.RightColumn - GetStringWidth (gEnterCommitString) / 2) / 2,
BottomRowOfHelp, BottomRowOfHelp,
@ -823,14 +823,14 @@ ExtractFormHandle (
// //
// Advance Index to the first FormOp tag information // Advance Index to the first FormOp tag information
// //
for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++) for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
; ;
} else { } else {
// //
// Advance Index to the FormOp with the correct ID value // Advance Index to the FormOp with the correct ID value
// //
for (; LocalTags.Next != NULL; LocalTags = *LocalTags.Next) { for (; LocalTags.Next != NULL; LocalTags = *LocalTags.Next) {
for (Index = 0; LocalTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++) for (Index = 0; LocalTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
; ;
if (LocalTags.Tags[Index].Id == IdValue) { if (LocalTags.Tags[Index].Id == IdValue) {
break; break;
@ -886,7 +886,7 @@ UpdateNewTagData (
FormTags->Tags = AllocateZeroPool (NumberOfTags * sizeof (EFI_TAG)); FormTags->Tags = AllocateZeroPool (NumberOfTags * sizeof (EFI_TAG));
ASSERT (FormTags->Tags != NULL); ASSERT (FormTags->Tags != NULL);
for (CurrTag = 0; FormData[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) { for (CurrTag = 0; FormData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
// //
// Operand = IFR OpCode // Operand = IFR OpCode
// //
@ -909,27 +909,27 @@ UpdateNewTagData (
// //
switch (FormData[Index]) { switch (FormData[Index]) {
case EFI_IFR_FORM_OP: case FRAMEWORK_EFI_IFR_FORM_OP:
case EFI_IFR_SUBTITLE_OP: case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
case EFI_IFR_TEXT_OP: case FRAMEWORK_EFI_IFR_TEXT_OP:
case EFI_IFR_REF_OP: case FRAMEWORK_EFI_IFR_REF_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
break; break;
case EFI_IFR_VARSTORE_SELECT_OP: case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16)); CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16));
break; break;
case EFI_IFR_END_FORM_OP: case FRAMEWORK_EFI_IFR_END_FORM_OP:
FormTags->Tags[CurrTag].Operand = FormData[Index]; FormTags->Tags[CurrTag].Operand = FormData[Index];
FormTags->Tags[CurrTag].NumberOfLines = 0; FormTags->Tags[CurrTag].NumberOfLines = 0;
Finished = TRUE; Finished = TRUE;
break; break;
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
// //
@ -942,23 +942,23 @@ UpdateNewTagData (
QuestionIndex = (UINT16) CurrTag; QuestionIndex = (UINT16) CurrTag;
break; break;
case EFI_IFR_ONE_OF_OPTION_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
FormTags->Tags[QuestionIndex].Key = ((EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key; FormTags->Tags[QuestionIndex].Key = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key;
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED); FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 1, FileFormTags, CurrentVariable); GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 1, FileFormTags, CurrentVariable);
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
break; break;
case EFI_IFR_DATE_OP: case FRAMEWORK_EFI_IFR_DATE_OP:
// //
// Date elements come in as a Year, Month, Day. We need to process them as a country-based // Date elements come in as a Year, Month, Day. We need to process them as a country-based
// Order. It is much easier to do it here than anywhere else. // Order. It is much easier to do it here than anywhere else.
@ -1007,7 +1007,7 @@ UpdateNewTagData (
TagLength = FormData[Index + 1]; TagLength = FormData[Index + 1];
break; break;
case EFI_IFR_TIME_OP: case FRAMEWORK_EFI_IFR_TIME_OP:
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 0, FileFormTags, CurrentVariable); GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 0, FileFormTags, CurrentVariable);
if (Count == 2) { if (Count == 2) {
@ -1025,44 +1025,44 @@ UpdateNewTagData (
} }
break; break;
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
break; break;
case EFI_IFR_INCONSISTENT_IF_OP: case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
case EFI_IFR_SUPPRESS_IF_OP: case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
case EFI_IFR_GRAYOUT_IF_OP: case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
ConsistencyId++; ConsistencyId++;
break; break;
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId; FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
break; break;
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId; FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId; FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
break; break;
case EFI_IFR_AND_OP: case FRAMEWORK_EFI_IFR_AND_OP:
case EFI_IFR_OR_OP: case FRAMEWORK_EFI_IFR_OR_OP:
case EFI_IFR_NOT_OP: case FRAMEWORK_EFI_IFR_NOT_OP:
case EFI_IFR_TRUE_OP: case FRAMEWORK_EFI_IFR_TRUE_OP:
case EFI_IFR_FALSE_OP: case FRAMEWORK_EFI_IFR_FALSE_OP:
case EFI_IFR_GT_OP: case FRAMEWORK_EFI_IFR_GT_OP:
case EFI_IFR_GE_OP: case FRAMEWORK_EFI_IFR_GE_OP:
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId; FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL); IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId; FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
@ -1104,7 +1104,7 @@ ExtractDynamicFormHandle (
Routine Description: Routine Description:
The function does the most of the works when the EFI_TAG that The function does the most of the works when the EFI_TAG that
user selects on is EFI_IFR_FLAG_INTERACTIVE or EFI_IFR_PASSWORD_OP: user selects on is FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE or FRAMEWORK_EFI_IFR_PASSWORD_OP:
invoke CallBack, update the new form data. invoke CallBack, update the new form data.
Arguments: Arguments:
@ -1140,7 +1140,7 @@ Returns:
UINT16 ConsistencyId; UINT16 ConsistencyId;
UINT16 CurrentVariable; UINT16 CurrentVariable;
EFI_VARIABLE_DEFINITION *VariableDefinition; EFI_VARIABLE_DEFINITION *VariableDefinition;
EFI_IFR_DATA_ENTRY *DataEntry; FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
VariableDefinition = NULL; VariableDefinition = NULL;
NullCharacter = CHAR_NULL; NullCharacter = CHAR_NULL;
@ -1174,7 +1174,7 @@ Returns:
CopyMem (&TagGuid, &LocalTags->Tags[0].GuidValue, sizeof (EFI_GUID)); CopyMem (&TagGuid, &LocalTags->Tags[0].GuidValue, sizeof (EFI_GUID));
} }
for (Index = 0; LocalTags->Tags[Index].Operand != EFI_IFR_FORM_OP; Index++) for (Index = 0; LocalTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
; ;
if (LocalTags->Tags[Index].Id == IdValue) { if (LocalTags->Tags[Index].Id == IdValue) {
break; break;
@ -1183,7 +1183,7 @@ Returns:
// //
// If we are going to callback on a non-goto opcode, make sure we don't change pages // If we are going to callback on a non-goto opcode, make sure we don't change pages
// //
if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) { if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {
TargetPage = Selection->FormId; TargetPage = Selection->FormId;
} }
// //
@ -1211,17 +1211,17 @@ Returns:
ExtractRequestedNvMap (FileFormTags, CurrentVariable, &VariableDefinition); ExtractRequestedNvMap (FileFormTags, CurrentVariable, &VariableDefinition);
if (Selection->ThisTag->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS)) { if (Selection->ThisTag->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS)) {
((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap; ((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap;
} else { } else {
((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL; ((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL;
} }
if ((FormCallback != NULL) && (FormCallback->Callback != NULL)) { if ((FormCallback != NULL) && (FormCallback->Callback != NULL)) {
Status = FormCallback->Callback ( Status = FormCallback->Callback (
FormCallback, FormCallback,
Selection->ThisTag->Key, Selection->ThisTag->Key,
(EFI_IFR_DATA_ARRAY *) CallbackData, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData,
&Packet &Packet
); );
} }
@ -1261,14 +1261,14 @@ Returns:
// location associated with the op-code specified there. This is used on single op-code instances // location associated with the op-code specified there. This is used on single op-code instances
// and not for when a hyperlink sent us a whole page of data. // and not for when a hyperlink sent us a whole page of data.
// //
DataEntry = (EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1); DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1);
if (Packet->DataArray.EntryCount == 1) { if (Packet->DataArray.EntryCount == 1) {
switch (DataEntry->OpCode) { switch (DataEntry->OpCode) {
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
CopyMem ( CopyMem (
&VariableDefinition->NvRamMap[Selection->ThisTag->StorageStart], &VariableDefinition->NvRamMap[Selection->ThisTag->StorageStart],
&DataEntry->Data, &DataEntry->Data,
@ -1276,11 +1276,11 @@ Returns:
); );
break; break;
case EFI_IFR_NV_ACCESS_COMMAND: case FRAMEWORK_EFI_IFR_NV_ACCESS_COMMAND:
CopyMem ( CopyMem (
&VariableDefinition->NvRamMap[((EFI_IFR_NV_DATA *) Packet)->QuestionId], &VariableDefinition->NvRamMap[((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->QuestionId],
((EFI_IFR_NV_DATA *) Packet) + 1, ((FRAMEWORK_EFI_IFR_NV_DATA *) Packet) + 1,
((EFI_IFR_NV_DATA *) Packet)->StorageWidth ((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->StorageWidth
); );
break; break;
@ -1313,19 +1313,19 @@ Returns:
FreePool (Packet); FreePool (Packet);
} }
for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != EFI_IFR_END_FORM_OP; BackupIndex++) { for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; BackupIndex++) {
switch (LocalTags->Tags[BackupIndex].Operand) { switch (LocalTags->Tags[BackupIndex].Operand) {
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
case EFI_IFR_AND_OP: case FRAMEWORK_EFI_IFR_AND_OP:
case EFI_IFR_OR_OP: case FRAMEWORK_EFI_IFR_OR_OP:
case EFI_IFR_NOT_OP: case FRAMEWORK_EFI_IFR_NOT_OP:
case EFI_IFR_TRUE_OP: case FRAMEWORK_EFI_IFR_TRUE_OP:
case EFI_IFR_FALSE_OP: case FRAMEWORK_EFI_IFR_FALSE_OP:
case EFI_IFR_GT_OP: case FRAMEWORK_EFI_IFR_GT_OP:
case EFI_IFR_GE_OP: case FRAMEWORK_EFI_IFR_GE_OP:
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
// //
// If we encountered a ConsistencyId value, on this page they will be incremental // If we encountered a ConsistencyId value, on this page they will be incremental
// So register the first value we encounter. We will pass this in when we re-create this page // So register the first value we encounter. We will pass this in when we re-create this page
@ -1426,8 +1426,8 @@ SetupBrowser (
// //
// True if a hyperlink/jump is selected // True if a hyperlink/jump is selected
// //
if (Selection->ThisTag->Operand == EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) { if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) {
if (Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) { if (Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
ExtractDynamicFormHandle ( ExtractDynamicFormHandle (
Selection, Selection,
CallbackData, CallbackData,
@ -1444,8 +1444,8 @@ SetupBrowser (
} }
} }
if ((Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) && if ((Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) &&
(Selection->ThisTag->Operand != EFI_IFR_PASSWORD_OP) (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_PASSWORD_OP)
) { ) {
ExtractDynamicFormHandle ( ExtractDynamicFormHandle (
Selection, Selection,

246
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
View File

@ -103,31 +103,31 @@ AdjustNvMap (
// Remember, the only time we come here is because we are in the NVPlus section of the NvRamMap // Remember, the only time we come here is because we are in the NVPlus section of the NvRamMap
// //
for (Index = MenuOption->TagIndex; for (Index = MenuOption->TagIndex;
(MenuOption->Tags[Index].Operand != EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP); (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP);
Index++ Index++
) { ) {
switch (MenuOption->Tags[Index].Operand) { switch (MenuOption->Tags[Index].Operand) {
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
CachedStart = MenuOption->Tags[Index].StorageStart; CachedStart = MenuOption->Tags[Index].StorageStart;
break; break;
case EFI_IFR_ONE_OF_OPTION_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) { if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {
CopyMem (&NvRamMap[CachedStart], &MenuOption->Tags[Index].Value, 2); CopyMem (&NvRamMap[CachedStart], &MenuOption->Tags[Index].Value, 2);
} }
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
CopyMem (&NvRamMap[MenuOption->Tags[Index].StorageStart], &MenuOption->Tags[Index].Flags, 1); CopyMem (&NvRamMap[MenuOption->Tags[Index].StorageStart], &MenuOption->Tags[Index].Flags, 1);
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
case EFI_IFR_DATE_OP: case FRAMEWORK_EFI_IFR_DATE_OP:
case EFI_IFR_TIME_OP: case FRAMEWORK_EFI_IFR_TIME_OP:
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
CopyMem ( CopyMem (
&NvRamMap[MenuOption->Tags[Index].StorageStart], &NvRamMap[MenuOption->Tags[Index].StorageStart],
&MenuOption->Tags[Index].Value, &MenuOption->Tags[Index].Value,
@ -148,7 +148,7 @@ ProcessOptions (
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption,
IN BOOLEAN Selected, IN BOOLEAN Selected,
IN EFI_FILE_FORM_TAGS *FileFormTagsHead, IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
IN EFI_IFR_DATA_ARRAY *PageData, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
OUT CHAR16 **OptionString OUT CHAR16 **OptionString
) )
{ {
@ -210,7 +210,7 @@ ProcessOptions (
NullCharacter = CHAR_NULL; NullCharacter = CHAR_NULL;
FormCallback = NULL; FormCallback = NULL;
if (MenuOption->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
OrderedList = TRUE; OrderedList = TRUE;
if (((UINT8 *) NvRamMap)[0] != 0x00) { if (((UINT8 *) NvRamMap)[0] != 0x00) {
Initialized = TRUE; Initialized = TRUE;
@ -232,8 +232,8 @@ ProcessOptions (
switch (Tag->Operand) { switch (Tag->Operand) {
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -247,23 +247,23 @@ ProcessOptions (
CachedIndex = MenuOption->TagIndex; CachedIndex = MenuOption->TagIndex;
// //
// search for EFI_IFR_ONE_OF_OPTION_OP until you hit the EFI_IFR_END_ONE_OF_OP, // search for FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP until you hit the FRAMEWORK_EFI_IFR_END_ONE_OF_OP,
// each of the .Text in the options are going to be what gets displayed. Break each into 26 char chunks // each of the .Text in the options are going to be what gets displayed. Break each into 26 char chunks
// when hit right/left arrow allows for selection - then repopulate Tag[TagIndex] with the choice // when hit right/left arrow allows for selection - then repopulate Tag[TagIndex] with the choice
// //
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) { for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
// //
// We found an option - which assumedly has a string. We will eventually have to support // We found an option - which assumedly has a string. We will eventually have to support
// wrapping of strings. For now, let's pretend they don't wrap and code that up. // wrapping of strings. For now, let's pretend they don't wrap and code that up.
// //
// Count how many strings there are // Count how many strings there are
// //
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
// //
// If one of the options for the one-of has an interactive flag, back-define the oneof to have one too // If one of the options for the one-of has an interactive flag, back-define the oneof to have one too
// //
if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_INTERACTIVE) { if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | EFI_IFR_FLAG_INTERACTIVE); MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE);
} }
StringCount++; StringCount++;
@ -292,7 +292,7 @@ ProcessOptions (
// //
// Copy current setting to the seed Value // Copy current setting to the seed Value
// //
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
ValueArray = AllocateZeroPool (MenuOption->ThisTag->StorageWidth); ValueArray = AllocateZeroPool (MenuOption->ThisTag->StorageWidth);
ASSERT (ValueArray != NULL); ASSERT (ValueArray != NULL);
CopyMem (ValueArray, NvRamMap, MenuOption->ThisTag->StorageWidth); CopyMem (ValueArray, NvRamMap, MenuOption->ThisTag->StorageWidth);
@ -302,14 +302,14 @@ ProcessOptions (
} }
Number = Value; Number = Value;
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
Status = GetSelectionInputPopUp (MenuOption, Tag, MenuOption->ThisTag->StorageWidth, ValueArray, &KeyValue); Status = GetSelectionInputPopUp (MenuOption, Tag, MenuOption->ThisTag->StorageWidth, ValueArray, &KeyValue);
} else { } else {
Status = GetSelectionInputPopUp (MenuOption, Tag, 1, &Value, &KeyValue); Status = GetSelectionInputPopUp (MenuOption, Tag, 1, &Value, &KeyValue);
} }
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth); CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth);
FreePool (ValueArray); FreePool (ValueArray);
} else { } else {
@ -325,7 +325,7 @@ ProcessOptions (
// if two questions are bound by consistency checks and each only has two possible choices, there // if two questions are bound by consistency checks and each only has two possible choices, there
// would be no way for a user to switch the values. Thus we require late checking. // would be no way for a user to switch the values. Thus we require late checking.
// //
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
CopyMem (&Tag->OldValue, &Value, Tag->StorageWidth); CopyMem (&Tag->OldValue, &Value, Tag->StorageWidth);
} else { } else {
// //
@ -372,19 +372,19 @@ ProcessOptions (
UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE); UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);
} else { } else {
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) { if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
FreePool (ValueArray); FreePool (ValueArray);
} }
return EFI_SUCCESS; return EFI_SUCCESS;
} }
} else { } else {
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) { for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
// //
// We found an option - which assumedly has a string. We will eventually have to support // We found an option - which assumedly has a string. We will eventually have to support
// wrapping of strings. For now, let's pretend they don't wrap and code that up. // wrapping of strings. For now, let's pretend they don't wrap and code that up.
// //
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) { if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
if (OrderedList) { if (OrderedList) {
if (!Initialized) { if (!Initialized) {
// //
@ -410,7 +410,7 @@ ProcessOptions (
StringPtr = GetToken (MenuOption->Tags[Index].Text, MenuOption->Handle); StringPtr = GetToken (MenuOption->Tags[Index].Text, MenuOption->Handle);
} else { } else {
for (Value = (UINT16) (MenuOption->TagIndex + 1); for (Value = (UINT16) (MenuOption->TagIndex + 1);
MenuOption->Tags[Value].Operand != EFI_IFR_END_ONE_OF_OP; MenuOption->Tags[Value].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
Value++ Value++
) { ) {
if (MenuOption->Tags[Value].Value == ((UINT8 *) NvRamMap)[Index - MenuOption->TagIndex - 1]) { if (MenuOption->Tags[Value].Value == ((UINT8 *) NvRamMap)[Index - MenuOption->TagIndex - 1]) {
@ -419,7 +419,7 @@ ProcessOptions (
} }
} }
if (MenuOption->Tags[Value].Operand == EFI_IFR_END_ONE_OF_OP) { if (MenuOption->Tags[Value].Operand == FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {
Skip = TRUE; Skip = TRUE;
continue; continue;
} }
@ -453,7 +453,7 @@ ProcessOptions (
break; break;
} }
if ((MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) == 1) { if ((MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) == 1) {
Default = MenuOption->Tags[Index].Text; Default = MenuOption->Tags[Index].Text;
Value = MenuOption->Tags[Index].Value; Value = MenuOption->Tags[Index].Value;
}; };
@ -481,7 +481,7 @@ ProcessOptions (
} }
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -533,7 +533,7 @@ ProcessOptions (
NewStrCat (OptionString[0], StringPtr); NewStrCat (OptionString[0], StringPtr);
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -649,7 +649,7 @@ ProcessOptions (
} }
break; break;
case EFI_IFR_DATE_OP: case FRAMEWORK_EFI_IFR_DATE_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -677,7 +677,7 @@ ProcessOptions (
// //
// Also, we want to internationalize the order of the date information. We need to code for it as well. // Also, we want to internationalize the order of the date information. We need to code for it as well.
// //
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_DATE_OP; Index++) for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP; Index++)
; ;
// //
@ -828,7 +828,7 @@ ProcessOptions (
// might want to set an alarm and actually preserve the data in NVRam so a driver can pick up the instruction // might want to set an alarm and actually preserve the data in NVRam so a driver can pick up the instruction
// BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG // BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG
// //
case EFI_IFR_TIME_OP: case FRAMEWORK_EFI_IFR_TIME_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -858,7 +858,7 @@ ProcessOptions (
// to 53 and found it to no longer point to a date operand, we were pointing to the last of 3 // to 53 and found it to no longer point to a date operand, we were pointing to the last of 3
// date operands. // date operands.
// //
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_TIME_OP; Index++) for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP; Index++)
; ;
// //
// Count 0 = We entered on the first Date operand // Count 0 = We entered on the first Date operand
@ -1002,7 +1002,7 @@ ProcessOptions (
} }
break; break;
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -1047,7 +1047,7 @@ ProcessOptions (
return Status; return Status;
} }
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
// //
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically // If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust // created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
@ -1067,7 +1067,7 @@ ProcessOptions (
// Since interactive passwords assume to handle the password data in a separate variable // Since interactive passwords assume to handle the password data in a separate variable
// storage, we don't need to do more than what is below for password callbacks // storage, we don't need to do more than what is below for password callbacks
// //
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
MenuOption->Tags[0].CallbackHandle = FileFormTags->FormTags.Tags[0].CallbackHandle; MenuOption->Tags[0].CallbackHandle = FileFormTags->FormTags.Tags[0].CallbackHandle;
Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr); Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr);
ZeroMem (StringPtr, Tag->Maximum); ZeroMem (StringPtr, Tag->Maximum);
@ -1424,9 +1424,9 @@ IfrToFormTag (
UINTN Index; UINTN Index;
switch (OpCode) { switch (OpCode) {
case EFI_IFR_FORM_OP: case FRAMEWORK_EFI_IFR_FORM_OP:
CopyMem (&TargetTag->Id, &((EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));
CopyMem (&TargetTag->Text, &((EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16)); CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
if (VariableDefinitionsHead != NULL) { if (VariableDefinitionsHead != NULL) {
VariableName = AllocateZeroPool (12); VariableName = AllocateZeroPool (12);
@ -1438,16 +1438,16 @@ IfrToFormTag (
} }
break; break;
case EFI_IFR_SUBTITLE_OP: case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
TargetTag->NumberOfLines = 1; TargetTag->NumberOfLines = 1;
CopyMem (&TargetTag->Text, &((EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16)); CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_TEXT_OP: case FRAMEWORK_EFI_IFR_TEXT_OP:
TargetTag->NumberOfLines = 1; TargetTag->NumberOfLines = 1;
CopyMem (&TargetTag->Text, &((EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16)); CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));
CopyMem (&TargetTag->Help, &((EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16)); CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
// //
@ -1455,78 +1455,78 @@ IfrToFormTag (
// inside the if() statement. If the encoded length is the complete size, then we // inside the if() statement. If the encoded length is the complete size, then we
// know we have valid data encoded that we want to integrate // know we have valid data encoded that we want to integrate
// //
if (((EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (EFI_IFR_TEXT)) { if (((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (FRAMEWORK_EFI_IFR_TEXT)) {
// //
// Text has no help associated with it, but in case there is a second entry due to // Text has no help associated with it, but in case there is a second entry due to
// dynamic/interactive flags being active, bring this data over. // dynamic/interactive flags being active, bring this data over.
// //
CopyMem (&TargetTag->TextTwo, &((EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16)); CopyMem (&TargetTag->TextTwo, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));
TargetTag->Flags = ((EFI_IFR_TEXT *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Flags;
CopyMem (&TargetTag->Key, &((EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));
} }
break; break;
case EFI_IFR_ONE_OF_OPTION_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
CopyMem (&TargetTag->Text, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16)); CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));
CopyMem (&TargetTag->Value, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16)); CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));
TargetTag->Flags = ((EFI_IFR_ONE_OF_OPTION *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;
CopyMem (&TargetTag->Key, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
TargetTag->Flags = ((EFI_IFR_CHECKBOX *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Flags;
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED); TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
CopyMem (&TargetTag->Key, &((EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
TargetTag->Flags = ((EFI_IFR_NUMERIC *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Flags;
CopyMem (&TargetTag->Key, &((EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
// //
// Convert EFI_IFR_STRING.MinSize and EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes // Convert FRAMEWORK_EFI_IFR_STRING.MinSize and FRAMEWORK_EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes
// and store to EFI_TAG.Minimum and EFI_TAG.Maximum // and store to EFI_TAG.Minimum and EFI_TAG.Maximum
// //
TempValue = 0; TempValue = 0;
CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));
TempValue = (UINT16) (TempValue * 2); TempValue = (UINT16) (TempValue * 2);
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));
TempValue = 0; TempValue = 0;
CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));
TempValue = (UINT16) (TempValue * 2); TempValue = (UINT16) (TempValue * 2);
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));
TargetTag->Flags = (UINT8) (((EFI_IFR_STRING *) FormData)->Flags); TargetTag->Flags = (UINT8) (((FRAMEWORK_EFI_IFR_STRING *) FormData)->Flags);
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED); TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
CopyMem (&TargetTag->Key, &((EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
TempValue = 0; TempValue = 0;
CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));
TempValue = (UINT16) (TempValue * 2); TempValue = (UINT16) (TempValue * 2);
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));
TempValue = 0; TempValue = 0;
CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));
TempValue = (UINT16) (TempValue * 2); TempValue = (UINT16) (TempValue * 2);
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16)); CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));
TargetTag->Flags = ((EFI_IFR_PASSWORD *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Flags;
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED); TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
CopyMem (&TargetTag->Key, &((EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));
CopyMem (&TargetTag->Encoding, &((EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16)); CopyMem (&TargetTag->Encoding, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_VARSTORE_OP: case FRAMEWORK_EFI_IFR_VARSTORE_OP:
// //
// It should NEVER be NULL // It should NEVER be NULL
// //
@ -1544,8 +1544,8 @@ IfrToFormTag (
// //
// If there is a variable with this GUID and ID already, we need to bail out // If there is a variable with this GUID and ID already, we need to bail out
// //
if (!CompareMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) && if (!CompareMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&
!CompareMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16)) !CompareMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))
) { ) {
return ; return ;
} }
@ -1567,16 +1567,16 @@ IfrToFormTag (
// //
// Copy the Variable data to our linked list // Copy the Variable data to our linked list
// //
CopyMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16)); CopyMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
CopyMem (&VariableDefinitions->VariableSize, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16)); CopyMem (&VariableDefinitions->VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
CopyMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)); CopyMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
// //
// The ASCII String which is immediately past the EFI_IFR_VARSTORE is inferred by the structure definition // The ASCII String which is immediately past the FRAMEWORK_EFI_IFR_VARSTORE is inferred by the structure definition
// due to it being variable sized. There are rules preventing it from being > 40 characters long and should // due to it being variable sized. There are rules preventing it from being > 40 characters long and should
// be enforced by the compiler. // be enforced by the compiler.
// //
AsciiString = (CHAR8 *) (&((EFI_IFR_VARSTORE *) FormData)->Size); AsciiString = (CHAR8 *) (&((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size);
AsciiString = AsciiString + 2; AsciiString = AsciiString + 2;
VariableDefinitions->VariableName = AllocateZeroPool ((AsciiStrLen (AsciiString) + 1) * 2); VariableDefinitions->VariableName = AllocateZeroPool ((AsciiStrLen (AsciiString) + 1) * 2);
ASSERT (VariableDefinitions->VariableName != NULL); ASSERT (VariableDefinitions->VariableName != NULL);
@ -1589,64 +1589,64 @@ IfrToFormTag (
// //
// Propogate the tag information for this op-code // Propogate the tag information for this op-code
// //
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16)); CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
CopyMem (&TargetTag->GuidValue, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)); CopyMem (&TargetTag->GuidValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
CopyMem (&TargetTag->StorageWidth, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16)); CopyMem (&TargetTag->StorageWidth, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
CopyMem (&TargetTag->Maximum, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16)); CopyMem (&TargetTag->Maximum, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
break; break;
case EFI_IFR_VARSTORE_SELECT_OP: case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16)); CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16)); CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
CurrentVariable2 = CurrentVariable; CurrentVariable2 = CurrentVariable;
break; break;
case EFI_IFR_VARSTORE_SELECT_PAIR_OP: case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16)); CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
CopyMem ( CopyMem (
&TargetTag->VariableNumber2, &TargetTag->VariableNumber2,
&((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,
sizeof (UINT16) sizeof (UINT16)
); );
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16)); CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
CopyMem (&CurrentVariable2, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16)); CopyMem (&CurrentVariable2, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));
break; break;
case EFI_IFR_REF_OP: case FRAMEWORK_EFI_IFR_REF_OP:
TargetTag->NumberOfLines = 1; TargetTag->NumberOfLines = 1;
CopyMem (&TargetTag->Id, &((EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));
CopyMem (&TargetTag->Key, &((EFI_IFR_REF *) FormData)->Key, sizeof (UINT16)); CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));
CopyMem (&TargetTag->Text, &((EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16)); CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));
CopyMem (&TargetTag->Help, &((EFI_IFR_REF *) FormData)->Help, sizeof (UINT16)); CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));
TargetTag->Flags = ((EFI_IFR_REF *) FormData)->Flags; TargetTag->Flags = ((FRAMEWORK_EFI_IFR_REF *) FormData)->Flags;
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16)); CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_VAL *) FormData)->Width; TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Width;
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16)); CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));
CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16)); CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_ID *) FormData)->Width; TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->Width;
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
TargetTag->VariableNumber = CurrentVariable2; TargetTag->VariableNumber = CurrentVariable2;
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16)); CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));
CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16)); CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_LIST *) FormData)->Width; TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->Width;
TargetTag->IntList = AllocateZeroPool (TargetTag->Id2 * sizeof (UINT16)); TargetTag->IntList = AllocateZeroPool (TargetTag->Id2 * sizeof (UINT16));
ASSERT (TargetTag->IntList); ASSERT (TargetTag->IntList);
@ -1654,7 +1654,7 @@ IfrToFormTag (
for (TempValue = 0; TempValue < TargetTag->Id2; TempValue++) { for (TempValue = 0; TempValue < TargetTag->Id2; TempValue++) {
CopyMem ( CopyMem (
&TargetTag->IntList[TempValue], &TargetTag->IntList[TempValue],
&((EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue], &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],
sizeof (UINT16) sizeof (UINT16)
); );
} }
@ -1662,9 +1662,9 @@ IfrToFormTag (
TargetTag->VariableNumber = CurrentVariable; TargetTag->VariableNumber = CurrentVariable;
break; break;
case EFI_IFR_FORM_SET_OP: case FRAMEWORK_EFI_IFR_FORM_SET_OP:
CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16)); CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));
CopyMem (&Guid, &((EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID)); CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));
// //
// If there is a size specified in the formste, we will establish a "default" variable // If there is a size specified in the formste, we will establish a "default" variable
// //
@ -1678,7 +1678,7 @@ IfrToFormTag (
} }
break; break;
case EFI_IFR_END_FORM_SET_OP: case FRAMEWORK_EFI_IFR_END_FORM_SET_OP:
CurrentVariable = 0; CurrentVariable = 0;
CurrentVariable2 = 0; CurrentVariable2 = 0;
break; break;

250
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -106,9 +106,9 @@ FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = {
STATIC STATIC
EFI_STATUS EFI_STATUS
InitializeBinaryStructures ( InitializeBinaryStructures (
IN EFI_HII_HANDLE *Handle, IN FRAMEWORK_EFI_HII_HANDLE *Handle,
IN BOOLEAN UseDatabase, IN BOOLEAN UseDatabase,
IN EFI_IFR_PACKET *Packet, IN FRAMEWORK_EFI_IFR_PACKET *Packet,
IN UINT8 *NvMapOverride, IN UINT8 *NvMapOverride,
IN UINTN NumberOfIfrImages, IN UINTN NumberOfIfrImages,
EFI_FILE_FORM_TAGS **FileFormTagsHead EFI_FILE_FORM_TAGS **FileFormTagsHead
@ -117,7 +117,7 @@ InitializeBinaryStructures (
STATIC STATIC
EFI_STATUS EFI_STATUS
InitializeTagStructures ( InitializeTagStructures (
IN EFI_IFR_BINARY *BinaryData, IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,
OUT EFI_FILE_FORM_TAGS *FileFormTags OUT EFI_FILE_FORM_TAGS *FileFormTags
); );
@ -133,9 +133,9 @@ STATIC
EFI_STATUS EFI_STATUS
GetIfrBinaryData ( GetIfrBinaryData (
IN EFI_HII_PROTOCOL *Hii, IN EFI_HII_PROTOCOL *Hii,
IN EFI_HII_HANDLE HiiHandle, IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,
IN EFI_IFR_PACKET *Packet, IN FRAMEWORK_EFI_IFR_PACKET *Packet,
IN EFI_IFR_BINARY *BinaryData IN FRAMEWORK_EFI_IFR_BINARY *BinaryData
); );
STATIC STATIC
@ -150,9 +150,9 @@ EFIAPI
SendForm ( SendForm (
IN EFI_FORM_BROWSER_PROTOCOL * This, IN EFI_FORM_BROWSER_PROTOCOL * This,
IN BOOLEAN UseDatabase, IN BOOLEAN UseDatabase,
IN EFI_HII_HANDLE * Handle, IN FRAMEWORK_EFI_HII_HANDLE * Handle,
IN UINTN HandleCount, IN UINTN HandleCount,
IN EFI_IFR_PACKET * Packet, IN FRAMEWORK_EFI_IFR_PACKET * Packet,
IN EFI_HANDLE CallbackHandle, IN EFI_HANDLE CallbackHandle,
IN UINT8 *NvMapOverride, IN UINT8 *NvMapOverride,
IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL
@ -197,7 +197,7 @@ Returns:
EFI_STATUS Status; EFI_STATUS Status;
BOOLEAN Callback; BOOLEAN Callback;
VOID *CallbackData; VOID *CallbackData;
EFI_HII_HANDLE BackupHandle; FRAMEWORK_EFI_HII_HANDLE BackupHandle;
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR)); ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));
@ -542,11 +542,11 @@ Returns:
Tag->NumberOfLines = 1; Tag->NumberOfLines = 1;
Tag->VariableNumber = CurrentVariable; Tag->VariableNumber = CurrentVariable;
CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16)); CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16)); CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8)); CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16)); CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16)); CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
VariableDefinition = FileFormTags->VariableDefinitions; VariableDefinition = FileFormTags->VariableDefinitions;
@ -615,16 +615,16 @@ Returns:
Tag->NumberOfLines = NumberOfLines; Tag->NumberOfLines = NumberOfLines;
Tag->VariableNumber = CurrentVariable; Tag->VariableNumber = CurrentVariable;
CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16)); CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16)); CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8)); CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16)); CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16)); CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
CopyMem (&Tag->Minimum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16)); CopyMem (&Tag->Minimum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));
CopyMem (&Tag->Maximum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16)); CopyMem (&Tag->Maximum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));
CopyMem (&Tag->Step, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16)); CopyMem (&Tag->Step, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));
CopyMem (&Tag->Default, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16)); CopyMem (&Tag->Default, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));
Tag->ResetRequired = (BOOLEAN) (((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & EFI_IFR_FLAG_RESET_REQUIRED); Tag->ResetRequired = (BOOLEAN) (((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
VariableDefinition = FileFormTags->VariableDefinitions; VariableDefinition = FileFormTags->VariableDefinitions;
@ -678,17 +678,17 @@ GetTagCount (
// Assume on entry we are pointing to an OpCode - reasonably this should // Assume on entry we are pointing to an OpCode - reasonably this should
// be a FormOp since the purpose is to count the tags in a particular Form. // be a FormOp since the purpose is to count the tags in a particular Form.
// //
for (Index = 0; RawFormSet[Index] != EFI_IFR_END_FORM_OP;) { for (Index = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_OP;) {
// //
// If we encounter the end of a form set, bail out // If we encounter the end of a form set, bail out
// //
if (RawFormSet[Index] == EFI_IFR_END_FORM_SET_OP) { if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {
break; break;
} }
// //
// We treat date/time internally as three op-codes // We treat date/time internally as three op-codes
// //
if (RawFormSet[Index] == EFI_IFR_DATE_OP || RawFormSet[Index] == EFI_IFR_TIME_OP) { if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_DATE_OP || RawFormSet[Index] == FRAMEWORK_EFI_IFR_TIME_OP) {
*NumberOfTags = (UINT16) (*NumberOfTags + 3); *NumberOfTags = (UINT16) (*NumberOfTags + 3);
} else { } else {
// //
@ -758,7 +758,7 @@ Returns:
STATIC STATIC
EFI_STATUS EFI_STATUS
InitializeTagStructures ( InitializeTagStructures (
IN EFI_IFR_BINARY *BinaryData, IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,
OUT EFI_FILE_FORM_TAGS *FileFormTags OUT EFI_FILE_FORM_TAGS *FileFormTags
) )
{ {
@ -876,7 +876,7 @@ InitializeTagStructures (
ZeroMem (FormTags->Tags, NumberOfTags * sizeof (EFI_TAG)); ZeroMem (FormTags->Tags, NumberOfTags * sizeof (EFI_TAG));
for (CurrTag = 0; RawFormSet[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) { for (CurrTag = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
// //
// Operand = IFR OpCode // Operand = IFR OpCode
// //
@ -901,7 +901,7 @@ InitializeTagStructures (
// //
switch (RawFormSet[Index]) { switch (RawFormSet[Index]) {
case EFI_IFR_FORM_OP: case FRAMEWORK_EFI_IFR_FORM_OP:
// //
// If there was no variable op-code defined, create a dummy entry for one // If there was no variable op-code defined, create a dummy entry for one
// //
@ -919,13 +919,13 @@ InitializeTagStructures (
} }
break; break;
case EFI_IFR_SUBTITLE_OP: case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
case EFI_IFR_TEXT_OP: case FRAMEWORK_EFI_IFR_TEXT_OP:
case EFI_IFR_REF_OP: case FRAMEWORK_EFI_IFR_REF_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
break; break;
case EFI_IFR_VARSTORE_OP: case FRAMEWORK_EFI_IFR_VARSTORE_OP:
if (FileFormTags->VariableDefinitions == NULL) { if (FileFormTags->VariableDefinitions == NULL) {
VariableDefinitions = AllocateZeroPool (sizeof (EFI_VARIABLE_DEFINITION)); VariableDefinitions = AllocateZeroPool (sizeof (EFI_VARIABLE_DEFINITION));
ASSERT (VariableDefinitions != NULL); ASSERT (VariableDefinitions != NULL);
@ -940,23 +940,23 @@ InitializeTagStructures (
); );
break; break;
case EFI_IFR_VARSTORE_SELECT_OP: case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16)); CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));
CurrentVariable2 = CurrentVariable; CurrentVariable2 = CurrentVariable;
break; break;
case EFI_IFR_VARSTORE_SELECT_PAIR_OP: case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
CopyMem(&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16)); CopyMem(&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));
CopyMem ( CopyMem (
&CurrentVariable2, &CurrentVariable2,
&((EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,
sizeof (UINT16) sizeof (UINT16)
); );
break; break;
case EFI_IFR_END_FORM_OP: case FRAMEWORK_EFI_IFR_END_FORM_OP:
// //
// Test for an allocated buffer. If already allocated this is due to having called this routine // Test for an allocated buffer. If already allocated this is due to having called this routine
// once for sizing of the NV storage. We then loaded the NV variable and can correctly initialize // once for sizing of the NV storage. We then loaded the NV variable and can correctly initialize
@ -1002,8 +1002,8 @@ InitializeTagStructures (
// Two types of tags constitute the One Of question: a one-of header and // Two types of tags constitute the One Of question: a one-of header and
// several one-of options. // several one-of options.
// //
case EFI_IFR_ONE_OF_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OP:
case EFI_IFR_ORDERED_LIST_OP: case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
// //
@ -1016,28 +1016,28 @@ InitializeTagStructures (
QuestionIndex = (UINT16) CurrTag; QuestionIndex = (UINT16) CurrTag;
break; break;
case EFI_IFR_ONE_OF_OPTION_OP: case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
FormTags->Tags[QuestionIndex].Flags = ((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags; FormTags->Tags[QuestionIndex].Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;
CopyMem ( CopyMem (
&FormTags->Tags[QuestionIndex].Key, &FormTags->Tags[QuestionIndex].Key,
&((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,
sizeof (UINT16) sizeof (UINT16)
); );
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED); FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
break; break;
case EFI_IFR_CHECKBOX_OP: case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
break; break;
case EFI_IFR_NUMERIC_OP: case FRAMEWORK_EFI_IFR_NUMERIC_OP:
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 1, FileFormTags, CurrentVariable); GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 1, FileFormTags, CurrentVariable);
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
break; break;
case EFI_IFR_DATE_OP: case FRAMEWORK_EFI_IFR_DATE_OP:
// //
// Date elements come in as a Year, Month, Day. We need to process them as a country-based // Date elements come in as a Year, Month, Day. We need to process them as a country-based
// Order. It is much easier to do it here than anywhere else. // Order. It is much easier to do it here than anywhere else.
@ -1086,7 +1086,7 @@ InitializeTagStructures (
TagLength = RawFormSet[Index + 1]; TagLength = RawFormSet[Index + 1];
break; break;
case EFI_IFR_TIME_OP: case FRAMEWORK_EFI_IFR_TIME_OP:
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 0, FileFormTags, CurrentVariable); GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 0, FileFormTags, CurrentVariable);
if (Count == 2) { if (Count == 2) {
@ -1104,15 +1104,15 @@ InitializeTagStructures (
} }
break; break;
case EFI_IFR_PASSWORD_OP: case FRAMEWORK_EFI_IFR_PASSWORD_OP:
case EFI_IFR_STRING_OP: case FRAMEWORK_EFI_IFR_STRING_OP:
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable); GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
break; break;
case EFI_IFR_SUPPRESS_IF_OP: case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
case EFI_IFR_GRAYOUT_IF_OP: case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
gConsistencyId++; gConsistencyId++;
// //
@ -1135,30 +1135,30 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_FORM_SET_OP: case FRAMEWORK_EFI_IFR_FORM_SET_OP:
CopyMem ( CopyMem (
&FormTags->Tags[CurrTag].GuidValue, &FormTags->Tags[CurrTag].GuidValue,
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,
sizeof (EFI_GUID) sizeof (EFI_GUID)
); );
CopyMem ( CopyMem (
&FormTags->Tags[CurrTag].CallbackHandle, &FormTags->Tags[CurrTag].CallbackHandle,
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,
sizeof (EFI_PHYSICAL_ADDRESS) sizeof (EFI_PHYSICAL_ADDRESS)
); );
CopyMem (&FormTags->Tags[CurrTag].Class, &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8)); CopyMem (&FormTags->Tags[CurrTag].Class, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));
CopyMem ( CopyMem (
&FormTags->Tags[CurrTag].SubClass, &FormTags->Tags[CurrTag].SubClass,
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,
sizeof (UINT8) sizeof (UINT8)
); );
CopyMem ( CopyMem (
&FormTags->Tags[CurrTag].NvDataSize, &FormTags->Tags[CurrTag].NvDataSize,
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,
sizeof (UINT16) sizeof (UINT16)
); );
Class = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class; Class = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;
SubClass = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass; SubClass = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;
// //
// If the formset has a size value, that means someone must be using this, so create a variable // If the formset has a size value, that means someone must be using this, so create a variable
// We also shall reserve the formid of 0 for this specific purpose. // We also shall reserve the formid of 0 for this specific purpose.
@ -1177,41 +1177,41 @@ InitializeTagStructures (
} }
break; break;
case EFI_IFR_BANNER_OP: case FRAMEWORK_EFI_IFR_BANNER_OP:
if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) { if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) {
TempValue = 0; TempValue = 0;
CopyMem (&TempValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8)); CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));
// //
// If this is the special timeout value, we will dynamically figure out where to put it // If this is the special timeout value, we will dynamically figure out where to put it
// Also the least significant byte refers to the TimeOut desired. // Also the least significant byte refers to the TimeOut desired.
// //
if (TempValue == EFI_IFR_BANNER_TIMEOUT) { if (TempValue == FRAMEWORK_EFI_IFR_BANNER_TIMEOUT) {
CopyMem (&FrontPageTimeOutTitle, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16)); CopyMem (&FrontPageTimeOutTitle, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));
if (FrontPageTimeOutValue != (INT16) -1) { if (FrontPageTimeOutValue != (INT16) -1) {
CopyMem (&FrontPageTimeOutValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16)); CopyMem (&FrontPageTimeOutValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));
} }
break; break;
} }
CopyMem ( CopyMem (
&BannerData->Banner[((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][ &BannerData->Banner[((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][
((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment], ((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],
&((EFI_IFR_BANNER *) &RawFormSet[Index])->Title, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title,
sizeof (STRING_REF) sizeof (STRING_REF)
); );
} }
break; break;
case EFI_IFR_INCONSISTENT_IF_OP: case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
CopyMem ( CopyMem (
&FormTags->Tags[CurrTag].Text, &FormTags->Tags[CurrTag].Text,
&((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,
sizeof (UINT16) sizeof (UINT16)
); );
gConsistencyId++; gConsistencyId++;
InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
CopyMem (&InconsistentTags->Popup, &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16)); CopyMem (&InconsistentTags->Popup, &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));
// //
// Since this op-code doesn't use the next field(s), initialize them with something invalid. // Since this op-code doesn't use the next field(s), initialize them with something invalid.
@ -1235,14 +1235,14 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_EQ_ID_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;
CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16)); CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
CopyMem ( CopyMem (
&InconsistentTags->QuestionId1, &InconsistentTags->QuestionId1,
&((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,
sizeof (UINT16) sizeof (UINT16)
); );
@ -1270,14 +1270,14 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_EQ_VAR_VAL_OP: case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
InconsistentTags->Operand = ((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;
CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16)); CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
CopyMem ( CopyMem (
&InconsistentTags->QuestionId1, &InconsistentTags->QuestionId1,
&((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,
sizeof (UINT16) sizeof (UINT16)
); );
@ -1304,18 +1304,18 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_EQ_ID_ID_OP: case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;
CopyMem ( CopyMem (
&InconsistentTags->QuestionId1, &InconsistentTags->QuestionId1,
&((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,
sizeof (UINT16) sizeof (UINT16)
); );
CopyMem ( CopyMem (
&InconsistentTags->QuestionId2, &InconsistentTags->QuestionId2,
&((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,
sizeof (UINT16) sizeof (UINT16)
); );
@ -1339,14 +1339,14 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_AND_OP: case FRAMEWORK_EFI_IFR_AND_OP:
case EFI_IFR_OR_OP: case FRAMEWORK_EFI_IFR_OR_OP:
case EFI_IFR_NOT_OP: case FRAMEWORK_EFI_IFR_NOT_OP:
case EFI_IFR_GT_OP: case FRAMEWORK_EFI_IFR_GT_OP:
case EFI_IFR_GE_OP: case FRAMEWORK_EFI_IFR_GE_OP:
case EFI_IFR_TRUE_OP: case FRAMEWORK_EFI_IFR_TRUE_OP:
case EFI_IFR_FALSE_OP: case FRAMEWORK_EFI_IFR_FALSE_OP:
InconsistentTags->Operand = ((EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;
// //
// Since this op-code doesn't use the next field(s), initialize them with something invalid. // Since this op-code doesn't use the next field(s), initialize them with something invalid.
@ -1357,8 +1357,8 @@ InitializeTagStructures (
// Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but // Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but
// have no coresponding id. The examination of id is needed by evaluating boolean expression. // have no coresponding id. The examination of id is needed by evaluating boolean expression.
// //
if (RawFormSet[Index] == EFI_IFR_TRUE_OP || if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_TRUE_OP ||
RawFormSet[Index] == EFI_IFR_FALSE_OP) { RawFormSet[Index] == FRAMEWORK_EFI_IFR_FALSE_OP) {
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE - 1; InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE - 1;
} else { } else {
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE; InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE;
@ -1380,18 +1380,18 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_EQ_ID_LIST_OP: case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL); IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;
CopyMem ( CopyMem (
&InconsistentTags->QuestionId1, &InconsistentTags->QuestionId1,
&((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,
sizeof (UINT16) sizeof (UINT16)
); );
CopyMem ( CopyMem (
&InconsistentTags->ListLength, &InconsistentTags->ListLength,
&((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,
sizeof (UINT16) sizeof (UINT16)
); );
InconsistentTags->ValueList = FormTags->Tags[CurrTag].IntList; InconsistentTags->ValueList = FormTags->Tags[CurrTag].IntList;
@ -1418,8 +1418,8 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_END_IF_OP: case FRAMEWORK_EFI_IFR_END_IF_OP:
InconsistentTags->Operand = ((EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode; InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;
// //
// Since this op-code doesn't use the next field(s), initialize them with something invalid. // Since this op-code doesn't use the next field(s), initialize them with something invalid.
@ -1441,7 +1441,7 @@ InitializeTagStructures (
InconsistentTags = InconsistentTags->Next; InconsistentTags = InconsistentTags->Next;
break; break;
case EFI_IFR_END_ONE_OF_OP: case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:
break; break;
default: default:
@ -1479,12 +1479,12 @@ InitializeTagStructures (
// //
// Search the tags for the tag which corresponds to this ID // Search the tags for the tag which corresponds to this ID
// //
for (CurrTag = 0; FormTags->Tags[0].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) { for (CurrTag = 0; FormTags->Tags[0].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
// //
// If we hit the end of a form, go to the next set of Tags. // If we hit the end of a form, go to the next set of Tags.
// Remember - EndFormSet op-codes sit on their own page after an end form. // Remember - EndFormSet op-codes sit on their own page after an end form.
// //
if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) { if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {
// //
// Reset the CurrTag value (it will be incremented, after this case statement // Reset the CurrTag value (it will be incremented, after this case statement
// so set to a negative one so that we get the desired effect.) Fish can beat me later. // so set to a negative one so that we get the desired effect.) Fish can beat me later.
@ -1506,12 +1506,12 @@ InitializeTagStructures (
// //
// Search the tags for the tag which corresponds to this ID // Search the tags for the tag which corresponds to this ID
// //
for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) { for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
// //
// If we hit the end of a form, go to the next set of Tags. // If we hit the end of a form, go to the next set of Tags.
// Remember - EndFormSet op-codes sit on their own page after an end form. // Remember - EndFormSet op-codes sit on their own page after an end form.
// //
if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) { if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {
// //
// Reset the CurrTag value (it will be incremented, after this case statement // Reset the CurrTag value (it will be incremented, after this case statement
// so set to a negative one so that we get the desired effect.) Fish can beat me later. // so set to a negative one so that we get the desired effect.) Fish can beat me later.
@ -1582,7 +1582,7 @@ InitPage (
CHAR16 * CHAR16 *
GetToken ( GetToken (
IN STRING_REF Token, IN STRING_REF Token,
IN EFI_HII_HANDLE HiiHandle IN FRAMEWORK_EFI_HII_HANDLE HiiHandle
) )
/*++ /*++
@ -1650,7 +1650,7 @@ PopulateHomePage (
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINTN Index; UINTN Index;
EFI_IFR_BINARY *IfrBinary; FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
CHAR16 *StringPtr; CHAR16 *StringPtr;
EFI_FILE_FORM_TAGS *FileFormTags; EFI_FILE_FORM_TAGS *FileFormTags;
EFI_FORM_TAGS LocalTags; EFI_FORM_TAGS LocalTags;
@ -1727,7 +1727,7 @@ DisplayHomePage (
return Selection; return Selection;
} }
Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData); Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);
return Selection; return Selection;
} }
@ -1735,9 +1735,9 @@ DisplayHomePage (
STATIC STATIC
EFI_STATUS EFI_STATUS
InitializeBinaryStructures ( InitializeBinaryStructures (
IN EFI_HII_HANDLE *Handle, IN FRAMEWORK_EFI_HII_HANDLE *Handle,
IN BOOLEAN UseDatabase, IN BOOLEAN UseDatabase,
IN EFI_IFR_PACKET *Packet, IN FRAMEWORK_EFI_IFR_PACKET *Packet,
IN UINT8 *NvMapOverride, IN UINT8 *NvMapOverride,
IN UINTN NumberOfIfrImages, IN UINTN NumberOfIfrImages,
OUT EFI_FILE_FORM_TAGS **FileFormTagsHead OUT EFI_FILE_FORM_TAGS **FileFormTagsHead
@ -1745,7 +1745,7 @@ InitializeBinaryStructures (
{ {
UINTN HandleIndex; UINTN HandleIndex;
EFI_STATUS Status; EFI_STATUS Status;
EFI_IFR_BINARY *BinaryData; FRAMEWORK_EFI_IFR_BINARY *BinaryData;
EFI_FILE_FORM_TAGS *FileFormTags; EFI_FILE_FORM_TAGS *FileFormTags;
UINTN SizeOfNvStore; UINTN SizeOfNvStore;
EFI_FORM_CALLBACK_PROTOCOL *FormCallback; EFI_FORM_CALLBACK_PROTOCOL *FormCallback;
@ -1780,7 +1780,7 @@ InitializeBinaryStructures (
// //
// Allocate memory for our Binary Data // Allocate memory for our Binary Data
// //
BinaryData = AllocateZeroPool (sizeof (EFI_IFR_BINARY)); BinaryData = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));
ASSERT (BinaryData); ASSERT (BinaryData);
// //
@ -1811,7 +1811,7 @@ InitializeBinaryStructures (
// Allocate memory for our Binary Data linked-list // Allocate memory for our Binary Data linked-list
// Each handle represents a Binary and we will store that data away. // Each handle represents a Binary and we will store that data away.
// //
BinaryData->Next = AllocateZeroPool (sizeof (EFI_IFR_BINARY)); BinaryData->Next = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));
ASSERT (BinaryData->Next); ASSERT (BinaryData->Next);
BinaryData = BinaryData->Next; BinaryData = BinaryData->Next;
@ -1993,7 +1993,7 @@ InitializeBinaryStructures (
NvMapListHead = NULL; NvMapListHead = NULL;
Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], EFI_IFR_FLAG_DEFAULT, &NvMapListHead); Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (NULL != NvMapListHead); ASSERT_EFI_ERROR (NULL != NvMapListHead);
@ -2048,9 +2048,9 @@ STATIC
EFI_STATUS EFI_STATUS
GetIfrBinaryData ( GetIfrBinaryData (
IN EFI_HII_PROTOCOL *Hii, IN EFI_HII_PROTOCOL *Hii,
IN EFI_HII_HANDLE HiiHandle, IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,
IN EFI_IFR_PACKET *Packet, IN FRAMEWORK_EFI_IFR_PACKET *Packet,
IN OUT EFI_IFR_BINARY *BinaryData IN OUT FRAMEWORK_EFI_IFR_BINARY *BinaryData
) )
/*++ /*++
@ -2074,7 +2074,7 @@ Returns:
UINTN BufferSize; UINTN BufferSize;
VOID *Buffer; VOID *Buffer;
UINT8 *RawFormBinary; UINT8 *RawFormBinary;
EFI_IFR_FORM_SET *FormOp; FRAMEWORK_EFI_IFR_FORM_SET *FormOp;
UINT16 Index; UINT16 Index;
UINT16 Index2; UINT16 Index2;
UINT16 TitleToken; UINT16 TitleToken;
@ -2147,13 +2147,13 @@ Returns:
} }
// //
// Walk through the FormSet Opcodes looking for the FormSet opcode // Walk through the FormSet Opcodes looking for the FormSet opcode
// If we hit EFI_IFR_END_SET_OP we know we hit the end of the FormSet. // If we hit FRAMEWORK_EFI_IFR_END_SET_OP we know we hit the end of the FormSet.
// //
for (Index = 0; RawFormBinary[Index] != EFI_IFR_END_FORM_SET_OP;) { for (Index = 0; RawFormBinary[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
FormOp = (EFI_IFR_FORM_SET *) &RawFormBinary[Index]; FormOp = (FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormBinary[Index];
Index = (UINT16) (Index + FormOp->Header.Length); Index = (UINT16) (Index + FormOp->Header.Length);
if (FormOp->Header.OpCode == EFI_IFR_FORM_SET_OP) { if (FormOp->Header.OpCode == FRAMEWORK_EFI_IFR_FORM_SET_OP) {
TitleToken = FormOp->FormSetTitle; TitleToken = FormOp->FormSetTitle;
// //
// If displaying FrontPage - set the flag signifying it // If displaying FrontPage - set the flag signifying it

18
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
View File

@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define _SETUP_H #define _SETUP_H
#include <PiDxe.h> #include <FrameworkDxe.h>
#include <Protocol/FrameworkFormCallback.h> #include <Protocol/FrameworkFormCallback.h>
#include <Protocol/FrameworkFormBrowser.h> #include <Protocol/FrameworkFormBrowser.h>
@ -275,14 +275,14 @@ typedef struct {
// //
// This encapsulates all the pointers associated with found IFR binaries // This encapsulates all the pointers associated with found IFR binaries
// //
typedef struct _EFI_IFR_BINARY { typedef struct _FRAMEWORK_EFI_IFR_BINARY {
struct _EFI_IFR_BINARY *Next; struct _FRAMEWORK_EFI_IFR_BINARY *Next;
VOID *IfrPackage; // Handy for use in freeing the data later since this is the header of the buffer VOID *IfrPackage; // Handy for use in freeing the data later since this is the header of the buffer
VOID *FormBinary; VOID *FormBinary;
EFI_HII_HANDLE Handle; FRAMEWORK_EFI_HII_HANDLE Handle;
STRING_REF TitleToken; STRING_REF TitleToken;
BOOLEAN UnRegisterOnExit; BOOLEAN UnRegisterOnExit;
} EFI_IFR_BINARY; } FRAMEWORK_EFI_IFR_BINARY;
// //
// This encapsulates all the questions (tags) for a particular Form Set // This encapsulates all the questions (tags) for a particular Form Set
@ -334,7 +334,7 @@ typedef struct {
// //
// Head of the Binary structures // Head of the Binary structures
// //
EFI_IFR_BINARY *gBinaryDataHead; FRAMEWORK_EFI_IFR_BINARY *gBinaryDataHead;
// //
// The IFR binary that the user chose to run // The IFR binary that the user chose to run
@ -345,7 +345,7 @@ EFI_HII_PROTOCOL *Hii;
VOID *CachedNVEntry; VOID *CachedNVEntry;
BANNER_DATA *BannerData; BANNER_DATA *BannerData;
EFI_HII_HANDLE FrontPageHandle; FRAMEWORK_EFI_HII_HANDLE FrontPageHandle;
STRING_REF FrontPageTimeOutTitle; STRING_REF FrontPageTimeOutTitle;
INT16 FrontPageTimeOutValue; INT16 FrontPageTimeOutValue;
UINTN gClassOfVfr; UINTN gClassOfVfr;
@ -356,7 +356,7 @@ BOOLEAN gSaveRequired;
BOOLEAN gNvUpdateRequired; BOOLEAN gNvUpdateRequired;
UINT16 gConsistencyId; UINT16 gConsistencyId;
UINTN gPriorMenuEntry; UINTN gPriorMenuEntry;
EFI_HII_HANDLE gHiiHandle; FRAMEWORK_EFI_HII_HANDLE gHiiHandle;
BOOLEAN gFirstIn; BOOLEAN gFirstIn;
VOID *gPreviousValue; VOID *gPreviousValue;
UINT16 gDirection; UINT16 gDirection;
@ -460,7 +460,7 @@ DisplayPageFrame (
CHAR16 * CHAR16 *
GetToken ( GetToken (
IN STRING_REF IfrBinaryTitle, IN STRING_REF IfrBinaryTitle,
IN EFI_HII_HANDLE HiiHandle IN FRAMEWORK_EFI_HII_HANDLE HiiHandle
) )
; ;

112
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
View File

@ -361,7 +361,7 @@ Returns:
VOID VOID
UiAddMenuOption ( UiAddMenuOption (
IN CHAR16 *String, IN CHAR16 *String,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_TAG *Tags, IN EFI_TAG *Tags,
IN VOID *FormBinary, IN VOID *FormBinary,
IN UINTN IfrNumber IN UINTN IfrNumber
@ -401,7 +401,7 @@ Returns:
VOID VOID
UiAddSubMenuOption ( UiAddSubMenuOption (
IN CHAR16 *String, IN CHAR16 *String,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_TAG *Tags, IN EFI_TAG *Tags,
IN UINTN TagIndex, IN UINTN TagIndex,
IN UINT16 FormId, IN UINT16 FormId,
@ -798,7 +798,7 @@ UpdateStatusBar (
gScreenDimensions.BottomRow - 1, gScreenDimensions.BottomRow - 1,
NvUpdateMessage NvUpdateMessage
); );
gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED)); gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) == FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));
gNvUpdateRequired = TRUE; gNvUpdateRequired = TRUE;
} else { } else {
@ -857,8 +857,8 @@ Returns:
EFI_FILE_FORM_TAGS *PreviousFileForm; EFI_FILE_FORM_TAGS *PreviousFileForm;
EFI_FORM_TAGS *FormTags; EFI_FORM_TAGS *FormTags;
EFI_FORM_TAGS *PreviousFormTags; EFI_FORM_TAGS *PreviousFormTags;
EFI_IFR_BINARY *IfrBinary; FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
EFI_IFR_BINARY *PreviousIfrBinary; FRAMEWORK_EFI_IFR_BINARY *PreviousIfrBinary;
EFI_INCONSISTENCY_DATA *Inconsistent; EFI_INCONSISTENCY_DATA *Inconsistent;
EFI_VARIABLE_DEFINITION *VariableDefinition; EFI_VARIABLE_DEFINITION *VariableDefinition;
EFI_VARIABLE_DEFINITION *PreviousVariableDefinition; EFI_VARIABLE_DEFINITION *PreviousVariableDefinition;
@ -900,11 +900,11 @@ Returns:
// //
// Walk through each of the tags and free the IntList allocation // Walk through each of the tags and free the IntList allocation
// //
for (Index = 0; FormTags->Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) { for (Index = 0; FormTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {
// //
// It is more than likely that the very last page will contain an end formset // It is more than likely that the very last page will contain an end formset
// //
if (FormTags->Tags[Index].Operand == EFI_IFR_END_FORM_SET_OP) { if (FormTags->Tags[Index].Operand == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {
break; break;
} }
@ -1093,7 +1093,7 @@ Returns:
// //
// If the op-code has a late check, ensure consistency checks are now applied // If the op-code has a late check, ensure consistency checks are now applied
// //
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) { if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
if (ValueIsNotValid (TRUE, 0, Tag, FileFormTags, &PopUp)) { if (ValueIsNotValid (TRUE, 0, Tag, FileFormTags, &PopUp)) {
if (PopUp != 0x0000) { if (PopUp != 0x0000) {
StringPtr = GetToken (PopUp, MenuOption->Handle); StringPtr = GetToken (PopUp, MenuOption->Handle);
@ -1130,7 +1130,7 @@ Returns:
UINT16 UINT16
GetWidth ( GetWidth (
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
/*++ /*++
@ -1155,21 +1155,21 @@ Returns:
// //
// See if the second text parameter is really NULL // See if the second text parameter is really NULL
// //
if ((Tag->Operand == EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) { if ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {
String = GetToken (Tag->TextTwo, Handle); String = GetToken (Tag->TextTwo, Handle);
Size = StrLen (String); Size = StrLen (String);
FreePool (String); FreePool (String);
} }
if ((Tag->Operand == EFI_IFR_SUBTITLE_OP) || if ((Tag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) ||
(Tag->Operand == EFI_IFR_REF_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_REF_OP) ||
(Tag->Operand == EFI_IFR_PASSWORD_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_PASSWORD_OP) ||
(Tag->Operand == EFI_IFR_STRING_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_STRING_OP) ||
(Tag->Operand == EFI_IFR_INVENTORY_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_INVENTORY_OP) ||
// //
// Allow a wide display if text op-code and no secondary text op-code // Allow a wide display if text op-code and no secondary text op-code
// //
((Tag->Operand == EFI_IFR_TEXT_OP) && (Size == 0x0000)) ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Size == 0x0000))
) { ) {
return (UINT16) (gPromptBlockWidth + gOptionBlockWidth); return (UINT16) (gPromptBlockWidth + gOptionBlockWidth);
} else { } else {
@ -1285,7 +1285,7 @@ Returns:
STATIC STATIC
VOID VOID
UpdateOptionSkipLines ( UpdateOptionSkipLines (
IN EFI_IFR_DATA_ARRAY *PageData, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption,
IN EFI_FILE_FORM_TAGS *FileFormTagsHead, IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
IN CHAR16 **OptionalString, IN CHAR16 **OptionalString,
@ -1376,7 +1376,7 @@ UI_MENU_OPTION *
UiDisplayMenu ( UiDisplayMenu (
IN BOOLEAN SubMenu, IN BOOLEAN SubMenu,
IN EFI_FILE_FORM_TAGS *FileFormTagsHead, IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
OUT EFI_IFR_DATA_ARRAY *PageData OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData
) )
/*++ /*++
@ -1388,7 +1388,7 @@ Routine Description:
Arguments: Arguments:
SubMenu - Indicate is sub menu. SubMenu - Indicate is sub menu.
FileFormTagsHead - A pointer to the EFI_FILE_FORM_TAGS structure. FileFormTagsHead - A pointer to the EFI_FILE_FORM_TAGS structure.
PageData - A pointer to the EFI_IFR_DATA_ARRAY. PageData - A pointer to the FRAMEWORK_EFI_IFR_DATA_ARRAY.
Returns: Returns:
Return the pointer of the menu which selected, Return the pointer of the menu which selected,
@ -1433,7 +1433,7 @@ Returns:
UI_MENU_OPTION *NextMenuOption; UI_MENU_OPTION *NextMenuOption;
UI_MENU_OPTION *SavedMenuOption; UI_MENU_OPTION *SavedMenuOption;
UI_MENU_OPTION *PreviousMenuOption; UI_MENU_OPTION *PreviousMenuOption;
EFI_IFR_BINARY *IfrBinary; FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
UI_CONTROL_FLAG ControlFlag; UI_CONTROL_FLAG ControlFlag;
EFI_SCREEN_DESCRIPTOR LocalScreen; EFI_SCREEN_DESCRIPTOR LocalScreen;
EFI_FILE_FORM_TAGS *FileFormTags; EFI_FILE_FORM_TAGS *FileFormTags;
@ -1572,7 +1572,7 @@ Returns:
if (MenuOption->ThisTag->GrayOut) { if (MenuOption->ThisTag->GrayOut) {
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);
} else { } else {
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);
} }
} }
@ -1608,8 +1608,8 @@ Returns:
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString); ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
if (OptionString != NULL) { if (OptionString != NULL) {
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP || if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
) { ) {
// //
// If leading spaces on OptionString - remove the spaces // If leading spaces on OptionString - remove the spaces
@ -1629,8 +1629,8 @@ Returns:
// //
// If this is a date or time op-code and is used to reflect an RTC, register the op-code // If this is a date or time op-code and is used to reflect an RTC, register the op-code
// //
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP || if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP) && MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP) &&
(MenuOption->ThisTag->StorageStart >= FileFormTags->FormTags.Tags[0].NvDataSize)) { (MenuOption->ThisTag->StorageStart >= FileFormTags->FormTags.Tags[0].NvDataSize)) {
if (gMenuRefreshHead == NULL) { if (gMenuRefreshHead == NULL) {
@ -1701,7 +1701,7 @@ Returns:
// //
// If this is a text op with secondary text information // If this is a text op with secondary text information
// //
if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) { if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {
StringPtr = GetToken (MenuOption->ThisTag->TextTwo, MenuOption->Handle); StringPtr = GetToken (MenuOption->ThisTag->TextTwo, MenuOption->Handle);
Width = (UINT16) gOptionBlockWidth; Width = (UINT16) gOptionBlockWidth;
@ -1824,8 +1824,8 @@ Returns:
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString); ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);
if (OptionString != NULL) { if (OptionString != NULL) {
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP || if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
) { ) {
// //
// If leading spaces on OptionString - remove the spaces // If leading spaces on OptionString - remove the spaces
@ -1865,7 +1865,7 @@ Returns:
if (MenuOption->ThisTag->GrayOut) { if (MenuOption->ThisTag->GrayOut) {
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);
} else { } else {
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND); gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);
} }
} }
@ -1909,7 +1909,7 @@ Returns:
// This is only possible if we entered this page and the first menu option is // This is only possible if we entered this page and the first menu option is
// a "non-menu" item. In that case, force it UiDown // a "non-menu" item. In that case, force it UiDown
// //
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
// //
// If we previously hit an UP command and we are still sitting on a text operation // If we previously hit an UP command and we are still sitting on a text operation
// we must continue going up // we must continue going up
@ -1946,8 +1946,8 @@ Returns:
if (SubMenu) { if (SubMenu) {
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString); ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
if (OptionString != NULL) { if (OptionString != NULL) {
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP || if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
) { ) {
// //
// If leading spaces on OptionString - remove the spaces // If leading spaces on OptionString - remove the spaces
@ -2032,8 +2032,8 @@ Returns:
if (SubMenu && if (SubMenu &&
(Repaint || NewLine || (Repaint || NewLine ||
(MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||
(MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) && (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) &&
!(gClassOfVfr == EFI_GENERAL_APPLICATION_SUBCLASS)) { !(gClassOfVfr == EFI_GENERAL_APPLICATION_SUBCLASS)) {
// //
// Don't print anything if it is a NULL help token // Don't print anything if it is a NULL help token
@ -2107,9 +2107,9 @@ Returns:
Status = UiWaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND); Status = UiWaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);
if (Status == EFI_TIMEOUT) { if (Status == EFI_TIMEOUT) {
EFI_IFR_DATA_ENTRY *DataEntry; FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1); DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
PageData->EntryCount = 1; PageData->EntryCount = 1;
Count = (UINT32) ((OriginalTimeOut - FrontPageTimeOutValue) * 100 / OriginalTimeOut); Count = (UINT32) ((OriginalTimeOut - FrontPageTimeOutValue) * 100 / OriginalTimeOut);
@ -2119,7 +2119,7 @@ Returns:
FormCallback->Callback ( FormCallback->Callback (
FormCallback, FormCallback,
0xFFFF, 0xFFFF,
(EFI_IFR_DATA_ARRAY *) PageData, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,
NULL NULL
); );
} }
@ -2135,7 +2135,7 @@ Returns:
FormCallback->Callback ( FormCallback->Callback (
FormCallback, FormCallback,
0xFFFE, 0xFFFE,
(EFI_IFR_DATA_ARRAY *) PageData, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,
NULL NULL
); );
} }
@ -2181,7 +2181,7 @@ Returns:
// //
case '+': case '+':
case '-': case '-':
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) { if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
if (Key.UnicodeChar == '+') { if (Key.UnicodeChar == '+') {
gDirection = SCAN_RIGHT; gDirection = SCAN_RIGHT;
@ -2205,7 +2205,7 @@ Returns:
case ' ': case ' ':
if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) { if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {
if (SubMenu) { if (SubMenu) {
if (MenuOption->ThisTag->Operand == EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row); gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);
gST->ConOut->OutputString (gST->ConOut, MenuOption->Description); gST->ConOut->OutputString (gST->ConOut, MenuOption->Description);
Selection = MenuOption; Selection = MenuOption;
@ -2265,7 +2265,7 @@ Returns:
// //
for (Link = Menu.ForwardLink; Link != &Menu; Link = Link->ForwardLink) { for (Link = Menu.ForwardLink; Link != &Menu; Link = Link->ForwardLink) {
NextMenuOption = CR (Link, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE); NextMenuOption = CR (Link, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != EFI_IFR_SUBTITLE_OP)) { if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != FRAMEWORK_EFI_IFR_SUBTITLE_OP)) {
break; break;
} }
} }
@ -2336,11 +2336,11 @@ Returns:
ExtractRequestedNvMap (FileFormTags, MenuOption->ThisTag->VariableNumber, &VariableDefinition); ExtractRequestedNvMap (FileFormTags, MenuOption->ThisTag->VariableNumber, &VariableDefinition);
if (SubMenu) { if (SubMenu) {
if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP && if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP &&
!(MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE)) || !(MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE)) ||
(MenuOption->ThisTag->GrayOut) || (MenuOption->ThisTag->GrayOut) ||
(MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||
(MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) { (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
Selection = NULL; Selection = NULL;
break; break;
} }
@ -2359,7 +2359,7 @@ Returns:
PrintStringAt (LocalScreen.LeftColumn + gPromptBlockWidth + 1, MenuOption->Row, OptionString); PrintStringAt (LocalScreen.LeftColumn + gPromptBlockWidth + 1, MenuOption->Row, OptionString);
} }
if (MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) { if (MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
Selection = MenuOption; Selection = MenuOption;
} }
@ -2372,7 +2372,7 @@ Returns:
// //
// If not a goto, dump single piece of data, otherwise dump everything // If not a goto, dump single piece of data, otherwise dump everything
// //
if (Selection->ThisTag->Operand == EFI_IFR_REF_OP) { if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP) {
// //
// Check for tags that might have LATE_CHECK enabled. If they do, we can't switch pages or save NV data. // Check for tags that might have LATE_CHECK enabled. If they do, we can't switch pages or save NV data.
// //
@ -2532,7 +2532,7 @@ Returns:
case CfUiLeft: case CfUiLeft:
ControlFlag = CfCheckSelection; ControlFlag = CfCheckSelection;
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) { if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
if (MenuOption->Skip == 1) { if (MenuOption->Skip == 1) {
// //
// In the tail of the Date/Time op-code set, go left. // In the tail of the Date/Time op-code set, go left.
@ -2553,7 +2553,7 @@ Returns:
case CfUiRight: case CfUiRight:
ControlFlag = CfCheckSelection; ControlFlag = CfCheckSelection;
if ((MenuOption->Skip == 0) && if ((MenuOption->Skip == 0) &&
((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP))
) { ) {
// //
// We are in the head or middle of the Date/Time op-code set, advance right. // We are in the head or middle of the Date/Time op-code set, advance right.
@ -2593,7 +2593,7 @@ Returns:
// //
// If the previous MenuOption contains a display-only op-code, skip to the next one // If the previous MenuOption contains a display-only op-code, skip to the next one
// //
if (PreviousMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) { if (PreviousMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {
// //
// This is ok as long as not at the end of the list // This is ok as long as not at the end of the list
// //
@ -2648,7 +2648,7 @@ Returns:
if (SubMenu) { if (SubMenu) {
SavedMenuOption = MenuOption; SavedMenuOption = MenuOption;
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE); MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
// //
// If we are at the end of the list and sitting on a text op, we need to more forward // If we are at the end of the list and sitting on a text op, we need to more forward
// //
@ -2754,7 +2754,7 @@ Returns:
// If the next MenuOption contains a display-only op-code, skip to the next one // If the next MenuOption contains a display-only op-code, skip to the next one
// Also if the next MenuOption is date or time, // Also if the next MenuOption is date or time,
// //
if (NextMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) { if (NextMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {
// //
// This is ok as long as not at the end of the list // This is ok as long as not at the end of the list
// //
@ -2880,7 +2880,7 @@ Returns:
if (SubMenu) { if (SubMenu) {
SavedMenuOption = MenuOption; SavedMenuOption = MenuOption;
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE); MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) { if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
// //
// If we are at the end of the list and sitting on a text op, we need to more forward // If we are at the end of the list and sitting on a text op, we need to more forward
// //
@ -2970,7 +2970,7 @@ Returns:
NvMapListHead = NULL; NvMapListHead = NULL;
Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, EFI_IFR_FLAG_DEFAULT, &NvMapListHead); Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (NULL != NvMapListHead); ASSERT_EFI_ERROR (NULL != NvMapListHead);
@ -3079,7 +3079,7 @@ Returns:
for (; Temp != &Menu; Temp = Direction ? Temp->BackLink : Temp->ForwardLink) { for (; Temp != &Menu; Temp = Direction ? Temp->BackLink : Temp->ForwardLink) {
MenuOption = CR (Temp, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE); MenuOption = CR (Temp, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
if (!(MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) { if (!(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {
return FALSE; return FALSE;
} }
} }
@ -3116,7 +3116,7 @@ Returns:
NewPosition = *CurrentPosition; NewPosition = *CurrentPosition;
MenuOption = CR (NewPosition, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE); MenuOption = CR (NewPosition, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) { if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
// //
// Calculate the distance from current position to the last Date/Time op-code. // Calculate the distance from current position to the last Date/Time op-code.
// //

14
IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
View File

@ -80,7 +80,7 @@ typedef struct {
UINTN IfrNumber; UINTN IfrNumber;
VOID *FormBinary; VOID *FormBinary;
EFI_HII_HANDLE Handle; FRAMEWORK_EFI_HII_HANDLE Handle;
EFI_TAG *Tags; EFI_TAG *Tags;
UINTN TagIndex; UINTN TagIndex;
EFI_TAG *ThisTag; EFI_TAG *ThisTag;
@ -167,7 +167,7 @@ UiFreeMenu (
VOID VOID
UiAddMenuOption ( UiAddMenuOption (
IN CHAR16 *String, IN CHAR16 *String,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN VOID *FormBinary, IN VOID *FormBinary,
IN UINTN IfrNumber IN UINTN IfrNumber
@ -177,7 +177,7 @@ UiAddMenuOption (
VOID VOID
UiAddSubMenuOption ( UiAddSubMenuOption (
IN CHAR16 *String, IN CHAR16 *String,
IN EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN UINTN TagIndex, IN UINTN TagIndex,
IN UINT16 FormId, IN UINT16 FormId,
@ -189,7 +189,7 @@ UI_MENU_OPTION *
UiDisplayMenu ( UiDisplayMenu (
IN BOOLEAN SubMenu, IN BOOLEAN SubMenu,
IN EFI_FILE_FORM_TAGS *FileFormTagsHead, IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
OUT EFI_IFR_DATA_ARRAY *PageData OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData
) )
; ;
@ -245,7 +245,7 @@ ReadPassword (
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption,
IN BOOLEAN PromptForPassword, IN BOOLEAN PromptForPassword,
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN EFI_IFR_DATA_ARRAY *PageData, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
IN BOOLEAN SecondEntry, IN BOOLEAN SecondEntry,
IN EFI_FILE_FORM_TAGS *FileFormTags, IN EFI_FILE_FORM_TAGS *FileFormTags,
OUT CHAR16 *StringPtr OUT CHAR16 *StringPtr
@ -302,7 +302,7 @@ ProcessOptions (
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption,
IN BOOLEAN Selected, IN BOOLEAN Selected,
IN EFI_FILE_FORM_TAGS *FileFormTagsHead, IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
IN EFI_IFR_DATA_ARRAY *PageData, IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
OUT CHAR16 **OptionString OUT CHAR16 **OptionString
) )
; ;
@ -368,7 +368,7 @@ GetLineByWidth (
UINT16 UINT16
GetWidth ( GetWidth (
IN EFI_TAG *Tag, IN EFI_TAG *Tag,
IN EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
) )
; ;