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
projects / mirror_edk2.git / blobdiff