DriverCallback (\r
IN EFI_FORM_CALLBACK_PROTOCOL *This,\r
IN UINT16 KeyValue,\r
- IN EFI_IFR_DATA_ARRAY *Data,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data,\r
OUT EFI_HII_CALLBACK_PACKET **Packet\r
)\r
/*++\r
&UpdateData->Data // Buffer location to place op-codes\r
);\r
\r
- Location = Location + ((EFI_IFR_OP_HEADER *) &UpdateData->Data)->Length;\r
+ Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) &UpdateData->Data)->Length;\r
\r
CreateCheckBoxOpCode (\r
QuestionId, // Question ID\r
1, // Data width (BOOLEAN = 1)\r
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_PROMPT), // Token value for the Prompt\r
(UINT16) STRING_TOKEN (STR_CHECK_DYNAMIC_HELP), // Token value for the Help\r
- EFI_IFR_FLAG_INTERACTIVE, // Flags\r
+ FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE, // Flags\r
0x1236, // Key\r
Location // Buffer location to place op-codes\r
);\r
\r
DataPacket->DataArray.EntryCount = 1;\r
DataPacket->DataArray.NvRamMap = NULL;\r
- ((EFI_IFR_DATA_ENTRY *) (&DataPacket->DataArray + 1))->Flags = EXIT_REQUIRED;\r
+ ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&DataPacket->DataArray + 1))->Flags = EXIT_REQUIRED;\r
break;\r
\r
case 0x1555:\r
// EFI_FORM_BROWSER_PROTOCOL *FormConfig;\r
//\r
EFI_HII_PACKAGES *PackageList;\r
- EFI_HII_HANDLE HiiHandle;\r
+ FRAMEWORK_EFI_HII_HANDLE HiiHandle;\r
STRING_REF TokenToUpdate;\r
STRING_REF TokenToUpdate2;\r
STRING_REF TokenToUpdate3;\r
\r
\r
\r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
\r
#include <Protocol/FrameworkFormCallback.h>\r
#include <Protocol/FrameworkHii.h>\r
EFI_FORM_CALLBACK_PROTOCOL DriverCallback;\r
UINT16 *KeyList;\r
VOID *FormBuffer;\r
- EFI_HII_HANDLE RegisteredHandle;\r
+ FRAMEWORK_EFI_HII_HANDLE RegisteredHandle;\r
EFI_HII_PROTOCOL *Hii;\r
} EFI_CALLBACK_INFO;\r
\r
\r
varstore MyIfrNVData2, key = 0x1234, name = MY_DATA2, guid = FORMSET_GUID;\r
\r
- varstore MyIfrNVData, key = 0x1324, name = MY_DATA1, guid = FORMSET_GUID;\r
+// varstore MyIfrNVData, key = 0x1324, name = MY_DATA1, guid = FORMSET_GUID;\r
\r
varstore MyIfrNVData3, key = 0x4321, name = MY_DATA3, guid = FORMSET_GUID;\r
\r
CallbackHandle = 0;\r
ExportBuffer = *ExportBufferPtr;\r
\r
- for (Index = 0; IfrData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+ for (Index = 0; IfrData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
VariableContents = (EFI_HII_VARIABLE_PACK *) ExportBuffer;\r
\r
switch (IfrData[Index]) {\r
- case EFI_IFR_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
TempValue = EFI_HII_VARIABLE;\r
CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16));\r
- CopyMem (&TempValue, &((EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));\r
\r
//\r
// If the variable has 0 size, do not process it\r
CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32));\r
CopyMem (\r
&CallbackHandle,\r
- &((EFI_IFR_FORM_SET *) &IfrData[Index])->CallbackHandle,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->CallbackHandle,\r
sizeof (EFI_PHYSICAL_ADDRESS)\r
);\r
if (CallbackHandle != 0) {\r
//\r
TempValue = 0;\r
CopyMem (&VariableContents->VariableId, &TempValue, sizeof (UINT16));\r
- CopyMem (&VariableContents->VariableGuid, &((EFI_IFR_FORM_SET *) &IfrData[Index])->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&VariableContents->VariableGuid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->Guid, sizeof (EFI_GUID));\r
TempValue = sizeof (SETUP_MAP_NAME);\r
CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32));\r
\r
CopyMem (ExportBuffer, SETUP_MAP_NAME, sizeof (SETUP_MAP_NAME));\r
ExportBuffer = ExportBuffer + sizeof (SETUP_MAP_NAME);\r
\r
- CopyMem (&TempValue, &((EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_FORM_SET *) &IfrData[Index])->NvDataSize, sizeof (UINT16));\r
\r
if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) {\r
Status = FormCallback->NvRead (\r
DataTable->NumberOfVariableData++;\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
TempValue = EFI_HII_VARIABLE;\r
CopyMem (&VariableContents->Header.Type, &TempValue, sizeof (UINT16));\r
- CopyMem (&TempValue, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));\r
\r
//\r
// If the variable has 0 size, do not process it\r
TempValue = TempValue + sizeof (EFI_HII_VARIABLE_PACK);\r
\r
CopyMem (&VariableContents->Header.Length, &TempValue, sizeof (UINT32));\r
- CopyMem (&VariableContents->VariableId, &((EFI_IFR_VARSTORE *) &IfrData[Index])->VarId, sizeof (UINT16));\r
- CopyMem (&VariableContents->VariableGuid, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Guid, sizeof (EFI_GUID));\r
- TempValue = (UINTN) ((EFI_IFR_VARSTORE *) &IfrData[Index])->Header.Length - sizeof (EFI_IFR_VARSTORE);\r
+ CopyMem (&VariableContents->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->VarId, sizeof (UINT16));\r
+ CopyMem (&VariableContents->VariableGuid, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Guid, sizeof (EFI_GUID));\r
+ TempValue = (UINTN) ((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Header.Length - sizeof (FRAMEWORK_EFI_IFR_VARSTORE);\r
TempValue = TempValue * 2;\r
CopyMem (&VariableContents->VariableNameLength, &TempValue, sizeof (UINT32));\r
\r
ExportBuffer = ExportBuffer + sizeof (EFI_HII_VARIABLE_PACK);\r
String = (CHAR16 *) ExportBuffer;\r
for (Index2 = 0; Index2 < TempValue / 2; Index2++) {\r
- ExportBuffer[Index2 * 2] = IfrData[Index + sizeof (EFI_IFR_VARSTORE) + Index2];\r
+ ExportBuffer[Index2 * 2] = IfrData[Index + sizeof (FRAMEWORK_EFI_IFR_VARSTORE) + Index2];\r
ExportBuffer[Index2 * 2 + 1] = 0;\r
}\r
\r
ExportBuffer = ExportBuffer + TempValue;\r
\r
- CopyMem (&TempValue, &((EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) &IfrData[Index])->Size, sizeof (UINT16));\r
\r
if ((FormCallback != NULL) && (FormCallback->NvRead != NULL)) {\r
Status = FormCallback->NvRead (\r
EFIAPI\r
HiiExportDatabase (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN OUT UINTN *BufferSize,\r
OUT VOID *Buffer\r
)\r
\r
RawData = (UINT8 *) FormPack;\r
\r
- for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+ for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
switch (RawData[Index]) {\r
- case EFI_IFR_FORM_SET_OP:\r
- CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) &RawData[Index])->NvDataSize, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
+ CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->NvDataSize, sizeof (UINT16));\r
SizeNeeded = SizeNeeded + VariableSize + sizeof (SETUP_MAP_NAME) + sizeof (EFI_HII_VARIABLE_PACK);\r
VariableExist = TRUE;\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
- CopyMem (&VariableSize, &((EFI_IFR_VARSTORE *) &RawData[Index])->Size, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
+ CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) &RawData[Index])->Size, sizeof (UINT16));\r
SizeNeeded = SizeNeeded + VariableSize + sizeof (EFI_HII_VARIABLE_PACK);\r
//\r
// We will be expanding the stored ASCII name to a Unicode string. This will cause some memory overhead\r
// Since the VARSTORE size already takes in consideration the ASCII size, we need to size it and add another\r
// instance of it. Essentially, 2 ASCII strings == 1 Unicode string in size.\r
//\r
- TempValue = (UINTN) ((EFI_IFR_VARSTORE *) &RawData[Index])->Header.Length - sizeof (EFI_IFR_VARSTORE);\r
+ TempValue = (UINTN) ((FRAMEWORK_EFI_IFR_VARSTORE *) &RawData[Index])->Header.Length - sizeof (FRAMEWORK_EFI_IFR_VARSTORE);\r
SizeNeeded = SizeNeeded + TempValue * 2;\r
VariableExist = TRUE;\r
break;\r
EFIAPI\r
HiiGetForms (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_FORM_ID FormId,\r
IN OUT UINTN *BufferLengthTemp,\r
OUT UINT8 *Buffer\r
Arguments:\r
This - A pointer to the EFI_HII_PROTOCOL instance.\r
\r
- Handle - Handle on which the form resides. Type EFI_HII_HANDLE is defined in\r
+ Handle - Handle on which the form resides. Type FRAMEWORK_EFI_HII_HANDLE is defined in\r
EFI_HII_PROTOCOL.NewPack() in the Packages section.\r
\r
FormId - The ID of the form to return. If the ID is zero, the entire form package is returned.\r
EFI_HII_DATA *HiiData;\r
EFI_HII_HANDLE_DATABASE *HandleDatabase;\r
EFI_HII_IFR_PACK *FormPack;\r
- EFI_IFR_FORM *Form;\r
- EFI_IFR_OP_HEADER *Location;\r
+ FRAMEWORK_EFI_IFR_FORM *Form;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *Location;\r
UINT16 *BufferLength = (UINT16 *) BufferLengthTemp;\r
UINTN FormLength;\r
\r
return EFI_SUCCESS;\r
} else {\r
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));\r
- Location = (EFI_IFR_OP_HEADER *) FormPack;\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) FormPack;\r
\r
//\r
// Look for the FormId requested\r
//\r
- for (; Location->OpCode != EFI_IFR_END_FORM_SET_OP;) {\r
+ for (; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
switch (Location->OpCode) {\r
- case EFI_IFR_FORM_OP:\r
- Form = (EFI_IFR_FORM *) Location;\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
+ Form = (FRAMEWORK_EFI_IFR_FORM *) Location;\r
\r
//\r
// If we found a Form Op-code and it is of the correct Id, copy it and return\r
//\r
// Calculate the total size of form\r
//\r
- for (FormLength = 0; Location->OpCode != EFI_IFR_END_FORM_OP; ) {\r
+ for (FormLength = 0; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_OP; ) {\r
FormLength += Location->Length;\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
}\r
FormLength += Location->Length;\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
\r
if ((Buffer == NULL) || (FormLength > *BufferLength)) {\r
*BufferLengthTemp = FormLength;\r
//\r
// Rewind to start offset of the found Form\r
//\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *)Location - FormLength);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *)Location - FormLength);\r
CopyMem (Buffer, Location, FormLength);\r
return EFI_SUCCESS;\r
}\r
//\r
// Go to the next Op-Code\r
//\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
}\r
}\r
\r
UINT8*\r
HiiGetDefaultImageInitPack (\r
IN OUT EFI_HII_VARIABLE_PACK_LIST *VariablePackItem,\r
- IN EFI_IFR_VARSTORE *VarStore\r
+ IN FRAMEWORK_EFI_IFR_VARSTORE *VarStore\r
)\r
/*++\r
\r
VOID\r
HiiGetDefaultImagePopulateMap (\r
IN OUT UINT8 *Map,\r
- IN EFI_IFR_OP_HEADER *FormSet,\r
- IN EFI_IFR_VARSTORE *VarStore,\r
+ IN FRAMEWORK_EFI_IFR_OP_HEADER *FormSet,\r
+ IN FRAMEWORK_EFI_IFR_VARSTORE *VarStore,\r
IN UINTN DefaultMask\r
)\r
/*++\r
Arguments:\r
\r
Map - Memory pointer to hold the default values.\r
- FormSet - The starting EFI_IFR_OP_HEADER to begin retriving default values.\r
+ FormSet - The starting FRAMEWORK_EFI_IFR_OP_HEADER to begin retriving default values.\r
VarStore - IFR variable storage.\r
DefaultMask - The mask used to get the default variable.\r
\r
--*/\r
{\r
EFI_STATUS Status;\r
- EFI_IFR_OP_HEADER *IfrItem;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *IfrItem;\r
UINT16 VarId;\r
- EFI_IFR_VARSTORE_SELECT *VarSelect;\r
- EFI_IFR_ONE_OF_OPTION *OneOfOpt;\r
- EFI_IFR_CHECKBOX *CheckBox;\r
- EFI_IFR_NUMERIC *Numeric;\r
+ FRAMEWORK_EFI_IFR_VARSTORE_SELECT *VarSelect;\r
+ FRAMEWORK_EFI_IFR_ONE_OF_OPTION *OneOfOpt;\r
+ FRAMEWORK_EFI_IFR_CHECKBOX *CheckBox;\r
+ FRAMEWORK_EFI_IFR_NUMERIC *Numeric;\r
UINTN Size;\r
UINTN SizeTmp;\r
- EFI_IFR_NV_DATA *IfrNvData;\r
+ FRAMEWORK_EFI_IFR_NV_DATA *IfrNvData;\r
EFI_GUID Guid;\r
CHAR16 *Name16;\r
CHAR8 *Name8;\r
//\r
// First, check if the map exists in the NV. If so, get it from NV and exit.\r
//\r
- if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r
+ if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {\r
//\r
// Check if Manufaturing Defaults exist in the NV.\r
//\r
// Ignore status. Either it gets read or not.\r
//\r
FormCallbackProt = NULL;\r
- CopyMem (&CallbackHandle, &((EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle));\r
+ CopyMem (&CallbackHandle, &((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle));\r
if (CallbackHandle != NULL) {\r
Status = gBS->HandleProtocol (\r
(EFI_HANDLE) (UINTN) CallbackHandle,\r
// Iterate all IFR statements and for applicable, retrieve the default into the Map.\r
//\r
for (IfrItem = FormSet, VarId = 0;\r
- IfrItem->OpCode != EFI_IFR_END_FORM_SET_OP;\r
- IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length)\r
+ IfrItem->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r
+ IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length)\r
) {\r
\r
//\r
// Observe VarStore switch.\r
//\r
- if (EFI_IFR_VARSTORE_SELECT_OP == IfrItem->OpCode) {\r
- VarSelect = (EFI_IFR_VARSTORE_SELECT *) IfrItem;\r
+ if (FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP == IfrItem->OpCode) {\r
+ VarSelect = (FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) IfrItem;\r
VarId = VarSelect->VarId;\r
continue;\r
}\r
//\r
// Extract the default value from this opcode if applicable, and apply it to the map.\r
//\r
- IfrNvData = (EFI_IFR_NV_DATA *) IfrItem;\r
+ IfrNvData = (FRAMEWORK_EFI_IFR_NV_DATA *) IfrItem;\r
switch (IfrItem->OpCode) {\r
\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);\r
//\r
- // Get to the first EFI_IFR_ONE_OF_OPTION_OP\r
+ // Get to the first FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP\r
//\r
- IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length);\r
- ASSERT (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode);\r
+ IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length);\r
+ ASSERT (FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode);\r
\r
- OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem;\r
+ OneOfOpt = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *)IfrItem;\r
//\r
// In the worst case, the first will be the default.\r
//\r
CopyMem (Map + IfrNvData->QuestionId, &OneOfOpt->Value, IfrNvData->StorageWidth);\r
\r
- while (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode) {\r
+ while (FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode) {\r
\r
- OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem;\r
- if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r
- if (0 != (OneOfOpt->Flags & EFI_IFR_FLAG_MANUFACTURING)) {\r
+ OneOfOpt = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *)IfrItem;\r
+ if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {\r
+ if (0 != (OneOfOpt->Flags & FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) {\r
//\r
// In the worst case, the first will be the default.\r
//\r
break;\r
}\r
} else {\r
- if (OneOfOpt->Flags & EFI_IFR_FLAG_DEFAULT) {\r
+ if (OneOfOpt->Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
//\r
// In the worst case, the first will be the default.\r
//\r
}\r
}\r
\r
- IfrItem = (EFI_IFR_OP_HEADER *)((UINT8*)IfrItem + IfrItem->Length);\r
+ IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *)((UINT8*)IfrItem + IfrItem->Length);\r
}\r
continue;\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);\r
- CheckBox = (EFI_IFR_CHECK_BOX *)IfrItem;\r
- if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r
- if (0 != (CheckBox->Flags & EFI_IFR_FLAG_MANUFACTURING)) {\r
+ CheckBox = (FRAMEWORK_EFI_IFR_CHECK_BOX *)IfrItem;\r
+ if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {\r
+ if (0 != (CheckBox->Flags & FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) {\r
*(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;\r
}\r
} else {\r
- if (CheckBox->Flags & EFI_IFR_FLAG_DEFAULT) {\r
+ if (CheckBox->Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
*(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;\r
}\r
}\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);\r
- Numeric = (EFI_IFR_NUMERIC *) IfrItem;\r
+ Numeric = (FRAMEWORK_EFI_IFR_NUMERIC *) IfrItem;\r
CopyMem (Map + IfrNvData->QuestionId, &Numeric->Default, IfrNvData->StorageWidth);\r
break;\r
\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_PASSWORD_OP:\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
//\r
// No support for default value for these opcodes.\r
//\r
EFIAPI\r
HiiGetDefaultImage (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN UINTN DefaultMask,\r
OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList\r
)\r
{\r
EFI_HII_HANDLE_DATABASE *HandleDatabase;\r
EFI_HII_PACKAGE_INSTANCE *PackageInstance;\r
- EFI_IFR_OP_HEADER *FormSet;\r
- EFI_IFR_OP_HEADER *IfrItem;\r
- EFI_IFR_VARSTORE *VarStore;\r
- EFI_IFR_VARSTORE *VarStoreDefault;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *FormSet;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *IfrItem;\r
+ FRAMEWORK_EFI_IFR_VARSTORE *VarStore;\r
+ FRAMEWORK_EFI_IFR_VARSTORE *VarStoreDefault;\r
UINTN SetupMapNameSize;\r
UINTN SizeOfMaps;\r
EFI_HII_VARIABLE_PACK_LIST *PackList;\r
if (PackageInstance == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- FormSet = (EFI_IFR_OP_HEADER *) ((UINT8 *) &PackageInstance->IfrData + sizeof (EFI_HII_IFR_PACK));\r
+ FormSet = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) &PackageInstance->IfrData + sizeof (EFI_HII_IFR_PACK));\r
\r
//\r
// Get the sizes of all the VARSTOREs in this VFR.\r
//\r
SizeOfMaps = 0;\r
IfrItem = FormSet;\r
- while (EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {\r
+ while (FRAMEWORK_EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {\r
\r
- if (EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {\r
- VarStore = (EFI_IFR_VARSTORE *) IfrItem;\r
+ if (FRAMEWORK_EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {\r
+ VarStore = (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem;\r
//\r
// Size of the map\r
//\r
SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST);\r
}\r
\r
- IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
+ IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
}\r
\r
//\r
SetupMapNameSize = StrLen (SETUP_MAP_NAME) + 1;\r
VarStoreDefault = AllocateZeroPool (sizeof (*VarStoreDefault) + SetupMapNameSize);\r
\r
- if (0 != ((EFI_IFR_FORM_SET*)FormSet)->NvDataSize) {\r
+ if (0 != ((FRAMEWORK_EFI_IFR_FORM_SET*)FormSet)->NvDataSize) {\r
\r
- VarStoreDefault->Header.OpCode = EFI_IFR_VARSTORE_OP;\r
+ VarStoreDefault->Header.OpCode = FRAMEWORK_EFI_IFR_VARSTORE_OP;\r
VarStoreDefault->Header.Length = (UINT8) (sizeof (*VarStoreDefault) + SetupMapNameSize);\r
Unicode2Ascii ((CHAR8 *) (VarStoreDefault + 1), SETUP_MAP_NAME);\r
- CopyMem (&VarStoreDefault->Guid, &((EFI_IFR_FORM_SET*) FormSet)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&VarStoreDefault->Guid, &((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->Guid, sizeof (EFI_GUID));\r
VarStoreDefault->VarId = 0;\r
- VarStoreDefault->Size = ((EFI_IFR_FORM_SET*) FormSet)->NvDataSize;\r
+ VarStoreDefault->Size = ((FRAMEWORK_EFI_IFR_FORM_SET*) FormSet)->NvDataSize;\r
\r
//\r
// Size of the map\r
// Handle the explicit varstore(s)\r
//\r
IfrItem = FormSet;\r
- while (EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {\r
+ while (FRAMEWORK_EFI_IFR_END_FORM_SET_OP != IfrItem->OpCode) {\r
\r
- if (EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {\r
+ if (FRAMEWORK_EFI_IFR_VARSTORE_OP == IfrItem->OpCode) {\r
\r
- Map = HiiGetDefaultImageInitPack (PackListNext, (EFI_IFR_VARSTORE *) IfrItem);\r
+ Map = HiiGetDefaultImageInitPack (PackListNext, (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem);\r
\r
- HiiGetDefaultImagePopulateMap (Map, FormSet, (EFI_IFR_VARSTORE *) IfrItem, DefaultMask);\r
+ HiiGetDefaultImagePopulateMap (Map, FormSet, (FRAMEWORK_EFI_IFR_VARSTORE *) IfrItem, DefaultMask);\r
\r
PackListNext->NextVariablePack = (EFI_HII_VARIABLE_PACK_LIST *) ((UINT8 *) PackListNext->VariablePack + PackListNext->VariablePack->Header.Length);\r
PackListLast = PackListNext;\r
PackListNext = PackListNext->NextVariablePack;\r
}\r
\r
- IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
+ IfrItem = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
}\r
\r
PackListLast->NextVariablePack = NULL;\r
EFIAPI\r
HiiUpdateForm (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_FORM_LABEL Label,\r
IN BOOLEAN AddData,\r
IN EFI_HII_UPDATE_DATA *Data\r
EFI_HII_DATA *HiiData;\r
EFI_HII_HANDLE_DATABASE *HandleDatabase;\r
EFI_HII_IFR_PACK *FormPack;\r
- EFI_IFR_OP_HEADER *Location;\r
- EFI_IFR_OP_HEADER *DataLocation;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *Location;\r
+ FRAMEWORK_EFI_IFR_OP_HEADER *DataLocation;\r
UINT8 *OtherBuffer;\r
UINT8 *TempBuffer;\r
UINT8 *OrigTempBuffer;\r
//\r
// Calculate and allocate space for retrieval of IFR data\r
//\r
- DataLocation = (EFI_IFR_OP_HEADER *) &Data->Data;\r
+ DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) &Data->Data;\r
TempBufferSize = (CHAR8 *) (&PackageInstance->IfrData) - (CHAR8 *) (PackageInstance);\r
\r
for (Index = 0; Index < Data->DataCount; Index++) {\r
TempBufferSize += DataLocation->Length;\r
- DataLocation = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);\r
+ DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);\r
}\r
\r
TempBufferSize += PackageInstance->IfrSize + PackageInstance->StringSize;\r
// what the location is of the beginning of the string data.\r
//\r
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&PackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));\r
- Location = (EFI_IFR_OP_HEADER *) FormPack;\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) FormPack;\r
\r
//\r
// Look for the FormId requested\r
//\r
- for (; Location->OpCode != EFI_IFR_END_FORM_SET_OP;) {\r
+ for (; Location->OpCode != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
switch (Location->OpCode) {\r
- case EFI_IFR_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
//\r
// If the FormSet has an update pending, pay attention.\r
//\r
if (Data->FormSetUpdate) {\r
- ((EFI_IFR_FORM_SET *) Location)->CallbackHandle = Data->FormCallbackHandle;\r
+ ((FRAMEWORK_EFI_IFR_FORM_SET *) Location)->CallbackHandle = Data->FormCallbackHandle;\r
}\r
\r
CopyMem (TempBuffer, Location, Location->Length);\r
TempBuffer = TempBuffer + Location->Length;\r
break;\r
\r
- case EFI_IFR_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
//\r
// If the Form has an update pending, pay attention.\r
//\r
if (Data->FormUpdate) {\r
- ((EFI_IFR_FORM *) Location)->FormTitle = Data->FormTitle;\r
+ ((FRAMEWORK_EFI_IFR_FORM *) Location)->FormTitle = Data->FormTitle;\r
}\r
\r
CopyMem (TempBuffer, Location, Location->Length);\r
TempBuffer = TempBuffer + Location->Length;\r
break;\r
\r
- case EFI_IFR_LABEL_OP:\r
+ case FRAMEWORK_EFI_IFR_LABEL_OP:\r
//\r
// If the label does not match the requested update point, ignore it\r
//\r
- if (((EFI_IFR_LABEL *) Location)->LabelId != Label) {\r
+ if (((FRAMEWORK_EFI_IFR_LABEL *) Location)->LabelId != Label) {\r
//\r
// Copy the label\r
//\r
//\r
// Go to the next Op-Code\r
//\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
continue;\r
}\r
\r
//\r
// Add the DataCount amount of opcodes to TempBuffer\r
//\r
- DataLocation = (EFI_IFR_OP_HEADER *) &Data->Data;\r
+ DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) &Data->Data;\r
for (Index = 0; Index < Data->DataCount; Index++) {\r
CopyMem (TempBuffer, DataLocation, DataLocation->Length);\r
((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize += DataLocation->Length;\r
OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN));\r
CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2);\r
TempBuffer = TempBuffer + DataLocation->Length;\r
- DataLocation = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);\r
+ DataLocation = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (DataLocation) + DataLocation->Length);\r
}\r
//\r
// Go to the next Op-Code\r
//\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
continue;\r
} else {\r
//\r
//\r
CopyMem (TempBuffer, Location, Location->Length);\r
TempBuffer = TempBuffer + Location->Length;\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
\r
//\r
// Remove the DataCount amount of opcodes unless we run into an end of form or a label\r
//\r
// If we are about to skip an end form - bail out, since that is illegal\r
//\r
- if ((Location->OpCode == EFI_IFR_END_FORM_OP) || (Location->OpCode == EFI_IFR_LABEL_OP)) {\r
+ if ((Location->OpCode == FRAMEWORK_EFI_IFR_END_FORM_OP) || (Location->OpCode == FRAMEWORK_EFI_IFR_LABEL_OP)) {\r
break;\r
}\r
//\r
((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize -= Location->Length;\r
OtherBuffer = ((UINT8 *) &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->StringSize + sizeof (UINTN));\r
CopyMem (OtherBuffer, &((EFI_HII_PACKAGE_INSTANCE *) OrigTempBuffer)->IfrSize, 2);\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
}\r
}\r
\r
//\r
// Go to the next Op-Code\r
//\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
}\r
//\r
// Copy the last op-code left behind from the for loop\r
// Advance to beginning of strings and copy them\r
//\r
TempBuffer = TempBuffer + Location->Length;\r
- Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
+ Location = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);\r
CopyMem (TempBuffer, Location, PackageInstance->StringSize);\r
\r
//\r
HiiFindHandles (\r
IN EFI_HII_PROTOCOL *This,\r
IN OUT UINT16 *HandleBufferLength,\r
- OUT EFI_HII_HANDLE Handle[1]\r
+ OUT FRAMEWORK_EFI_HII_HANDLE Handle[1]\r
)\r
/*++\r
\r
//\r
// Is there a sufficient buffer for the data being passed back?\r
//\r
- if (*HandleBufferLength >= (sizeof (EFI_HII_HANDLE) * HandleCount)) {\r
+ if (*HandleBufferLength >= (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount)) {\r
Database = HiiData->DatabaseHead;\r
\r
//\r
// Copy the Head information\r
//\r
if (Database->Handle != 0) {\r
- CopyMem (&Handle[0], &Database->Handle, sizeof (EFI_HII_HANDLE));\r
+ CopyMem (&Handle[0], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));\r
Database = Database->NextHandleDatabase;\r
}\r
//\r
// Copy more data if appropriate\r
//\r
for (HandleCount = 1; Database != NULL; HandleCount++) {\r
- CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (EFI_HII_HANDLE));\r
+ CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));\r
Database = Database->NextHandleDatabase;\r
}\r
\r
- *HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount);\r
+ *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);\r
return EFI_SUCCESS;\r
} else {\r
//\r
// Insufficient buffer length\r
//\r
- *HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount);\r
+ *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);\r
return EFI_BUFFER_TOO_SMALL;\r
}\r
}\r
EFIAPI\r
HiiGetPrimaryLanguages (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
OUT EFI_STRING *LanguageString\r
)\r
/*++\r
EFIAPI\r
HiiGetSecondaryLanguages (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN CHAR16 *PrimaryLanguage,\r
OUT EFI_STRING *LanguageString\r
)\r
return EFI_SUCCESS;\r
}\r
\r
+\r
#define _HIIDATABASE_H\r
\r
\r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
\r
#include <Guid/GlobalVariable.h>\r
#include <Protocol/FrameworkFormCallback.h>\r
\r
typedef struct _EFI_HII_HANDLE_DATABASE {\r
VOID *Buffer; // Actual buffer pointer\r
- EFI_HII_HANDLE Handle; // Monotonically increasing value to signify the value returned to caller\r
+ FRAMEWORK_EFI_HII_HANDLE Handle; // Monotonically increasing value to signify the value returned to caller\r
UINT32 NumberOfTokens; // The initial number of tokens when first registered\r
struct _EFI_HII_HANDLE_DATABASE *NextHandleDatabase;\r
} EFI_HII_HANDLE_DATABASE;\r
typedef struct {\r
EFI_NARROW_GLYPH NarrowGlyphs[MAX_GLYPH_COUNT];\r
EFI_WIDE_GLYPH WideGlyphs[MAX_GLYPH_COUNT];\r
- EFI_KEY_DESCRIPTOR SystemKeyboardLayout[106];\r
- EFI_KEY_DESCRIPTOR OverrideKeyboardLayout[106];\r
+ FRAMEWORK_EFI_KEY_DESCRIPTOR SystemKeyboardLayout[106];\r
+ FRAMEWORK_EFI_KEY_DESCRIPTOR OverrideKeyboardLayout[106];\r
BOOLEAN SystemKeyboardUpdate; // Has the SystemKeyboard been updated?\r
} EFI_HII_GLOBAL_DATA;\r
\r
} EFI_HII_DATA;\r
\r
typedef struct {\r
- EFI_HII_HANDLE Handle;\r
+ FRAMEWORK_EFI_HII_HANDLE Handle;\r
EFI_GUID Guid;\r
EFI_HII_HANDLE_PACK HandlePack;\r
UINTN IfrSize;\r
\r
typedef struct {\r
EFI_HII_PACK_HEADER Header;\r
- EFI_IFR_FORM_SET FormSet;\r
- EFI_IFR_END_FORM_SET EndFormSet;\r
+ FRAMEWORK_EFI_IFR_FORM_SET FormSet;\r
+ FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;\r
} EFI_FORM_SET_STUB;\r
\r
#define EFI_HII_DATA_FROM_THIS(a) CR (a, EFI_HII_DATA, Hii, EFI_HII_DATA_SIGNATURE)\r
HiiNewPack (\r
IN EFI_HII_PROTOCOL *This,\r
IN EFI_HII_PACKAGES *PackageList,\r
- OUT EFI_HII_HANDLE *Handle\r
+ OUT FRAMEWORK_EFI_HII_HANDLE *Handle\r
)\r
;\r
\r
EFIAPI\r
HiiRemovePack (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
;\r
\r
HiiFindHandles (\r
IN EFI_HII_PROTOCOL *This,\r
IN OUT UINT16 *HandleBufferLength,\r
- OUT EFI_HII_HANDLE *Handle\r
+ OUT FRAMEWORK_EFI_HII_HANDLE *Handle\r
)\r
;\r
\r
EFIAPI\r
HiiExportDatabase (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN OUT UINTN *BufferSize,\r
OUT VOID *Buffer\r
)\r
HiiNewString (\r
IN EFI_HII_PROTOCOL *This,\r
IN CHAR16 *Language,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN OUT STRING_REF *Reference,\r
IN CHAR16 *NewString\r
)\r
EFIAPI\r
HiiGetString (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN STRING_REF Token,\r
IN BOOLEAN Raw,\r
IN CHAR16 *LanguageString,\r
EFIAPI\r
HiiResetStrings (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
;\r
\r
EFIAPI\r
HiiGetPrimaryLanguages (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
OUT EFI_STRING *LanguageString\r
)\r
;\r
EFIAPI\r
HiiGetSecondaryLanguages (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN CHAR16 *PrimaryLanguage,\r
OUT EFI_STRING *LanguageString\r
)\r
EFIAPI\r
HiiGetLine (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN STRING_REF Token,\r
IN OUT UINT16 *Index,\r
IN UINT16 LineWidth,\r
EFIAPI\r
HiiGetForms (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_FORM_ID FormId,\r
IN OUT UINTN *BufferLength,\r
OUT UINT8 *Buffer\r
EFIAPI\r
HiiGetDefaultImage (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN UINTN DefaultMask,\r
OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList\r
)\r
EFIAPI\r
HiiUpdateForm (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_FORM_LABEL Label,\r
IN BOOLEAN AddData,\r
IN EFI_HII_UPDATE_DATA *Data\r
HiiGetKeyboardLayout (\r
IN EFI_HII_PROTOCOL *This,\r
OUT UINT16 *DescriptorCount,\r
- OUT EFI_KEY_DESCRIPTOR *Descriptor\r
+ OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor\r
)\r
;\r
\r
HiiGetKeyboardLayout (\r
IN EFI_HII_PROTOCOL *This,\r
OUT UINT16 *DescriptorCount,\r
- OUT EFI_KEY_DESCRIPTOR *Descriptor\r
+ OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor\r
)\r
/*++\r
\r
\r
RawData = (UINT8 *) FormPack;\r
\r
- for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
- if (RawData[Index] == EFI_IFR_FORM_SET_OP) {\r
+ for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+ if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
//\r
// Cache the guid for this formset\r
//\r
- CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
break;\r
}\r
\r
FormPack = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&HandlePackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));\r
RawData = (UINT8 *) FormPack;\r
\r
- for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
- if (RawData[Index] == EFI_IFR_FORM_SET_OP) {\r
+ for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+ if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
//\r
// Cache the guid for this formset\r
//\r
- CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
break;\r
}\r
\r
HiiNewPack (\r
IN EFI_HII_PROTOCOL *This,\r
IN EFI_HII_PACKAGES *Packages,\r
- OUT EFI_HII_HANDLE *Handle\r
+ OUT FRAMEWORK_EFI_HII_HANDLE *Handle\r
)\r
/*++\r
\r
//\r
// Advance to the Form Set Op-code\r
//\r
- for (Count = 0; ((EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != EFI_IFR_FORM_SET_OP;) {\r
- Count = Count + ((EFI_IFR_OP_HEADER *) &Location[Count])->Length;\r
+ for (Count = 0; ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != FRAMEWORK_EFI_IFR_FORM_SET_OP;) {\r
+ Count = Count + ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->Length;\r
}\r
//\r
// Copy to local variable\r
//\r
- CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID));\r
\r
//\r
// Check to see if IfrPack->Guid != GuidId\r
FormSetStub.Header.Type = EFI_HII_IFR;\r
FormSetStub.Header.Length = sizeof (EFI_FORM_SET_STUB);\r
\r
- FormSetStub.FormSet.Header.OpCode = EFI_IFR_FORM_SET_OP;\r
- FormSetStub.FormSet.Header.Length = (UINT8) sizeof (EFI_IFR_FORM_SET);\r
+ FormSetStub.FormSet.Header.OpCode = FRAMEWORK_EFI_IFR_FORM_SET_OP;\r
+ FormSetStub.FormSet.Header.Length = (UINT8) sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r
//\r
// Dummy string\r
//\r
FormSetStub.FormSet.FormSetTitle = 0x02;\r
CopyMem (&FormSetStub.FormSet.Guid, Packages->GuidId, sizeof (EFI_GUID));\r
\r
- FormSetStub.EndFormSet.Header.OpCode = EFI_IFR_END_FORM_SET_OP;\r
- FormSetStub.EndFormSet.Header.Length = (UINT8) sizeof (EFI_IFR_END_FORM_SET);\r
+ FormSetStub.EndFormSet.Header.OpCode = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r
+ FormSetStub.EndFormSet.Header.Length = (UINT8) sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r
IfrPack = (EFI_HII_IFR_PACK *) &FormSetStub;\r
}\r
\r
// we go down one level deeper, increment the handle value that will be passed back.\r
//\r
if (Database->Handle >= *Handle) {\r
- *Handle = (EFI_HII_HANDLE) (Database->Handle + 1);\r
+ *Handle = (FRAMEWORK_EFI_HII_HANDLE ) (Database->Handle + 1);\r
}\r
}\r
\r
// If someone updates the Descriptors with a count of 0, blow aware the overrides.\r
//\r
if (KeyboardPack->DescriptorCount == 0) {\r
- ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+ ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
}\r
\r
if (KeyboardPack->DescriptorCount < 106 && KeyboardPack->DescriptorCount > 0) {\r
// If SystemKeyboard was updated already, then steer changes to the override database\r
//\r
if (GlobalData->SystemKeyboardUpdate) {\r
- ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+ ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {\r
CopyMem (&Member, &KeyboardPack->Descriptor[Count].Key, sizeof (UINT16));\r
CopyMem (\r
&GlobalData->OverrideKeyboardLayout[Member],\r
&KeyboardPack->Descriptor[Count],\r
- sizeof (EFI_KEY_DESCRIPTOR)\r
+ sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)\r
);\r
}\r
} else {\r
//\r
// SystemKeyboard was never updated, so this is likely the keyboard driver setting the System database.\r
//\r
- ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+ ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {\r
CopyMem (&Member, &KeyboardPack->Descriptor->Key, sizeof (UINT16));\r
CopyMem (\r
&GlobalData->SystemKeyboardLayout[Member],\r
&KeyboardPack->Descriptor[Count],\r
- sizeof (EFI_KEY_DESCRIPTOR)\r
+ sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)\r
);\r
}\r
//\r
EFIAPI\r
HiiRemovePack (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
/*++\r
\r
HiiNewString2 (\r
IN EFI_HII_PROTOCOL *This,\r
IN CHAR16 *Language,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN OUT STRING_REF *Reference,\r
IN CHAR16 *NewString,\r
IN BOOLEAN ResetStrings\r
HiiNewString (\r
IN EFI_HII_PROTOCOL *This,\r
IN CHAR16 *Language,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN OUT STRING_REF *Reference,\r
IN CHAR16 *NewString\r
)\r
EFIAPI\r
HiiResetStrings (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
/*++\r
\r
EFIAPI\r
HiiGetString (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN STRING_REF Token,\r
IN BOOLEAN Raw,\r
IN CHAR16 *LanguageString,\r
EFIAPI\r
HiiGetLine (\r
IN EFI_HII_PROTOCOL *This,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN STRING_REF Token,\r
IN OUT UINT16 *Index,\r
IN UINT16 LineWidth,\r
// We need to rewind to the beginning of the Inconsistent expression\r
//\r
for (;\r
- (InconsistentTags->Operand != EFI_IFR_INCONSISTENT_IF_OP) &&\r
- (InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP) &&\r
- (InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP);\r
+ (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP) &&\r
+ (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP) &&\r
+ (InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP);\r
) {\r
InconsistentTags = InconsistentTags->Previous;\r
}\r
// consistency check like grayout/suppress\r
//\r
for (;\r
- InconsistentTags->Operand != EFI_IFR_END_IF_OP &&\r
- InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP &&\r
- InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP;\r
+ InconsistentTags->Operand != FRAMEWORK_EFI_IFR_END_IF_OP &&\r
+ InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP &&\r
+ InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP;\r
) {\r
GrowBooleanExpression (InconsistentTags, BooleanExpression, BooleanExpressionLength);\r
InconsistentTags = InconsistentTags->Next;\r
// while Operand means ideqval, TRUE, or other what can be evaluated to True or False,\r
// and Opcode means AND or OR.\r
//\r
- if (Iterator->Operand == EFI_IFR_NOT_OP ||\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP ||\r
Iterator->Operand == 0) {\r
return 0x1;\r
- } else if (Iterator->Operand == EFI_IFR_EQ_VAR_VAL_OP ||\r
- Iterator->Operand == EFI_IFR_EQ_ID_VAL_OP ||\r
- Iterator->Operand == EFI_IFR_EQ_ID_ID_OP ||\r
- Iterator->Operand == EFI_IFR_EQ_ID_LIST_OP) {\r
+ } else if (Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||\r
+ Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||\r
+ Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||\r
+ Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP) {\r
Iterator++;\r
- if (Iterator->Operand == EFI_IFR_AND_OP ||\r
- Iterator->Operand == EFI_IFR_OR_OP) {\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP ||\r
+ Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {\r
Iterator--;\r
return 0x1;\r
}\r
}\r
\r
switch ((*PIterator)->Operand) {\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
UnicodeValueToString (\r
VariableName,\r
FALSE,\r
//\r
MapValue2 = (*PIterator)->Value;\r
(*PIterator)++;\r
- if ((*PIterator)->Operand == EFI_IFR_GT_OP) {\r
+ if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {\r
PushValue = (BOOLEAN) (MapValue > MapValue2);\r
- } else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {\r
+ } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {\r
PushValue = (BOOLEAN) (MapValue >= MapValue2);\r
} else {\r
(*PIterator)--;\r
\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
//\r
// Do operation after knowing the compare operator.\r
//\r
MapValue2 = (*PIterator)->Value;\r
(*PIterator)++;\r
- if ((*PIterator)->Operand == EFI_IFR_GT_OP) {\r
+ if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {\r
PushValue = (BOOLEAN) (MapValue > MapValue2);\r
- } else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {\r
+ } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {\r
PushValue = (BOOLEAN) (MapValue >= MapValue2);\r
} else {\r
(*PIterator)--;\r
PushBool (StackPtr, PushValue);\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
//\r
// Do operation after knowing the compare operator.\r
//\r
(*PIterator)++;\r
- if ((*PIterator)->Operand == EFI_IFR_GT_OP) {\r
+ if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {\r
PushValue = (BOOLEAN) (MapValue > MapValue2);\r
- } else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {\r
+ } else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {\r
PushValue = (BOOLEAN) (MapValue >= MapValue2);\r
} else {\r
(*PIterator)--;\r
PushBool (StackPtr, PushValue);\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
for (Index = 0; Index < (*PIterator)->ListLength; Index++) {\r
Operator = (BOOLEAN) (MapValue == (*PIterator)->ValueList[Index]);\r
if (Operator) {\r
PushBool (StackPtr, Operator);\r
break;\r
\r
- case EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
PushBool (StackPtr, TRUE);\r
break;\r
\r
- case EFI_IFR_FALSE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
PushBool (StackPtr, FALSE);\r
break;\r
\r
- case EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
Operator = PopBool (StackPtr);\r
Operator2 = PopBool (StackPtr);\r
PushBool (StackPtr, (BOOLEAN) (Operator && Operator2));\r
break;\r
- case EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
Operator = PopBool (StackPtr);\r
Operator2 = PopBool (StackPtr);\r
PushBool (StackPtr, (BOOLEAN) (Operator || Operator2));\r
break;\r
- case EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
Operator = PopBool (StackPtr);\r
PushBool (StackPtr, (BOOLEAN) (!Operator));\r
break;\r
\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:\r
default:\r
//\r
// Return to the previous tag if runs out of boolean expression.\r
}\r
\r
switch (Iterator->Operand) {\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
//\r
// Must have hit a suppress followed by a grayout or vice-versa\r
//\r
*PopUp = Iterator->Popup;\r
break;\r
\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
//\r
// Must have hit a suppress followed by a grayout or vice-versa\r
//\r
*PopUp = Iterator->Popup;\r
break;\r
\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:\r
CosmeticConsistency = FALSE;\r
*PopUp = Iterator->Popup;\r
break;\r
// In the case of external variable values, we must read the variable which is\r
// named by the human readable version of the OpCode->VariableId and the guid of the formset\r
//\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
PushBool (&StackPtr, (BOOLEAN) (MapValue == Iterator->Value));\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
PushBool (&StackPtr, (BOOLEAN) (MapValue == MapValue2));\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
PushBool (&StackPtr, Operator);\r
break;\r
\r
- case EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
Iterator++;\r
- if (Iterator->Operand == EFI_IFR_NOT_OP) {\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {\r
NotOperator = TRUE;\r
Iterator++;\r
}\r
}\r
\r
switch (Iterator->Operand) {\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
//\r
// If Not - flip the results\r
//\r
// In the case of external variable values, we must read the variable which is\r
// named by the human readable version of the OpCode->VariableId and the guid of the formset\r
//\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
UnicodeValueToString (\r
VariableName,\r
FALSE,\r
}\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
//\r
// If Not - flip the results\r
//\r
PushBool (&StackPtr, Operator);\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
for (Index = 0; Index < Iterator->ListLength; Index++) {\r
//\r
// If Not - flip the results\r
PushBool (&StackPtr, (BOOLEAN) (Operator && Operator2));\r
break;\r
\r
- case EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
Iterator++;\r
- if (Iterator->Operand == EFI_IFR_NOT_OP) {\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {\r
NotOperator = TRUE;\r
Iterator++;\r
}\r
}\r
\r
switch (Iterator->Operand) {\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
//\r
// If Not - flip the results\r
//\r
// In the case of external variable values, we must read the variable which is\r
// named by the human readable version of the OpCode->VariableId and the guid of the formset\r
//\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
UnicodeValueToString (\r
VariableName,\r
FALSE,\r
}\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
//\r
// If Not - flip the results\r
//\r
PushBool (&StackPtr, Operator);\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
for (Index = 0; Index < Iterator->ListLength; Index++) {\r
//\r
// If Not - flip the results\r
PushBool (&StackPtr, (BOOLEAN) (Operator || Operator2));\r
break;\r
\r
- case EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
//\r
Iterator++;\r
\r
- if (Iterator->Operand == EFI_IFR_OR_OP) {\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {\r
OrOperator = TRUE;\r
Iterator++;\r
}\r
\r
- if (Iterator->Operand == EFI_IFR_AND_OP) {\r
+ if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP) {\r
AndOperator = TRUE;\r
Iterator++;\r
}\r
}\r
\r
switch (Iterator->Operand) {\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
Operator = (BOOLEAN)!(MapValue == Iterator->Value);\r
PushBool (&StackPtr, Operator);\r
break;\r
// In the case of external variable values, we must read the variable which is\r
// named by the human readable version of the OpCode->VariableId and the guid of the formset\r
//\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
UnicodeValueToString (\r
VariableName,\r
FALSE,\r
}\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
Operator = (BOOLEAN)!(MapValue == MapValue2);\r
PushBool (&StackPtr, Operator);\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
for (Index = 0; Index < Iterator->ListLength; Index++) {\r
Operator = (BOOLEAN)!(MapValue == Iterator->ValueList[Index]);\r
if (Operator) {\r
}\r
break;\r
\r
- case EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
}\r
break;\r
\r
- case EFI_IFR_FALSE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
//\r
// To check whether Ifr is legacy. Once every boolean expression.\r
//\r
}\r
break;\r
\r
- case EFI_IFR_END_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_END_IF_OP:\r
Operator = PopBool (&StackPtr);\r
//\r
// If there is an error, return, otherwise keep looking - there might\r
IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN PromptForPassword,\r
IN EFI_TAG *Tag,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
IN BOOLEAN SecondEntry,\r
IN EFI_FILE_FORM_TAGS *FileFormTags,\r
OUT CHAR16 *StringPtr\r
EFI_VARIABLE_DEFINITION *VariableDefinition;\r
UINTN DimensionsWidth;\r
UINTN DimensionsHeight;\r
- EFI_IFR_DATA_ENTRY *DataEntry;\r
+ FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;\r
UINTN WidthOfString;\r
\r
DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;\r
ASSERT (TempString);\r
ASSERT (TempString2);\r
\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
//\r
// Password requires a callback to determine if a password exists\r
//\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
- DataEntry->OpCode = EFI_IFR_PASSWORD_OP;\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
DataEntry->Length = 3;\r
\r
ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition);\r
break;\r
\r
case CHAR_CARRIAGE_RETURN:\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
//\r
// User just typed a string in\r
//\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
- DataEntry->OpCode = EFI_IFR_PASSWORD_OP;\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
\r
//\r
// If the user just typed in a password, Data = 1\r
);\r
}\r
\r
- DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);\r
+ DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
DataEntry->Data = (VOID *) TempString;\r
} else {\r
DataEntry->Length = 3;\r
);\r
}\r
\r
- DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);\r
+ DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
DataEntry->Data = (VOID *) TempString2;\r
}\r
\r
if (ManualInput) {\r
PrintAt (Column, Row, (CHAR16 *) L"[ ]");\r
Column++;\r
- if (Tag->Operand != EFI_IFR_TIME_OP) {\r
+ if (Tag->Operand != FRAMEWORK_EFI_IFR_TIME_OP) {\r
*Value = BackupValue;\r
}\r
}\r
switch (Key.UnicodeChar) {\r
case '+':\r
case '-':\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
Key.UnicodeChar = CHAR_NULL;\r
if (Key.UnicodeChar == '+') {\r
Key.ScanCode = SCAN_RIGHT;\r
switch (Key.ScanCode) {\r
case SCAN_LEFT:\r
case SCAN_RIGHT:\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
//\r
// By setting this value, we will return back to the caller.\r
// We need to do this since an auto-refresh will destroy the adjustment\r
Number = (UINT16) GetStringWidth (FormattedNumber);\r
\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) {\r
PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" ");\r
}\r
// if two questions are bound by consistency checks and each only has two possible choices, there\r
// would be no way for a user to switch the values. Thus we require late checking.\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
CopyMem (&Tag->OldValue, &BackupValue, Tag->StorageWidth);\r
} else {\r
//\r
ShowDownArrow = FALSE;\r
ShowUpArrow = FALSE;\r
\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth);\r
ASSERT (ValueArrayBackup != NULL);\r
CopyMem (ValueArrayBackup, ValueArray, ValueCount);\r
//\r
// Get the number of one of options present and its size\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
!MenuOption->Tags[Index].Suppress) {\r
if (!FirstOptionFoundFlag) {\r
FirstOptionFoundFlag = TRUE;\r
//\r
if (Initialized) {\r
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_OP;\r
ValueBackup++\r
) {\r
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
break;\r
}\r
\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
ValueBackup++\r
) {\r
//\r
//\r
Index2 = Top + 1;\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
+ (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
Index++\r
) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
Token = MenuOption->Tags[Index].Text;\r
if (Initialized) {\r
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
ValueBackup++\r
) {\r
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
}\r
\r
if (!KeyInitialized) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_ONE_OF_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ONE_OF_OP) {\r
*KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key;\r
} else {\r
*KeyValue = MenuOption->ThisTag->Key;\r
// If an ordered list op-code, we will allow for a popup of +/- keys\r
// to create an ordered list of items\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
if (Key.UnicodeChar == '+') {\r
if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) {\r
//\r
}\r
\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Index++\r
) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
continue;\r
}\r
\r
//\r
// Is this prior tag a valid choice? If not, bail out\r
//\r
- if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
//\r
// Copy the destination tag to the local variable\r
//\r
}\r
\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Index++\r
) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
if (Initialized) {\r
for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++)\r
;\r
//\r
// Keep going until meets meaningful tag.\r
//\r
- while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+ while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
||\r
- (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
TempIndex--;\r
}\r
//\r
// Keep going until meets meaningful tag.\r
//\r
- while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+ while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
||\r
- (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
TempIndex++;\r
}\r
//\r
// Only if the previous op-code is an option can we select it, otherwise we are at the left-most option\r
//\r
- if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
TempValue = MenuOption->Tags[TempIndex].Value;\r
*KeyValue = MenuOption->Tags[TempIndex].Key;\r
} else {\r
//\r
// return the current selection\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
CopyMem (ValueArray, ValueArrayBackup, ValueCount);\r
FreePool (ValueArrayBackup);\r
} else {\r
UINTN Index;\r
UINTN Count;\r
UINT16 MenuItemCount;\r
- EFI_HII_HANDLE Handle;\r
+ FRAMEWORK_EFI_HII_HANDLE Handle;\r
UINT16 FormId;\r
STRING_REF String;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
//\r
FreePool (StringPtr);\r
\r
- for (Index = 0; FormTags.Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) {\r
+ for (Index = 0; FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {\r
GrayOut = FALSE;\r
Suppress = FALSE;\r
SuppressIf = FALSE;\r
Conditional = FALSE;\r
FileFormTags = FileFormTagsHead;\r
\r
- if (FormTags.Tags[Index].Operand == EFI_IFR_FORM_OP) {\r
+ if (FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FORM_OP) {\r
FormId = FormTags.Tags[Index].Id;\r
}\r
//\r
\r
do {\r
switch (FormTags.Tags[Index].Operand) {\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
SuppressIf = TRUE;\r
\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
\r
Conditional = TRUE;\r
\r
// through the AND/OR/NOT data to come up with some meaningful ID data.\r
//\r
for (;\r
- FormTags.Tags[Index].Operand == EFI_IFR_AND_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_OR_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_GT_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_GE_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP;\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP;\r
Index++\r
)\r
;\r
// Advance to the end of the expression (Will land us at a grayoutif/suppressif or the op-code being affected)\r
//\r
for (;\r
- FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_VAL_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_EQ_VAR_VAL_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_ID_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_LIST_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_AND_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_OR_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_TRUE_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_FALSE_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_GT_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_GE_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_LABEL_OP;\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TRUE_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FALSE_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_LABEL_OP;\r
Index++\r
)\r
;\r
} else {\r
FormTags.Tags[Index].GrayOut = FALSE;\r
}\r
- if (Suppress && FormTags.Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (Suppress && FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
//\r
// Only need .Suppress field when the tag is a one_of_option. For other cases, omit them directly.\r
//\r
\r
if ((\r
FormTags.Tags[Index].NumberOfLines > 0 ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_DATE_OP ||\r
- FormTags.Tags[Index].Operand == EFI_IFR_TIME_OP\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) &&\r
!Suppress\r
) {\r
// Keep processing menu entries based on the resultant suppress/grayout results until we hit an end-if\r
//\r
Index++;\r
- } while (FormTags.Tags[Index].Operand != EFI_IFR_END_IF_OP && Conditional);\r
+ } while (FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_IF_OP && Conditional);\r
\r
//\r
// We advanced the index for the above conditional, rewind it to keep harmony with the for loop logic\r
Index--;\r
}\r
\r
- Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData);\r
+ Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);\r
\r
return Selection;\r
}\r
gST->ConOut->SetAttribute (gST->ConOut, KEYHELP_TEXT | KEYHELP_BACKGROUND);\r
\r
switch (Selection->ThisTag->Operand) {\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_NUMERIC_OP:\r
- case EFI_IFR_TIME_OP:\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);\r
\r
if (!Selected) {\r
\r
}\r
\r
- if ((Selection->ThisTag->Operand == EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
PrintAt (\r
StartColumnOfHelp,\r
BottomRowOfHelp,\r
//\r
// If it is a selected numeric with manual input, display different message\r
//\r
- if ((Selection->ThisTag->Operand == EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {\r
+ if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {\r
PrintStringAt (SecCol, TopRowOfHelp, gNumericInput);\r
- } else if (Selection->ThisTag->Operand != EFI_IFR_ORDERED_LIST_OP) {\r
+ } else if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);\r
}\r
\r
- if (Selection->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
PrintStringAt (StartColumnOfHelp, TopRowOfHelp, gPlusString);\r
PrintStringAt (ThdCol, TopRowOfHelp, gMinusString);\r
}\r
}\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);\r
\r
if (gClassOfVfr == EFI_SETUP_APPLICATION_SUBCLASS) {\r
PrintStringAt (SecCol, BottomRowOfHelp, gToggleCheckBox);\r
break;\r
\r
- case EFI_IFR_REF_OP:\r
- case EFI_IFR_PASSWORD_OP:\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);\r
\r
if (!Selected) {\r
PrintAt (StartColumnOfHelp, BottomRowOfHelp, (CHAR16 *) L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);\r
PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);\r
} else {\r
- if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) {\r
+ if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {\r
PrintStringAt (\r
(LocalScreen.RightColumn - GetStringWidth (gEnterCommitString) / 2) / 2,\r
BottomRowOfHelp,\r
//\r
// Advance Index to the first FormOp tag information\r
//\r
- for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)\r
+ for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)\r
;\r
} else {\r
//\r
// Advance Index to the FormOp with the correct ID value\r
//\r
for (; LocalTags.Next != NULL; LocalTags = *LocalTags.Next) {\r
- for (Index = 0; LocalTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)\r
+ for (Index = 0; LocalTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)\r
;\r
if (LocalTags.Tags[Index].Id == IdValue) {\r
break;\r
FormTags->Tags = AllocateZeroPool (NumberOfTags * sizeof (EFI_TAG));\r
ASSERT (FormTags->Tags != NULL);\r
\r
- for (CurrTag = 0; FormData[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; FormData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// Operand = IFR OpCode\r
//\r
//\r
switch (FormData[Index]) {\r
\r
- case EFI_IFR_FORM_OP:\r
- case EFI_IFR_SUBTITLE_OP:\r
- case EFI_IFR_TEXT_OP:\r
- case EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_SUBTITLE_OP:\r
+ case FRAMEWORK_EFI_IFR_TEXT_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16));\r
break;\r
\r
- case EFI_IFR_END_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_END_FORM_OP:\r
FormTags->Tags[CurrTag].Operand = FormData[Index];\r
FormTags->Tags[CurrTag].NumberOfLines = 0;\r
\r
Finished = TRUE;\r
break;\r
\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);\r
\r
//\r
QuestionIndex = (UINT16) CurrTag;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
- FormTags->Tags[QuestionIndex].Key = ((EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key;\r
- FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
+ FormTags->Tags[QuestionIndex].Key = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key;\r
+ FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 1, FileFormTags, CurrentVariable);\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
break;\r
\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
//\r
// Date elements come in as a Year, Month, Day. We need to process them as a country-based\r
// Order. It is much easier to do it here than anywhere else.\r
TagLength = FormData[Index + 1];\r
break;\r
\r
- case EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 0, FileFormTags, CurrentVariable);\r
\r
if (Count == 2) {\r
}\r
break;\r
\r
- case EFI_IFR_PASSWORD_OP:\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
break;\r
\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
ConsistencyId++;\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;\r
break;\r
\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;\r
break;\r
\r
- case EFI_IFR_AND_OP:\r
- case EFI_IFR_OR_OP:\r
- case EFI_IFR_NOT_OP:\r
- case EFI_IFR_TRUE_OP:\r
- case EFI_IFR_FALSE_OP:\r
- case EFI_IFR_GT_OP:\r
- case EFI_IFR_GE_OP:\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
+ case FRAMEWORK_EFI_IFR_GT_OP:\r
+ case FRAMEWORK_EFI_IFR_GE_OP:\r
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);\r
\r
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;\r
Routine Description:\r
\r
The function does the most of the works when the EFI_TAG that\r
- user selects on is EFI_IFR_FLAG_INTERACTIVE or EFI_IFR_PASSWORD_OP:\r
+ user selects on is FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE or FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
invoke CallBack, update the new form data.\r
\r
Arguments:\r
UINT16 ConsistencyId;\r
UINT16 CurrentVariable;\r
EFI_VARIABLE_DEFINITION *VariableDefinition;\r
- EFI_IFR_DATA_ENTRY *DataEntry;\r
+ FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;\r
\r
VariableDefinition = NULL;\r
NullCharacter = CHAR_NULL;\r
CopyMem (&TagGuid, &LocalTags->Tags[0].GuidValue, sizeof (EFI_GUID));\r
}\r
\r
- for (Index = 0; LocalTags->Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)\r
+ for (Index = 0; LocalTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)\r
;\r
if (LocalTags->Tags[Index].Id == IdValue) {\r
break;\r
//\r
// If we are going to callback on a non-goto opcode, make sure we don't change pages\r
//\r
- if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) {\r
+ if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {\r
TargetPage = Selection->FormId;\r
}\r
//\r
\r
ExtractRequestedNvMap (FileFormTags, CurrentVariable, &VariableDefinition);\r
\r
- if (Selection->ThisTag->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS)) {\r
- ((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap;\r
+ if (Selection->ThisTag->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS)) {\r
+ ((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap;\r
} else {\r
- ((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL;\r
+ ((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL;\r
}\r
\r
if ((FormCallback != NULL) && (FormCallback->Callback != NULL)) {\r
Status = FormCallback->Callback (\r
FormCallback,\r
Selection->ThisTag->Key,\r
- (EFI_IFR_DATA_ARRAY *) CallbackData,\r
+ (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData,\r
&Packet\r
);\r
}\r
// location associated with the op-code specified there. This is used on single op-code instances\r
// and not for when a hyperlink sent us a whole page of data.\r
//\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1);\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1);\r
if (Packet->DataArray.EntryCount == 1) {\r
switch (DataEntry->OpCode) {\r
- case EFI_IFR_STRING_OP:\r
- case EFI_IFR_NUMERIC_OP:\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
CopyMem (\r
&VariableDefinition->NvRamMap[Selection->ThisTag->StorageStart],\r
&DataEntry->Data,\r
);\r
break;\r
\r
- case EFI_IFR_NV_ACCESS_COMMAND:\r
+ case FRAMEWORK_EFI_IFR_NV_ACCESS_COMMAND:\r
CopyMem (\r
- &VariableDefinition->NvRamMap[((EFI_IFR_NV_DATA *) Packet)->QuestionId],\r
- ((EFI_IFR_NV_DATA *) Packet) + 1,\r
- ((EFI_IFR_NV_DATA *) Packet)->StorageWidth\r
+ &VariableDefinition->NvRamMap[((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->QuestionId],\r
+ ((FRAMEWORK_EFI_IFR_NV_DATA *) Packet) + 1,\r
+ ((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->StorageWidth\r
);\r
break;\r
\r
FreePool (Packet);\r
}\r
\r
- for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != EFI_IFR_END_FORM_OP; BackupIndex++) {\r
+ for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; BackupIndex++) {\r
switch (LocalTags->Tags[BackupIndex].Operand) {\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
- case EFI_IFR_EQ_ID_ID_OP:\r
- case EFI_IFR_AND_OP:\r
- case EFI_IFR_OR_OP:\r
- case EFI_IFR_NOT_OP:\r
- case EFI_IFR_TRUE_OP:\r
- case EFI_IFR_FALSE_OP:\r
- case EFI_IFR_GT_OP:\r
- case EFI_IFR_GE_OP:\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
+ case FRAMEWORK_EFI_IFR_GT_OP:\r
+ case FRAMEWORK_EFI_IFR_GE_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
//\r
// If we encountered a ConsistencyId value, on this page they will be incremental\r
// So register the first value we encounter. We will pass this in when we re-create this page\r
//\r
// True if a hyperlink/jump is selected\r
//\r
- if (Selection->ThisTag->Operand == EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) {\r
- if (Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) {\r
+ if (Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
ExtractDynamicFormHandle (\r
Selection,\r
CallbackData,\r
}\r
}\r
\r
- if ((Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) &&\r
- (Selection->ThisTag->Operand != EFI_IFR_PASSWORD_OP)\r
+ if ((Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) &&\r
+ (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_PASSWORD_OP)\r
) {\r
ExtractDynamicFormHandle (\r
Selection,\r
// Remember, the only time we come here is because we are in the NVPlus section of the NvRamMap\r
//\r
for (Index = MenuOption->TagIndex;\r
- (MenuOption->Tags[Index].Operand != EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP);\r
+ (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP);\r
Index++\r
) {\r
\r
switch (MenuOption->Tags[Index].Operand) {\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
CachedStart = MenuOption->Tags[Index].StorageStart;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) {\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
+ if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
CopyMem (&NvRamMap[CachedStart], &MenuOption->Tags[Index].Value, 2);\r
}\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
CopyMem (&NvRamMap[MenuOption->Tags[Index].StorageStart], &MenuOption->Tags[Index].Flags, 1);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
- case EFI_IFR_DATE_OP:\r
- case EFI_IFR_TIME_OP:\r
- case EFI_IFR_STRING_OP:\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
CopyMem (\r
&NvRamMap[MenuOption->Tags[Index].StorageStart],\r
&MenuOption->Tags[Index].Value,\r
IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN Selected,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
OUT CHAR16 **OptionString\r
)\r
{\r
NullCharacter = CHAR_NULL;\r
FormCallback = NULL;\r
\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
OrderedList = TRUE;\r
if (((UINT8 *) NvRamMap)[0] != 0x00) {\r
Initialized = TRUE;\r
\r
switch (Tag->Operand) {\r
\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
CachedIndex = MenuOption->TagIndex;\r
\r
//\r
- // search for EFI_IFR_ONE_OF_OPTION_OP until you hit the EFI_IFR_END_ONE_OF_OP,\r
+ // search for FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP until you hit the FRAMEWORK_EFI_IFR_END_ONE_OF_OP,\r
// each of the .Text in the options are going to be what gets displayed. Break each into 26 char chunks\r
// when hit right/left arrow allows for selection - then repopulate Tag[TagIndex] with the choice\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
//\r
// We found an option - which assumedly has a string. We will eventually have to support\r
// wrapping of strings. For now, let's pretend they don't wrap and code that up.\r
//\r
// Count how many strings there are\r
//\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
//\r
// If one of the options for the one-of has an interactive flag, back-define the oneof to have one too\r
//\r
- if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
- MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | EFI_IFR_FLAG_INTERACTIVE);\r
+ if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
+ MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE);\r
}\r
\r
StringCount++;\r
//\r
// Copy current setting to the seed Value\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
ValueArray = AllocateZeroPool (MenuOption->ThisTag->StorageWidth);\r
ASSERT (ValueArray != NULL);\r
CopyMem (ValueArray, NvRamMap, MenuOption->ThisTag->StorageWidth);\r
}\r
\r
Number = Value;\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
Status = GetSelectionInputPopUp (MenuOption, Tag, MenuOption->ThisTag->StorageWidth, ValueArray, &KeyValue);\r
} else {\r
Status = GetSelectionInputPopUp (MenuOption, Tag, 1, &Value, &KeyValue);\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth);\r
FreePool (ValueArray);\r
} else {\r
// if two questions are bound by consistency checks and each only has two possible choices, there\r
// would be no way for a user to switch the values. Thus we require late checking.\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
CopyMem (&Tag->OldValue, &Value, Tag->StorageWidth);\r
} else {\r
//\r
\r
UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);\r
} else {\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
FreePool (ValueArray);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
} else {\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
//\r
// We found an option - which assumedly has a string. We will eventually have to support\r
// wrapping of strings. For now, let's pretend they don't wrap and code that up.\r
//\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
if (OrderedList) {\r
if (!Initialized) {\r
//\r
StringPtr = GetToken (MenuOption->Tags[Index].Text, MenuOption->Handle);\r
} else {\r
for (Value = (UINT16) (MenuOption->TagIndex + 1);\r
- MenuOption->Tags[Value].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Value].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Value++\r
) {\r
if (MenuOption->Tags[Value].Value == ((UINT8 *) NvRamMap)[Index - MenuOption->TagIndex - 1]) {\r
}\r
}\r
\r
- if (MenuOption->Tags[Value].Operand == EFI_IFR_END_ONE_OF_OP) {\r
+ if (MenuOption->Tags[Value].Operand == FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
Skip = TRUE;\r
continue;\r
}\r
break;\r
}\r
\r
- if ((MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) == 1) {\r
+ if ((MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) == 1) {\r
Default = MenuOption->Tags[Index].Text;\r
Value = MenuOption->Tags[Index].Value;\r
};\r
}\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
NewStrCat (OptionString[0], StringPtr);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
}\r
break;\r
\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
//\r
// Also, we want to internationalize the order of the date information. We need to code for it as well.\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_DATE_OP; Index++)\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP; Index++)\r
;\r
\r
//\r
// might want to set an alarm and actually preserve the data in NVRam so a driver can pick up the instruction\r
// BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG\r
//\r
- case EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
// to 53 and found it to no longer point to a date operand, we were pointing to the last of 3\r
// date operands.\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_TIME_OP; Index++)\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP; Index++)\r
;\r
//\r
// Count 0 = We entered on the first Date operand\r
}\r
break;\r
\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
return Status;\r
}\r
\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
// Since interactive passwords assume to handle the password data in a separate variable\r
// storage, we don't need to do more than what is below for password callbacks\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
MenuOption->Tags[0].CallbackHandle = FileFormTags->FormTags.Tags[0].CallbackHandle;\r
Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr);\r
ZeroMem (StringPtr, Tag->Maximum);\r
UINTN Index;\r
\r
switch (OpCode) {\r
- case EFI_IFR_FORM_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
if (VariableDefinitionsHead != NULL) {\r
VariableName = AllocateZeroPool (12);\r
}\r
break;\r
\r
- case EFI_IFR_SUBTITLE_OP:\r
+ case FRAMEWORK_EFI_IFR_SUBTITLE_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_TEXT_OP:\r
+ case FRAMEWORK_EFI_IFR_TEXT_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));\r
- CopyMem (&TargetTag->Help, &((EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
\r
//\r
// inside the if() statement. If the encoded length is the complete size, then we\r
// know we have valid data encoded that we want to integrate\r
//\r
- if (((EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (EFI_IFR_TEXT)) {\r
+ if (((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (FRAMEWORK_EFI_IFR_TEXT)) {\r
//\r
// Text has no help associated with it, but in case there is a second entry due to\r
// dynamic/interactive flags being active, bring this data over.\r
//\r
- CopyMem (&TargetTag->TextTwo, &((EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_TEXT *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->TextTwo, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));\r
}\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
- TargetTag->Flags = ((EFI_IFR_CHECKBOX *) FormData)->Flags;\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Flags;\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
- TargetTag->Flags = ((EFI_IFR_NUMERIC *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
//\r
- // Convert EFI_IFR_STRING.MinSize and EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes\r
+ // Convert FRAMEWORK_EFI_IFR_STRING.MinSize and FRAMEWORK_EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes\r
// and store to EFI_TAG.Minimum and EFI_TAG.Maximum\r
//\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));\r
\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));\r
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));\r
- TargetTag->Flags = (UINT8) (((EFI_IFR_STRING *) FormData)->Flags);\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));\r
+ TargetTag->Flags = (UINT8) (((FRAMEWORK_EFI_IFR_STRING *) FormData)->Flags);\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));\r
\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));\r
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_PASSWORD *) FormData)->Flags;\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));\r
- CopyMem (&TargetTag->Encoding, &((EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Flags;\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Encoding, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
//\r
// It should NEVER be NULL\r
//\r
//\r
// If there is a variable with this GUID and ID already, we need to bail out\r
//\r
- if (!CompareMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&\r
- !CompareMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))\r
+ if (!CompareMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&\r
+ !CompareMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))\r
) {\r
return ;\r
}\r
//\r
// Copy the Variable data to our linked list\r
//\r
- CopyMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&VariableDefinitions->VariableSize, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
- CopyMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&VariableDefinitions->VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
\r
//\r
- // The ASCII String which is immediately past the EFI_IFR_VARSTORE is inferred by the structure definition\r
+ // The ASCII String which is immediately past the FRAMEWORK_EFI_IFR_VARSTORE is inferred by the structure definition\r
// due to it being variable sized. There are rules preventing it from being > 40 characters long and should\r
// be enforced by the compiler.\r
//\r
- AsciiString = (CHAR8 *) (&((EFI_IFR_VARSTORE *) FormData)->Size);\r
+ AsciiString = (CHAR8 *) (&((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size);\r
AsciiString = AsciiString + 2;\r
VariableDefinitions->VariableName = AllocateZeroPool ((AsciiStrLen (AsciiString) + 1) * 2);\r
ASSERT (VariableDefinitions->VariableName != NULL);\r
//\r
// Propogate the tag information for this op-code\r
//\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&TargetTag->GuidValue, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
- CopyMem (&TargetTag->StorageWidth, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
- CopyMem (&TargetTag->Maximum, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->GuidValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&TargetTag->StorageWidth, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Maximum, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_OP:\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
CurrentVariable2 = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
CopyMem (\r
&TargetTag->VariableNumber2,\r
- &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,\r
+ &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,\r
sizeof (UINT16)\r
);\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&CurrentVariable2, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable2, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));\r
break;\r
\r
- case EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));\r
- CopyMem (&TargetTag->Help, &((EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_REF *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_REF *) FormData)->Flags;\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_VAL *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Width;\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_ID *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->Width;\r
TargetTag->VariableNumber = CurrentVariable;\r
TargetTag->VariableNumber = CurrentVariable2;\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_LIST *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->Width;\r
\r
TargetTag->IntList = AllocateZeroPool (TargetTag->Id2 * sizeof (UINT16));\r
ASSERT (TargetTag->IntList);\r
for (TempValue = 0; TempValue < TargetTag->Id2; TempValue++) {\r
CopyMem (\r
&TargetTag->IntList[TempValue],\r
- &((EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],\r
sizeof (UINT16)\r
);\r
}\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_FORM_SET_OP:\r
- CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));\r
- CopyMem (&Guid, &((EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
+ CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));\r
+ CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));\r
//\r
// If there is a size specified in the formste, we will establish a "default" variable\r
//\r
}\r
break;\r
\r
- case EFI_IFR_END_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_END_FORM_SET_OP:\r
CurrentVariable = 0;\r
CurrentVariable2 = 0;\r
break;\r
STATIC\r
EFI_STATUS\r
InitializeBinaryStructures (\r
- IN EFI_HII_HANDLE *Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE *Handle,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
IN UINT8 *NvMapOverride,\r
IN UINTN NumberOfIfrImages,\r
EFI_FILE_FORM_TAGS **FileFormTagsHead\r
STATIC\r
EFI_STATUS\r
InitializeTagStructures (\r
- IN EFI_IFR_BINARY *BinaryData,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,\r
OUT EFI_FILE_FORM_TAGS *FileFormTags\r
);\r
\r
EFI_STATUS\r
GetIfrBinaryData (\r
IN EFI_HII_PROTOCOL *Hii,\r
- IN EFI_HII_HANDLE HiiHandle,\r
- IN EFI_IFR_PACKET *Packet,\r
- IN EFI_IFR_BINARY *BinaryData\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData\r
);\r
\r
STATIC\r
SendForm (\r
IN EFI_FORM_BROWSER_PROTOCOL * This,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_HII_HANDLE * Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE * Handle,\r
IN UINTN HandleCount,\r
- IN EFI_IFR_PACKET * Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET * Packet,\r
IN EFI_HANDLE CallbackHandle,\r
IN UINT8 *NvMapOverride,\r
IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
EFI_STATUS Status;\r
BOOLEAN Callback;\r
VOID *CallbackData;\r
- EFI_HII_HANDLE BackupHandle;\r
+ FRAMEWORK_EFI_HII_HANDLE BackupHandle;\r
\r
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
\r
\r
Tag->NumberOfLines = 1;\r
Tag->VariableNumber = CurrentVariable;\r
- CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
- CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
- CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
+ CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
+ CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
+ CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
\r
VariableDefinition = FileFormTags->VariableDefinitions;\r
\r
\r
Tag->NumberOfLines = NumberOfLines;\r
Tag->VariableNumber = CurrentVariable;\r
- CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
- CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
- CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
- CopyMem (&Tag->Minimum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));\r
- CopyMem (&Tag->Maximum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));\r
- CopyMem (&Tag->Step, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));\r
- CopyMem (&Tag->Default, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));\r
- Tag->ResetRequired = (BOOLEAN) (((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
+ CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
+ CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
+ CopyMem (&Tag->Minimum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));\r
+ CopyMem (&Tag->Maximum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));\r
+ CopyMem (&Tag->Step, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));\r
+ CopyMem (&Tag->Default, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));\r
+ Tag->ResetRequired = (BOOLEAN) (((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
\r
VariableDefinition = FileFormTags->VariableDefinitions;\r
\r
// Assume on entry we are pointing to an OpCode - reasonably this should\r
// be a FormOp since the purpose is to count the tags in a particular Form.\r
//\r
- for (Index = 0; RawFormSet[Index] != EFI_IFR_END_FORM_OP;) {\r
+ for (Index = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_OP;) {\r
//\r
// If we encounter the end of a form set, bail out\r
//\r
- if (RawFormSet[Index] == EFI_IFR_END_FORM_SET_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {\r
break;\r
}\r
//\r
// We treat date/time internally as three op-codes\r
//\r
- if (RawFormSet[Index] == EFI_IFR_DATE_OP || RawFormSet[Index] == EFI_IFR_TIME_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_DATE_OP || RawFormSet[Index] == FRAMEWORK_EFI_IFR_TIME_OP) {\r
*NumberOfTags = (UINT16) (*NumberOfTags + 3);\r
} else {\r
//\r
STATIC\r
EFI_STATUS\r
InitializeTagStructures (\r
- IN EFI_IFR_BINARY *BinaryData,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,\r
OUT EFI_FILE_FORM_TAGS *FileFormTags\r
)\r
{\r
\r
ZeroMem (FormTags->Tags, NumberOfTags * sizeof (EFI_TAG));\r
\r
- for (CurrTag = 0; RawFormSet[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// Operand = IFR OpCode\r
//\r
//\r
switch (RawFormSet[Index]) {\r
\r
- case EFI_IFR_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
//\r
// If there was no variable op-code defined, create a dummy entry for one\r
//\r
}\r
break;\r
\r
- case EFI_IFR_SUBTITLE_OP:\r
- case EFI_IFR_TEXT_OP:\r
- case EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUBTITLE_OP:\r
+ case FRAMEWORK_EFI_IFR_TEXT_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
if (FileFormTags->VariableDefinitions == NULL) {\r
VariableDefinitions = AllocateZeroPool (sizeof (EFI_VARIABLE_DEFINITION));\r
ASSERT (VariableDefinitions != NULL);\r
);\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));\r
CurrentVariable2 = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- CopyMem(&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));\r
+ CopyMem(&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));\r
CopyMem (\r
&CurrentVariable2,\r
- &((EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,\r
+ &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,\r
sizeof (UINT16)\r
);\r
break;\r
\r
- case EFI_IFR_END_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_END_FORM_OP:\r
//\r
// Test for an allocated buffer. If already allocated this is due to having called this routine\r
// once for sizing of the NV storage. We then loaded the NV variable and can correctly initialize\r
// Two types of tags constitute the One Of question: a one-of header and\r
// several one-of options.\r
//\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
\r
//\r
QuestionIndex = (UINT16) CurrTag;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- FormTags->Tags[QuestionIndex].Flags = ((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;\r
+ FormTags->Tags[QuestionIndex].Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;\r
CopyMem (\r
&FormTags->Tags[QuestionIndex].Key,\r
- &((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,\r
+ &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,\r
sizeof (UINT16)\r
);\r
- FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
+ FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 1, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
//\r
// Date elements come in as a Year, Month, Day. We need to process them as a country-based\r
// Order. It is much easier to do it here than anywhere else.\r
TagLength = RawFormSet[Index + 1];\r
break;\r
\r
- case EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 0, FileFormTags, CurrentVariable);\r
\r
if (Count == 2) {\r
}\r
break;\r
\r
- case EFI_IFR_PASSWORD_OP:\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
gConsistencyId++;\r
\r
//\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
CopyMem (\r
&FormTags->Tags[CurrTag].GuidValue,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,\r
sizeof (EFI_GUID)\r
);\r
CopyMem (\r
&FormTags->Tags[CurrTag].CallbackHandle,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,\r
sizeof (EFI_PHYSICAL_ADDRESS)\r
);\r
- CopyMem (&FormTags->Tags[CurrTag].Class, &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));\r
+ CopyMem (&FormTags->Tags[CurrTag].Class, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));\r
CopyMem (\r
&FormTags->Tags[CurrTag].SubClass,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,\r
sizeof (UINT8)\r
);\r
CopyMem (\r
&FormTags->Tags[CurrTag].NvDataSize,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,\r
sizeof (UINT16)\r
);\r
- Class = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;\r
- SubClass = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;\r
+ Class = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;\r
+ SubClass = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;\r
//\r
// If the formset has a size value, that means someone must be using this, so create a variable\r
// We also shall reserve the formid of 0 for this specific purpose.\r
}\r
break;\r
\r
- case EFI_IFR_BANNER_OP:\r
+ case FRAMEWORK_EFI_IFR_BANNER_OP:\r
if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) {\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));\r
//\r
// If this is the special timeout value, we will dynamically figure out where to put it\r
// Also the least significant byte refers to the TimeOut desired.\r
//\r
- if (TempValue == EFI_IFR_BANNER_TIMEOUT) {\r
- CopyMem (&FrontPageTimeOutTitle, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));\r
+ if (TempValue == FRAMEWORK_EFI_IFR_BANNER_TIMEOUT) {\r
+ CopyMem (&FrontPageTimeOutTitle, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));\r
if (FrontPageTimeOutValue != (INT16) -1) {\r
- CopyMem (&FrontPageTimeOutValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));\r
+ CopyMem (&FrontPageTimeOutValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));\r
}\r
break;\r
}\r
\r
CopyMem (\r
- &BannerData->Banner[((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][\r
- ((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],\r
- &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title,\r
+ &BannerData->Banner[((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][\r
+ ((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],\r
+ &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title,\r
sizeof (STRING_REF)\r
);\r
}\r
break;\r
\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:\r
CopyMem (\r
&FormTags->Tags[CurrTag].Text,\r
- &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,\r
+ &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,\r
sizeof (UINT16)\r
);\r
gConsistencyId++;\r
\r
- InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Popup, &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Popup, &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,\r
sizeof (UINT16)\r
);\r
CopyMem (\r
&InconsistentTags->QuestionId2,\r
- &((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_AND_OP:\r
- case EFI_IFR_OR_OP:\r
- case EFI_IFR_NOT_OP:\r
- case EFI_IFR_GT_OP:\r
- case EFI_IFR_GE_OP:\r
- case EFI_IFR_TRUE_OP:\r
- case EFI_IFR_FALSE_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_GT_OP:\r
+ case FRAMEWORK_EFI_IFR_GE_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
// Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but\r
// have no coresponding id. The examination of id is needed by evaluating boolean expression.\r
//\r
- if (RawFormSet[Index] == EFI_IFR_TRUE_OP ||\r
- RawFormSet[Index] == EFI_IFR_FALSE_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_TRUE_OP ||\r
+ RawFormSet[Index] == FRAMEWORK_EFI_IFR_FALSE_OP) {\r
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE - 1;\r
} else {\r
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE;\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,\r
sizeof (UINT16)\r
);\r
CopyMem (\r
&InconsistentTags->ListLength,\r
- &((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,\r
sizeof (UINT16)\r
);\r
InconsistentTags->ValueList = FormTags->Tags[CurrTag].IntList;\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_END_IF_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_END_IF_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_END_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:\r
break;\r
\r
default:\r
//\r
// Search the tags for the tag which corresponds to this ID\r
//\r
- for (CurrTag = 0; FormTags->Tags[0].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; FormTags->Tags[0].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// If we hit the end of a form, go to the next set of Tags.\r
// Remember - EndFormSet op-codes sit on their own page after an end form.\r
//\r
- if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {\r
+ if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {\r
//\r
// Reset the CurrTag value (it will be incremented, after this case statement\r
// so set to a negative one so that we get the desired effect.) Fish can beat me later.\r
//\r
// Search the tags for the tag which corresponds to this ID\r
//\r
- for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// If we hit the end of a form, go to the next set of Tags.\r
// Remember - EndFormSet op-codes sit on their own page after an end form.\r
//\r
- if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {\r
+ if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {\r
//\r
// Reset the CurrTag value (it will be incremented, after this case statement\r
// so set to a negative one so that we get the desired effect.) Fish can beat me later.\r
CHAR16 *\r
GetToken (\r
IN STRING_REF Token,\r
- IN EFI_HII_HANDLE HiiHandle\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle\r
)\r
/*++\r
\r
{\r
EFI_STATUS Status;\r
UINTN Index;\r
- EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
CHAR16 *StringPtr;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
EFI_FORM_TAGS LocalTags;\r
return Selection;\r
}\r
\r
- Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData);\r
+ Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);\r
\r
return Selection;\r
}\r
STATIC\r
EFI_STATUS\r
InitializeBinaryStructures (\r
- IN EFI_HII_HANDLE *Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE *Handle,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
IN UINT8 *NvMapOverride,\r
IN UINTN NumberOfIfrImages,\r
OUT EFI_FILE_FORM_TAGS **FileFormTagsHead\r
{\r
UINTN HandleIndex;\r
EFI_STATUS Status;\r
- EFI_IFR_BINARY *BinaryData;\r
+ FRAMEWORK_EFI_IFR_BINARY *BinaryData;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
UINTN SizeOfNvStore;\r
EFI_FORM_CALLBACK_PROTOCOL *FormCallback;\r
//\r
// Allocate memory for our Binary Data\r
//\r
- BinaryData = AllocateZeroPool (sizeof (EFI_IFR_BINARY));\r
+ BinaryData = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));\r
ASSERT (BinaryData);\r
\r
//\r
// Allocate memory for our Binary Data linked-list\r
// Each handle represents a Binary and we will store that data away.\r
//\r
- BinaryData->Next = AllocateZeroPool (sizeof (EFI_IFR_BINARY));\r
+ BinaryData->Next = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));\r
ASSERT (BinaryData->Next);\r
\r
BinaryData = BinaryData->Next;\r
\r
NvMapListHead = NULL;\r
\r
- Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
+ Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
\r
if (!EFI_ERROR (Status)) {\r
ASSERT_EFI_ERROR (NULL != NvMapListHead);\r
EFI_STATUS\r
GetIfrBinaryData (\r
IN EFI_HII_PROTOCOL *Hii,\r
- IN EFI_HII_HANDLE HiiHandle,\r
- IN EFI_IFR_PACKET *Packet,\r
- IN OUT EFI_IFR_BINARY *BinaryData\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
+ IN OUT FRAMEWORK_EFI_IFR_BINARY *BinaryData\r
)\r
/*++\r
\r
UINTN BufferSize;\r
VOID *Buffer;\r
UINT8 *RawFormBinary;\r
- EFI_IFR_FORM_SET *FormOp;\r
+ FRAMEWORK_EFI_IFR_FORM_SET *FormOp;\r
UINT16 Index;\r
UINT16 Index2;\r
UINT16 TitleToken;\r
}\r
//\r
// Walk through the FormSet Opcodes looking for the FormSet opcode\r
- // If we hit EFI_IFR_END_SET_OP we know we hit the end of the FormSet.\r
+ // If we hit FRAMEWORK_EFI_IFR_END_SET_OP we know we hit the end of the FormSet.\r
//\r
- for (Index = 0; RawFormBinary[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
- FormOp = (EFI_IFR_FORM_SET *) &RawFormBinary[Index];\r
+ for (Index = 0; RawFormBinary[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+ FormOp = (FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormBinary[Index];\r
Index = (UINT16) (Index + FormOp->Header.Length);\r
\r
- if (FormOp->Header.OpCode == EFI_IFR_FORM_SET_OP) {\r
+ if (FormOp->Header.OpCode == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
TitleToken = FormOp->FormSetTitle;\r
//\r
// If displaying FrontPage - set the flag signifying it\r
#define _SETUP_H\r
\r
\r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
\r
#include <Protocol/FrameworkFormCallback.h>\r
#include <Protocol/FrameworkFormBrowser.h>\r
//\r
// This encapsulates all the pointers associated with found IFR binaries\r
//\r
-typedef struct _EFI_IFR_BINARY {\r
- struct _EFI_IFR_BINARY *Next;\r
+typedef struct _FRAMEWORK_EFI_IFR_BINARY {\r
+ struct _FRAMEWORK_EFI_IFR_BINARY *Next;\r
VOID *IfrPackage; // Handy for use in freeing the data later since this is the header of the buffer\r
VOID *FormBinary;\r
- EFI_HII_HANDLE Handle;\r
+ FRAMEWORK_EFI_HII_HANDLE Handle;\r
STRING_REF TitleToken;\r
BOOLEAN UnRegisterOnExit;\r
-} EFI_IFR_BINARY;\r
+} FRAMEWORK_EFI_IFR_BINARY;\r
\r
//\r
// This encapsulates all the questions (tags) for a particular Form Set\r
//\r
// Head of the Binary structures\r
//\r
-EFI_IFR_BINARY *gBinaryDataHead;\r
+FRAMEWORK_EFI_IFR_BINARY *gBinaryDataHead;\r
\r
//\r
// The IFR binary that the user chose to run\r
\r
VOID *CachedNVEntry;\r
BANNER_DATA *BannerData;\r
-EFI_HII_HANDLE FrontPageHandle;\r
+FRAMEWORK_EFI_HII_HANDLE FrontPageHandle;\r
STRING_REF FrontPageTimeOutTitle;\r
INT16 FrontPageTimeOutValue;\r
UINTN gClassOfVfr;\r
BOOLEAN gNvUpdateRequired;\r
UINT16 gConsistencyId;\r
UINTN gPriorMenuEntry;\r
-EFI_HII_HANDLE gHiiHandle;\r
+FRAMEWORK_EFI_HII_HANDLE gHiiHandle;\r
BOOLEAN gFirstIn;\r
VOID *gPreviousValue;\r
UINT16 gDirection;\r
CHAR16 *\r
GetToken (\r
IN STRING_REF IfrBinaryTitle,\r
- IN EFI_HII_HANDLE HiiHandle\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle\r
)\r
;\r
\r
VOID\r
UiAddMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tags,\r
IN VOID *FormBinary,\r
IN UINTN IfrNumber\r
VOID\r
UiAddSubMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tags,\r
IN UINTN TagIndex,\r
IN UINT16 FormId,\r
gScreenDimensions.BottomRow - 1,\r
NvUpdateMessage\r
);\r
- gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED));\r
+ gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) == FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
gNvUpdateRequired = TRUE;\r
} else {\r
EFI_FILE_FORM_TAGS *PreviousFileForm;\r
EFI_FORM_TAGS *FormTags;\r
EFI_FORM_TAGS *PreviousFormTags;\r
- EFI_IFR_BINARY *IfrBinary;\r
- EFI_IFR_BINARY *PreviousIfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *PreviousIfrBinary;\r
EFI_INCONSISTENCY_DATA *Inconsistent;\r
EFI_VARIABLE_DEFINITION *VariableDefinition;\r
EFI_VARIABLE_DEFINITION *PreviousVariableDefinition;\r
//\r
// Walk through each of the tags and free the IntList allocation\r
//\r
- for (Index = 0; FormTags->Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) {\r
+ for (Index = 0; FormTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {\r
//\r
// It is more than likely that the very last page will contain an end formset\r
//\r
- if (FormTags->Tags[Index].Operand == EFI_IFR_END_FORM_SET_OP) {\r
+ if (FormTags->Tags[Index].Operand == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {\r
break;\r
}\r
\r
//\r
// If the op-code has a late check, ensure consistency checks are now applied\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
if (ValueIsNotValid (TRUE, 0, Tag, FileFormTags, &PopUp)) {\r
if (PopUp != 0x0000) {\r
StringPtr = GetToken (PopUp, MenuOption->Handle);\r
UINT16\r
GetWidth (\r
IN EFI_TAG *Tag,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
/*++\r
\r
//\r
// See if the second text parameter is really NULL\r
//\r
- if ((Tag->Operand == EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {\r
String = GetToken (Tag->TextTwo, Handle);\r
Size = StrLen (String);\r
FreePool (String);\r
}\r
\r
- if ((Tag->Operand == EFI_IFR_SUBTITLE_OP) ||\r
- (Tag->Operand == EFI_IFR_REF_OP) ||\r
- (Tag->Operand == EFI_IFR_PASSWORD_OP) ||\r
- (Tag->Operand == EFI_IFR_STRING_OP) ||\r
- (Tag->Operand == EFI_IFR_INVENTORY_OP) ||\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_REF_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_PASSWORD_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_STRING_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_INVENTORY_OP) ||\r
//\r
// Allow a wide display if text op-code and no secondary text op-code\r
//\r
- ((Tag->Operand == EFI_IFR_TEXT_OP) && (Size == 0x0000))\r
+ ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Size == 0x0000))\r
) {\r
return (UINT16) (gPromptBlockWidth + gOptionBlockWidth);\r
} else {\r
STATIC\r
VOID\r
UpdateOptionSkipLines (\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
IN UI_MENU_OPTION *MenuOption,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
IN CHAR16 **OptionalString,\r
UiDisplayMenu (\r
IN BOOLEAN SubMenu,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- OUT EFI_IFR_DATA_ARRAY *PageData\r
+ OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData\r
)\r
/*++\r
\r
Arguments:\r
SubMenu - Indicate is sub menu.\r
FileFormTagsHead - A pointer to the EFI_FILE_FORM_TAGS structure.\r
- PageData - A pointer to the EFI_IFR_DATA_ARRAY.\r
+ PageData - A pointer to the FRAMEWORK_EFI_IFR_DATA_ARRAY.\r
\r
Returns:\r
Return the pointer of the menu which selected,\r
UI_MENU_OPTION *NextMenuOption;\r
UI_MENU_OPTION *SavedMenuOption;\r
UI_MENU_OPTION *PreviousMenuOption;\r
- EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
UI_CONTROL_FLAG ControlFlag;\r
EFI_SCREEN_DESCRIPTOR LocalScreen;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
if (MenuOption->ThisTag->GrayOut) {\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {\r
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
}\r
}\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
//\r
// If this is a date or time op-code and is used to reflect an RTC, register the op-code\r
//\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP) &&\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP) &&\r
(MenuOption->ThisTag->StorageStart >= FileFormTags->FormTags.Tags[0].NvDataSize)) {\r
\r
if (gMenuRefreshHead == NULL) {\r
//\r
// If this is a text op with secondary text information\r
//\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {\r
StringPtr = GetToken (MenuOption->ThisTag->TextTwo, MenuOption->Handle);\r
\r
Width = (UINT16) gOptionBlockWidth;\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
if (MenuOption->ThisTag->GrayOut) {\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {\r
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
}\r
}\r
// This is only possible if we entered this page and the first menu option is\r
// a "non-menu" item. In that case, force it UiDown\r
//\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we previously hit an UP command and we are still sitting on a text operation\r
// we must continue going up\r
if (SubMenu) {\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
\r
if (SubMenu &&\r
(Repaint || NewLine ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) &&\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) &&\r
!(gClassOfVfr == EFI_GENERAL_APPLICATION_SUBCLASS)) {\r
//\r
// Don't print anything if it is a NULL help token\r
\r
Status = UiWaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);\r
if (Status == EFI_TIMEOUT) {\r
- EFI_IFR_DATA_ENTRY *DataEntry;\r
+ FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;\r
\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
\r
PageData->EntryCount = 1;\r
Count = (UINT32) ((OriginalTimeOut - FrontPageTimeOutValue) * 100 / OriginalTimeOut);\r
FormCallback->Callback (\r
FormCallback,\r
0xFFFF,\r
- (EFI_IFR_DATA_ARRAY *) PageData,\r
+ (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,\r
NULL\r
);\r
}\r
FormCallback->Callback (\r
FormCallback,\r
0xFFFE,\r
- (EFI_IFR_DATA_ARRAY *) PageData,\r
+ (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,\r
NULL\r
);\r
}\r
//\r
case '+':\r
case '-':\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
\r
if (Key.UnicodeChar == '+') {\r
gDirection = SCAN_RIGHT;\r
case ' ':\r
if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {\r
if (SubMenu) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {\r
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
gST->ConOut->OutputString (gST->ConOut, MenuOption->Description);\r
Selection = MenuOption;\r
//\r
for (Link = Menu.ForwardLink; Link != &Menu; Link = Link->ForwardLink) {\r
NextMenuOption = CR (Link, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != EFI_IFR_SUBTITLE_OP)) {\r
+ if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != FRAMEWORK_EFI_IFR_SUBTITLE_OP)) {\r
break;\r
}\r
}\r
ExtractRequestedNvMap (FileFormTags, MenuOption->ThisTag->VariableNumber, &VariableDefinition);\r
\r
if (SubMenu) {\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP &&\r
- !(MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE)) ||\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP &&\r
+ !(MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE)) ||\r
(MenuOption->ThisTag->GrayOut) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
Selection = NULL;\r
break;\r
}\r
PrintStringAt (LocalScreen.LeftColumn + gPromptBlockWidth + 1, MenuOption->Row, OptionString);\r
}\r
\r
- if (MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
Selection = MenuOption;\r
}\r
\r
//\r
// If not a goto, dump single piece of data, otherwise dump everything\r
//\r
- if (Selection->ThisTag->Operand == EFI_IFR_REF_OP) {\r
+ if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP) {\r
//\r
// Check for tags that might have LATE_CHECK enabled. If they do, we can't switch pages or save NV data.\r
//\r
\r
case CfUiLeft:\r
ControlFlag = CfCheckSelection;\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
if (MenuOption->Skip == 1) {\r
//\r
// In the tail of the Date/Time op-code set, go left.\r
case CfUiRight:\r
ControlFlag = CfCheckSelection;\r
if ((MenuOption->Skip == 0) &&\r
- ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP))\r
+ ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP))\r
) {\r
//\r
// We are in the head or middle of the Date/Time op-code set, advance right.\r
//\r
// If the previous MenuOption contains a display-only op-code, skip to the next one\r
//\r
- if (PreviousMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {\r
+ if (PreviousMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {\r
//\r
// This is ok as long as not at the end of the list\r
//\r
if (SubMenu) {\r
SavedMenuOption = MenuOption;\r
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we are at the end of the list and sitting on a text op, we need to more forward\r
//\r
// If the next MenuOption contains a display-only op-code, skip to the next one\r
// Also if the next MenuOption is date or time,\r
//\r
- if (NextMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {\r
+ if (NextMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {\r
//\r
// This is ok as long as not at the end of the list\r
//\r
if (SubMenu) {\r
SavedMenuOption = MenuOption;\r
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we are at the end of the list and sitting on a text op, we need to more forward\r
//\r
\r
NvMapListHead = NULL;\r
\r
- Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
+ Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
\r
if (!EFI_ERROR (Status)) {\r
ASSERT_EFI_ERROR (NULL != NvMapListHead);\r
\r
for (; Temp != &Menu; Temp = Direction ? Temp->BackLink : Temp->ForwardLink) {\r
MenuOption = CR (Temp, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (!(MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {\r
+ if (!(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {\r
return FALSE;\r
}\r
}\r
NewPosition = *CurrentPosition;\r
MenuOption = CR (NewPosition, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
//\r
// Calculate the distance from current position to the last Date/Time op-code.\r
//\r
\r
UINTN IfrNumber;\r
VOID *FormBinary;\r
- EFI_HII_HANDLE Handle;\r
+ FRAMEWORK_EFI_HII_HANDLE Handle;\r
EFI_TAG *Tags;\r
UINTN TagIndex;\r
EFI_TAG *ThisTag;\r
VOID\r
UiAddMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tag,\r
IN VOID *FormBinary,\r
IN UINTN IfrNumber\r
VOID\r
UiAddSubMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tag,\r
IN UINTN TagIndex,\r
IN UINT16 FormId,\r
UiDisplayMenu (\r
IN BOOLEAN SubMenu,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- OUT EFI_IFR_DATA_ARRAY *PageData\r
+ OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData\r
)\r
;\r
\r
IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN PromptForPassword,\r
IN EFI_TAG *Tag,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
IN BOOLEAN SecondEntry,\r
IN EFI_FILE_FORM_TAGS *FileFormTags,\r
OUT CHAR16 *StringPtr\r
IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN Selected,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
OUT CHAR16 **OptionString\r
)\r
;\r
UINT16\r
GetWidth (\r
IN EFI_TAG *Tag,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
;\r
\r
projects / mirror_edk2.git / commitdiff