#include "HiiDatabase.h"\r
#include "UefiIfrDefault.h"\r
\r
-typedef struct {\r
- UINT8 *Buffer;\r
- UINTN BufferSize;\r
- UINTN Position;\r
-} HII_LIB_OPCODE_BUFFER;\r
-\r
/**\r
The dynamic creation of these opcodes is supported in Framework HII modules.\r
Therefore, Framework HII Thunk module only map these opcode between Framework\r
}\r
}\r
\r
- *UefiOp = (UINT8) (FRAMEWORK_EFI_IFR_LAST_OPCODE + 1);\r
+ *UefiOp = (UINT8) (EFI_IFR_LAST_OPCODE + 1);\r
return EFI_NOT_FOUND;\r
}\r
\r
return EFI_NOT_FOUND;\r
}\r
\r
-\r
-\r
-#define HII_LIB_OPCODE_ALLOCATION_SIZE 0x200\r
-\r
-/**\r
- Append raw opcodes to an OpCodeHandle.\r
-\r
- If OpCodeHandle is NULL, then ASSERT().\r
- If RawBuffer is NULL, then ASSERT();\r
-\r
- @param[in] OpCodeHandle Handle to the buffer of opcodes.\r
- @param[in] RawBuffer Buffer of opcodes to append.\r
- @param[in] RawBufferSize The size, in bytes, of Buffer.\r
-\r
- @retval NULL There is not enough space left in Buffer to add the opcode.\r
- @retval Other A pointer to the appended opcodes.\r
-\r
-**/\r
-UINT8 *\r
-EFIAPI\r
-HiiThunkCreateRawOpCodes (\r
- IN VOID *OpCodeHandle,\r
- IN UINT8 *RawBuffer,\r
- IN UINTN RawBufferSize\r
- )\r
-{\r
- UINT8 *Buffer;\r
- HII_LIB_OPCODE_BUFFER *OpCodeBuffer;\r
-\r
- ASSERT (RawBuffer != NULL);\r
- ASSERT (OpCodeHandle != NULL);\r
-\r
- OpCodeBuffer = (HII_LIB_OPCODE_BUFFER *)OpCodeHandle;\r
- if (OpCodeBuffer->Position + RawBufferSize > OpCodeBuffer->BufferSize) {\r
- Buffer = ReallocatePool (\r
- OpCodeBuffer->BufferSize, \r
- OpCodeBuffer->BufferSize + (RawBufferSize + HII_LIB_OPCODE_ALLOCATION_SIZE),\r
- OpCodeBuffer->Buffer\r
- );\r
- if (Buffer == NULL) {\r
- return NULL;\r
- }\r
- OpCodeBuffer->Buffer = Buffer;\r
- OpCodeBuffer->BufferSize += (RawBufferSize + HII_LIB_OPCODE_ALLOCATION_SIZE);\r
- }\r
- Buffer = OpCodeBuffer->Buffer + OpCodeBuffer->Position;\r
- OpCodeBuffer->Position += RawBufferSize;\r
- \r
- return (UINT8 *)CopyMem (Buffer, RawBuffer, RawBufferSize);\r
-}\r
-\r
/**\r
Assign a Question ID.\r
\r
{\r
EFI_IFR_TEXT UTextOpCode;\r
\r
- if ((FwOpcode->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) == 0) {\r
+ if ((FwOpcode->Flags & EFI_IFR_FLAG_INTERACTIVE) == 0) {\r
ZeroMem (&UTextOpCode, sizeof(UTextOpCode));\r
\r
UTextOpCode.Header.OpCode = EFI_IFR_TEXT_OP;\r
UTextOpCode.Statement.Prompt = FwOpcode->Text;\r
UTextOpCode.TextTwo = FwOpcode->TextTwo;\r
\r
- return HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UTextOpCode, sizeof(UTextOpCode));\r
+ return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UTextOpCode, sizeof(UTextOpCode));\r
} else {\r
//\r
// Iteractive Text Opcode is EFI_IFR_ACTION\r
UOpcode.FormId = FwOpcode->FormId;\r
\r
//\r
- // We only map FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE and FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED to \r
+ // We only map EFI_IFR_FLAG_INTERACTIVE and EFI_IFR_FLAG_RESET_REQUIRED to \r
// UEFI IFR Opcode flags. The rest flags are obsolete.\r
//\r
- UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+ UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
- return HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
}\r
\r
/**\r
CopyMem (&UOpcode.Value.u8, &FwOpcode->Value, Width);\r
\r
//\r
- // #define FRAMEWORK_EFI_IFR_FLAG_DEFAULT 0x01\r
- // #define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING 0x02\r
+ // #define EFI_IFR_FLAG_DEFAULT 0x01\r
+ // #define EFI_IFR_FLAG_MANUFACTURING 0x02\r
// #define EFI_IFR_OPTION_DEFAULT 0x10\r
// #define EFI_IFR_OPTION_DEFAULT_MFG 0x20\r
//\r
- UOpcode.Flags = (UINT8) (UOpcode.Flags | (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) << 4);\r
+ UOpcode.Flags = (UINT8) (UOpcode.Flags | (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING)) << 4);\r
\r
switch (Width) {\r
case 1:\r
return NULL;\r
}\r
\r
- return HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
}\r
\r
/**\r
@param ThunkContext The HII Thunk Context.\r
@param FwOpcode The input Framework Opcode.\r
@param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r
- @param NextFwOpcode Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of\r
+ @param NextFwOpcode Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of\r
the "One Of Option".\r
@param OpcodeCount The number of Opcode for the complete Framework "One Of" Opcode.\r
\r
// Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
//\r
FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
- while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+ while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r
ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
\r
FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
- if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
+ if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
\r
if (UOpcode.Question.QuestionId == 0) {\r
\r
}\r
\r
- if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) {\r
+ if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r
UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
}\r
\r
}\r
}\r
\r
- OneOfOpCodeBuffer = HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof (UOpcode));\r
+ OneOfOpCodeBuffer = HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof (UOpcode));\r
if (OneOfOpCodeBuffer == NULL) {\r
return NULL;\r
}\r
// Go over again the Framework IFR binary to build the UEFI One Of Option opcodes.\r
//\r
FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
- while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+ while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r
\r
FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
\r
@param ThunkContext The HII Thunk Context.\r
@param FwOpcode The input Framework Opcode.\r
@param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r
- @param NextFwOpcode Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of\r
+ @param NextFwOpcode Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of\r
the "Ordered List".\r
@param OpcodeCount The number of Opcode for the complete Framework "Ordered List" Opcode.\r
\r
// Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
//\r
FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
- while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+ while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r
ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
\r
FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
- if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
+ if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
\r
if (UOpcode.Question.QuestionId == 0) {\r
}\r
}\r
\r
- if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) {\r
+ if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r
UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
}\r
\r
}\r
}\r
\r
- OrderListOpCode = HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ OrderListOpCode = HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
if (OrderListOpCode == NULL) {\r
return NULL;\r
}\r
*OpcodeCount += 1;\r
\r
FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
- while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+ while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r
//\r
// Each entry of Order List in Framework HII is always 1 byte in size\r
//\r
\r
//\r
// We map 2 flags:\r
- // FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE, \r
- // FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED,\r
+ // EFI_IFR_FLAG_INTERACTIVE, \r
+ // EFI_IFR_FLAG_RESET_REQUIRED,\r
// to UEFI IFR Opcode Question flags. The rest flags are obsolete.\r
//\r
- UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+ UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
\r
UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId;\r
\r
//\r
// We also map these 2 flags:\r
- // FRAMEWORK_EFI_IFR_FLAG_DEFAULT, \r
- // FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING,\r
+ // EFI_IFR_FLAG_DEFAULT, \r
+ // EFI_IFR_FLAG_MANUFACTURING,\r
// to UEFI IFR CheckBox Opcode default flags.\r
//\r
- UOpcode.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING));\r
+ UOpcode.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING));\r
\r
- return HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
}\r
\r
\r
UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId;\r
UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
\r
- UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+ UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
//\r
// Framework Numeric values are all in UINT16 and displayed as decimal.\r
}\r
}\r
\r
- NumbericOpCode = HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ NumbericOpCode = HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
if (NumbericOpCode == NULL) {\r
return NULL;\r
}\r
\r
CopyMem (&UOpcodeDefault.Value.u8, &FwOpcode->Default, FwOpcode->Width);\r
\r
- OpcodeBuffer = HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcodeDefault, sizeof(UOpcodeDefault));\r
+ OpcodeBuffer = HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcodeDefault, sizeof(UOpcodeDefault));\r
if (OpcodeBuffer == NULL) {\r
return NULL;\r
}\r
UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r
UOpcode.Question.Header.Help = FwOpcode->Help;\r
\r
- UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+ UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId;\r
UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
UOpcode.MaxSize = FwOpcode->MaxSize;\r
UOpcode.Flags = EFI_IFR_STRING_MULTI_LINE;\r
\r
- return HiiThunkCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
+ return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
}\r
\r
/**\r
**/\r
UINT8 *\r
F2UCreateBannerOpCode (\r
- IN OUT VOID *UefiUpdateDataHandle,\r
- IN CONST FRAMEWORK_EFI_IFR_BANNER *FwOpcode\r
+ IN OUT VOID *UefiUpdateDataHandle,\r
+ IN CONST EFI_IFR_BANNER *FwOpcode\r
)\r
{\r
EFI_IFR_GUID_BANNER *UOpcode;\r
**/\r
EFI_STATUS \r
FwUpdateDataToUefiUpdateData (\r
- IN HII_THUNK_CONTEXT *ThunkContext,\r
- IN CONST FRAMEWORK_EFI_HII_UPDATE_DATA *FwUpdateData,\r
- IN VOID *UefiOpCodeHandle\r
+ IN HII_THUNK_CONTEXT *ThunkContext,\r
+ IN CONST EFI_HII_UPDATE_DATA *FwUpdateData,\r
+ IN VOID *UefiOpCodeHandle\r
)\r
{\r
FRAMEWORK_EFI_IFR_OP_HEADER *FwOpCode;\r
DataCount = 1;\r
break;\r
\r
- case FRAMEWORK_EFI_IFR_BANNER_OP:\r
- OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (FRAMEWORK_EFI_IFR_BANNER *) FwOpCode); \r
+ case EFI_IFR_BANNER_OP:\r
+ OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (EFI_IFR_BANNER *) FwOpCode); \r
DataCount = 1;\r
break;\r
\r
- case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:\r
+ case EFI_IFR_END_ONE_OF_OP:\r
OpCodeBuffer = HiiCreateEndOpCode (UefiOpCodeHandle);\r
DataCount = 1;\r
break;\r
projects / mirror_edk2.git / blobdiff