/** @file\r
Var Check Hii bin generation.\r
\r
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
)\r
{\r
UINTN Index;\r
- for (Index = 0; Index < sizeof (mIfrOpCodeStringTable) / sizeof (mIfrOpCodeStringTable[0]); Index++) {\r
+ for (Index = 0; Index < ARRAY_SIZE (mIfrOpCodeStringTable); Index++) {\r
if (mIfrOpCodeStringTable[Index].HiiOpCode == IfrOpCode) {\r
return mIfrOpCodeStringTable[Index].HiiOpCodeStr;\r
}\r
)\r
{\r
UINTN Index;\r
- for (Index = 0; Index < sizeof (mPackageTypeStringTable) / sizeof (mPackageTypeStringTable[0]); Index++) {\r
+ for (Index = 0; Index < ARRAY_SIZE (mPackageTypeStringTable); Index++) {\r
if (mPackageTypeStringTable[Index].PackageType == PackageType) {\r
return mPackageTypeStringTable[Index].PackageTypeStr;\r
}\r
EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
EFI_IFR_VARSTORE *IfrVarStore;\r
EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;\r
+ BOOLEAN QuestionStoredInBitField;\r
\r
HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;\r
+ QuestionStoredInBitField = FALSE;\r
\r
- DEBUG ((EFI_D_INFO, " HiiPackageHeader->Type - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));\r
- DEBUG ((EFI_D_INFO, " HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));\r
+ DEBUG ((DEBUG_INFO, " HiiPackageHeader->Type - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));\r
+ DEBUG ((DEBUG_INFO, " HiiPackageHeader->Length - 0x%06x\n", HiiPackageHeader->Length));\r
\r
switch (HiiPackageHeader->Type) {\r
case EFI_HII_PACKAGE_FORMS:\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_VARSTORE_OP:\r
IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
- DEBUG ((EFI_D_INFO, " Guid - %g\n", &IfrVarStore->Guid));\r
- DEBUG ((EFI_D_INFO, " VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));\r
- DEBUG ((EFI_D_INFO, " Size - 0x%04x\n", IfrVarStore->Size));\r
- DEBUG ((EFI_D_INFO, " Name - %a\n", IfrVarStore->Name));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+ DEBUG ((DEBUG_INFO, " Guid - %g\n", &IfrVarStore->Guid));\r
+ DEBUG ((DEBUG_INFO, " VarStoreId - 0x%04x\n", IfrVarStore->VarStoreId));\r
+ DEBUG ((DEBUG_INFO, " Size - 0x%04x\n", IfrVarStore->Size));\r
+ DEBUG ((DEBUG_INFO, " Name - %a\n", IfrVarStore->Name));\r
break;\r
\r
case EFI_IFR_VARSTORE_EFI_OP:\r
IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader;\r
if (IfrEfiVarStore->Header.Length >= sizeof (EFI_IFR_VARSTORE_EFI)) {\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Length - 0x02%x\n", IfrOpCodeHeader->Length));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Scope - 0x02%x\n", IfrOpCodeHeader->Scope));\r
- DEBUG ((EFI_D_INFO, " Guid - %g\n", &IfrEfiVarStore->Guid));\r
- DEBUG ((EFI_D_INFO, " VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));\r
- DEBUG ((EFI_D_INFO, " Size - 0x%04x\n", IfrEfiVarStore->Size));\r
- DEBUG ((EFI_D_INFO, " Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));\r
- DEBUG ((EFI_D_INFO, " Name - %a\n", IfrEfiVarStore->Name));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+ DEBUG ((DEBUG_INFO, " Guid - %g\n", &IfrEfiVarStore->Guid));\r
+ DEBUG ((DEBUG_INFO, " VarStoreId - 0x%04x\n", IfrEfiVarStore->VarStoreId));\r
+ DEBUG ((DEBUG_INFO, " Size - 0x%04x\n", IfrEfiVarStore->Size));\r
+ DEBUG ((DEBUG_INFO, " Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));\r
+ DEBUG ((DEBUG_INFO, " Name - %a\n", IfrEfiVarStore->Name));\r
+ }\r
+ break;\r
+\r
+ case EFI_IFR_GUID_OP:\r
+ if (CompareGuid ((EFI_GUID *)((UINTN)IfrOpCodeHeader + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
+ QuestionStoredInBitField = TRUE;\r
}\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
case EFI_IFR_NUMERIC_OP:\r
case EFI_IFR_ORDERED_LIST_OP:\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Length - 0x02%x\n", IfrOpCodeHeader->Length));\r
- DEBUG ((EFI_D_INFO, " IfrOpCodeHeader->Scope - 0x02%x\n", IfrOpCodeHeader->Scope));\r
- DEBUG ((EFI_D_INFO, " Prompt - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));\r
- DEBUG ((EFI_D_INFO, " Help - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));\r
- DEBUG ((EFI_D_INFO, " QuestionId - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));\r
- DEBUG ((EFI_D_INFO, " VarStoreId - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));\r
- DEBUG ((EFI_D_INFO, " VarStoreInfo - 0x%04x\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->OpCode - 0x%02x (%a) (%a)\n", IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode), (QuestionStoredInBitField? "bit level": "byte level")));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Length - 0x%02x\n", IfrOpCodeHeader->Length));\r
+ DEBUG ((DEBUG_INFO, " IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+ DEBUG ((DEBUG_INFO, " Prompt - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt));\r
+ DEBUG ((DEBUG_INFO, " Help - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help));\r
+ DEBUG ((DEBUG_INFO, " QuestionId - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.QuestionId));\r
+ DEBUG ((DEBUG_INFO, " VarStoreId - 0x%04x\n", ((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId));\r
+ DEBUG ((DEBUG_INFO, " VarStoreInfo - 0x%04x (%a)\n", ((EFI_IFR_ONE_OF * )IfrOpCodeHeader)->Question.VarStoreInfo.VarOffset, (QuestionStoredInBitField? "bit level": "byte level")));\r
{\r
EFI_IFR_ONE_OF *IfrOneOf;\r
EFI_IFR_CHECKBOX *IfrCheckBox;\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", IfrOneOf->Flags));\r
- switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
- case EFI_IFR_NUMERIC_SIZE_1:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%02x\n", IfrOneOf->data.u8.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%02x\n", IfrOneOf->data.u8.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%02x\n", IfrOneOf->data.u8.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_2:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%04x\n", IfrOneOf->data.u16.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%04x\n", IfrOneOf->data.u16.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%04x\n", IfrOneOf->data.u16.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_4:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%08x\n", IfrOneOf->data.u32.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%08x\n", IfrOneOf->data.u32.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%08x\n", IfrOneOf->data.u32.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_8:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%016lx\n", IfrOneOf->data.u64.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%016lx\n", IfrOneOf->data.u64.Step));\r
- break;\r
+ DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrOneOf->Flags));\r
+ if (QuestionStoredInBitField) {\r
+ //\r
+ // For OneOf stored in bit field, the option value are saved as UINT32 type.\r
+ //\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%08x\n", IfrOneOf->data.u32.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%08x\n", IfrOneOf->data.u32.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%08x\n", IfrOneOf->data.u32.Step));\r
+ } else {\r
+ switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%02x\n", IfrOneOf->data.u8.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%02x\n", IfrOneOf->data.u8.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%02x\n", IfrOneOf->data.u8.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%04x\n", IfrOneOf->data.u16.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%04x\n", IfrOneOf->data.u16.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%04x\n", IfrOneOf->data.u16.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%08x\n", IfrOneOf->data.u32.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%08x\n", IfrOneOf->data.u32.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%08x\n", IfrOneOf->data.u32.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%016lx\n", IfrOneOf->data.u64.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%016lx\n", IfrOneOf->data.u64.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%016lx\n", IfrOneOf->data.u64.Step));\r
+ break;\r
+ }\r
}\r
break;\r
case EFI_IFR_CHECKBOX_OP:\r
IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", IfrCheckBox->Flags));\r
+ DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrCheckBox->Flags));\r
break;\r
case EFI_IFR_NUMERIC_OP:\r
IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", IfrNumeric->Flags));\r
- switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
- case EFI_IFR_NUMERIC_SIZE_1:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%02x\n", IfrNumeric->data.u8.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%02x\n", IfrNumeric->data.u8.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%02x\n", IfrNumeric->data.u8.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_2:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%04x\n", IfrNumeric->data.u16.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%04x\n", IfrNumeric->data.u16.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%04x\n", IfrNumeric->data.u16.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_4:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%08x\n", IfrNumeric->data.u32.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%08x\n", IfrNumeric->data.u32.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%08x\n", IfrNumeric->data.u32.Step));\r
- break;\r
- case EFI_IFR_NUMERIC_SIZE_8:\r
- DEBUG ((EFI_D_INFO, " MinValue - 0x%016lx\n", IfrNumeric->data.u64.MinValue));\r
- DEBUG ((EFI_D_INFO, " MaxValue - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));\r
- DEBUG ((EFI_D_INFO, " Step - 0x%016lx\n", IfrNumeric->data.u64.Step));\r
- break;\r
+ DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrNumeric->Flags));\r
+ if (QuestionStoredInBitField) {\r
+ //\r
+ // For Numeric stored in bit field, the MinValue,MaxValue and Step are saved as UINT32 type.\r
+ //\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%08x\n", IfrNumeric->data.u32.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%08x\n", IfrNumeric->data.u32.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%08x\n", IfrNumeric->data.u32.Step));\r
+ } else {\r
+ switch (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%02x\n", IfrNumeric->data.u8.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%02x\n", IfrNumeric->data.u8.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%02x\n", IfrNumeric->data.u8.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%04x\n", IfrNumeric->data.u16.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%04x\n", IfrNumeric->data.u16.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%04x\n", IfrNumeric->data.u16.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%08x\n", IfrNumeric->data.u32.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%08x\n", IfrNumeric->data.u32.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%08x\n", IfrNumeric->data.u32.Step));\r
+ break;\r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ DEBUG ((DEBUG_INFO, " MinValue - 0x%016lx\n", IfrNumeric->data.u64.MinValue));\r
+ DEBUG ((DEBUG_INFO, " MaxValue - 0x%016lx\n", IfrNumeric->data.u64.MaxValue));\r
+ DEBUG ((DEBUG_INFO, " Step - 0x%016lx\n", IfrNumeric->data.u64.Step));\r
+ break;\r
+ }\r
}\r
break;\r
case EFI_IFR_ORDERED_LIST_OP:\r
IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, " MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));\r
- DEBUG ((EFI_D_INFO, " Flags - 0x%02x\n", IfrOrderedList->Flags));\r
+ DEBUG ((DEBUG_INFO, " MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));\r
+ DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrOrderedList->Flags));\r
break;\r
default:\r
break;\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OPTION_OP:\r
IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *)IfrOpCodeHeader;\r
- DEBUG ((EFI_D_INFO, "!!!! IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
- DEBUG ((EFI_D_INFO, "!!!! IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
- DEBUG ((EFI_D_INFO, "!!!! Option - 0x%04x\n", IfrOneOfOption->Option));\r
- DEBUG ((EFI_D_INFO, "!!!! Flags - 0x%02x\n", IfrOneOfOption->Flags));\r
- DEBUG ((EFI_D_INFO, "!!!! Type - 0x%02x\n", IfrOneOfOption->Type));\r
+ DEBUG ((DEBUG_INFO, "!!!! IfrOpCodeHeader->OpCode - 0x%02x (%a)\n", (UINTN)IfrOpCodeHeader->OpCode, IfrOpCodeToStr (IfrOpCodeHeader->OpCode)));\r
+ DEBUG ((DEBUG_INFO, "!!!! IfrOpCodeHeader->Scope - 0x%02x\n", IfrOpCodeHeader->Scope));\r
+ DEBUG ((DEBUG_INFO, "!!!! Option - 0x%04x\n", IfrOneOfOption->Option));\r
+ DEBUG ((DEBUG_INFO, "!!!! Flags - 0x%02x\n", IfrOneOfOption->Flags));\r
+ DEBUG ((DEBUG_INFO, "!!!! Type - 0x%02x\n", IfrOneOfOption->Type));\r
switch (IfrOneOfOption->Type) {\r
case EFI_IFR_TYPE_NUM_SIZE_8:\r
- DEBUG ((EFI_D_INFO, "!!!! Value - 0x%02x\n", IfrOneOfOption->Value.u8));\r
+ DEBUG ((DEBUG_INFO, "!!!! Value - 0x%02x\n", IfrOneOfOption->Value.u8));\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_16:\r
- DEBUG ((EFI_D_INFO, "!!!! Value - 0x%04x\n", IfrOneOfOption->Value.u16));\r
+ DEBUG ((DEBUG_INFO, "!!!! Value - 0x%04x\n", IfrOneOfOption->Value.u16));\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_32:\r
- DEBUG ((EFI_D_INFO, "!!!! Value - 0x%08x\n", IfrOneOfOption->Value.u32));\r
+ DEBUG ((DEBUG_INFO, "!!!! Value - 0x%08x\n", IfrOneOfOption->Value.u32));\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_64:\r
- DEBUG ((EFI_D_INFO, "!!!! Value - 0x%016lx\n", IfrOneOfOption->Value.u64));\r
+ DEBUG ((DEBUG_INFO, "!!!! Value - 0x%016lx\n", IfrOneOfOption->Value.u64));\r
break;\r
case EFI_IFR_TYPE_BOOLEAN:\r
- DEBUG ((EFI_D_INFO, "!!!! Value - 0x%02x\n", IfrOneOfOption->Value.b));\r
+ DEBUG ((DEBUG_INFO, "!!!! Value - 0x%02x\n", IfrOneOfOption->Value.b));\r
break;\r
default:\r
break;\r
}\r
\r
if (IfrOpCodeHeader->OpCode == EFI_IFR_END_OP) {\r
+ QuestionStoredInBitField = FALSE;\r
ASSERT (Scope > 0);\r
Scope--;\r
if (Scope == 0) {\r
EFI_HII_PACKAGE_LIST_HEADER *HiiPackageListHeader;\r
EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
\r
- DEBUG ((EFI_D_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));\r
+ DEBUG ((DEBUG_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));\r
HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase;\r
\r
while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabaseSize)) {\r
- DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));\r
- DEBUG ((EFI_D_INFO, "HiiPackageListHeader->PackageLength - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));\r
+ DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageListGuid - %g\n", &HiiPackageListHeader->PackageListGuid));\r
+ DEBUG ((DEBUG_INFO, "HiiPackageListHeader->PackageLength - 0x%x\n", (UINTN)HiiPackageListHeader->PackageLength));\r
HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)(HiiPackageListHeader + 1);\r
\r
while ((UINTN) HiiPackageHeader < (UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength) {\r
UINT8 *Ptr;\r
UINT8 *Ptr1;\r
UINT8 *Ptr2;\r
+ UINTN ArrayIndex;\r
\r
//\r
// Hii Question from Hii Database has high priority.\r
return;\r
}\r
\r
- HiiQuestion1 = HiiVariableNode->HiiQuestionArray[HiiQuestion->VarOffset];\r
+ if (HiiQuestion->BitFieldStore) {\r
+ ArrayIndex = HiiQuestion->VarOffset;\r
+ } else {\r
+ ArrayIndex = HiiQuestion->VarOffset * 8;\r
+ }\r
+\r
+ HiiQuestion1 = HiiVariableNode->HiiQuestionArray[ArrayIndex];\r
HiiQuestion2 = HiiQuestion;\r
\r
ASSERT ((HiiQuestion1->OpCode == HiiQuestion2->OpCode) && (HiiQuestion1->StorageWidth == HiiQuestion2->StorageWidth));\r
\r
switch (HiiQuestion1->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+ DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\r
//\r
// Get the length of Hii Question 1.\r
//\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
- HiiVariableNode->HiiQuestionArray[HiiQuestion1->VarOffset] = NewHiiQuestion;\r
+ HiiVariableNode->HiiQuestionArray[ArrayIndex] = NewHiiQuestion;\r
InternalVarCheckFreePool (HiiQuestion1);\r
}\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
- DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+ DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\r
break;\r
\r
case EFI_IFR_NUMERIC_OP:\r
- DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+ DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\r
//\r
// Get minimum and maximum of Hii Question 1.\r
//\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
- DEBUG ((EFI_D_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
+ DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ORDERED_LIST_OP VarOffset = 0x%04x\n", HiiQuestion1->VarOffset));\r
//\r
// Get the length of Hii Question 1.\r
//\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
- HiiVariableNode->HiiQuestionArray[HiiQuestion1->VarOffset] = NewHiiQuestion;\r
+ HiiVariableNode->HiiQuestionArray[ArrayIndex] = NewHiiQuestion;\r
InternalVarCheckFreePool (HiiQuestion1);\r
}\r
break;\r
Parse Hii Question Oneof.\r
\r
@param[in] IfrOpCodeHeader Pointer to Ifr OpCode header.\r
+ @param[in] StoredInBitField Whether the OneOf is stored in bit field Storage.\r
\r
return Pointer to Hii Question.\r
\r
**/\r
VAR_CHECK_HII_QUESTION_HEADER *\r
ParseHiiQuestionOneOf (\r
- IN EFI_IFR_OP_HEADER *IfrOpCodeHeader\r
+ IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
+ IN BOOLEAN StoredInBitField\r
)\r
{\r
EFI_IFR_ONE_OF *IfrOneOf;\r
UINT8 Width;\r
UINTN OptionCount;\r
UINT8 OptionWidth;\r
+ UINT8 BitWidth;\r
\r
IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;\r
+ BitWidth = 0;\r
\r
- Width = (UINT8) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ if (StoredInBitField) {\r
+ //\r
+ // When OneOf stored in bit field, the bit width is saved in the lower six bits of the flag.\r
+ // And the options in the OneOf is saved as UINT32 type.\r
+ //\r
+ BitWidth = IfrOneOf->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+ Width = sizeof (UINT32);\r
+ } else {\r
+ Width = (UINT8) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ }\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, NULL);\r
ASSERT (Width == OptionWidth);\r
\r
OneOf = InternalVarCheckAllocateZeroPool (Length);\r
ASSERT (OneOf != NULL);\r
- OneOf->OpCode = EFI_IFR_ONE_OF_OP;\r
- OneOf->Length = (UINT8) Length;\r
- OneOf->VarOffset = IfrOneOf->Question.VarStoreInfo.VarOffset;\r
- OneOf->StorageWidth = Width;\r
+ OneOf->OpCode = EFI_IFR_ONE_OF_OP;\r
+ OneOf->Length = (UINT8) Length;\r
+ OneOf->VarOffset = IfrOneOf->Question.VarStoreInfo.VarOffset;\r
+ OneOf->BitFieldStore = StoredInBitField;\r
+ if (StoredInBitField) {\r
+ OneOf->StorageWidth = BitWidth;\r
+ } else {\r
+ OneOf->StorageWidth = Width;\r
+ }\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, OneOf + 1);\r
\r
Parse Hii Question CheckBox.\r
\r
@param[in] IfrOpCodeHeader Pointer to Ifr OpCode header.\r
+ @param[in] StoredInBitField Whether the CheckBox is stored in bit field Storage.\r
\r
return Pointer to Hii Question.\r
\r
**/\r
VAR_CHECK_HII_QUESTION_HEADER *\r
ParseHiiQuestionCheckBox (\r
- IN EFI_IFR_OP_HEADER *IfrOpCodeHeader\r
+ IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
+ IN BOOLEAN StoredInBitField\r
)\r
{\r
EFI_IFR_CHECKBOX *IfrCheckBox;\r
\r
CheckBox = InternalVarCheckAllocateZeroPool (sizeof (*CheckBox));\r
ASSERT (CheckBox != NULL);\r
- CheckBox->OpCode = EFI_IFR_CHECKBOX_OP;\r
- CheckBox->Length = (UINT8) sizeof (*CheckBox);;\r
- CheckBox->VarOffset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
- CheckBox->StorageWidth = (UINT8) sizeof (BOOLEAN);\r
+ CheckBox->OpCode = EFI_IFR_CHECKBOX_OP;\r
+ CheckBox->Length = (UINT8) sizeof (*CheckBox);;\r
+ CheckBox->VarOffset = IfrCheckBox->Question.VarStoreInfo.VarOffset;\r
+ CheckBox->BitFieldStore = StoredInBitField;\r
+ if (StoredInBitField) {\r
+ CheckBox->StorageWidth = 1;\r
+ } else {\r
+ CheckBox->StorageWidth = (UINT8) sizeof (BOOLEAN);\r
+ }\r
\r
return (VAR_CHECK_HII_QUESTION_HEADER *) CheckBox;\r
}\r
Parse Hii Question Numeric.\r
\r
@param[in] IfrOpCodeHeader Pointer to Ifr OpCode header.\r
+ @param[in] StoredInBitField Whether the Numeric is stored in bit field Storage.\r
\r
return Pointer to Hii Question.\r
\r
**/\r
VAR_CHECK_HII_QUESTION_HEADER *\r
ParseHiiQuestionNumeric (\r
- IN EFI_IFR_OP_HEADER *IfrOpCodeHeader\r
+ IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
+ IN BOOLEAN StoredInBitField\r
)\r
{\r
EFI_IFR_NUMERIC *IfrNumeric;\r
VAR_CHECK_HII_QUESTION_NUMERIC *Numeric;\r
UINT8 Width;\r
+ UINT8 BitWidth;\r
\r
IfrNumeric = (EFI_IFR_NUMERIC *) IfrOpCodeHeader;\r
+ BitWidth = 0;\r
\r
Numeric = InternalVarCheckAllocateZeroPool (sizeof (VAR_CHECK_HII_QUESTION_NUMERIC) + 2 * sizeof (UINT64));\r
ASSERT (Numeric != NULL);\r
\r
- Width = (UINT8) (1 << (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ if (StoredInBitField) {\r
+ //\r
+ // When Numeric stored in bit field, the bit field width is saved in the lower six bits of the flag.\r
+ // And the Minimum Maximum of Numeric is saved as UINT32 type.\r
+ //\r
+ BitWidth = IfrNumeric->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+ Width = sizeof (UINT32);\r
+ } else {\r
+ Width = (UINT8) (1 << (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ }\r
\r
- Numeric->OpCode = EFI_IFR_NUMERIC_OP;\r
- Numeric->Length = (UINT8) (sizeof (VAR_CHECK_HII_QUESTION_NUMERIC) + 2 * Width);\r
- Numeric->VarOffset = IfrNumeric->Question.VarStoreInfo.VarOffset;\r
- Numeric->StorageWidth = Width;\r
+ Numeric->OpCode = EFI_IFR_NUMERIC_OP;\r
+ Numeric->Length = (UINT8) (sizeof (VAR_CHECK_HII_QUESTION_NUMERIC) + 2 * Width);\r
+ Numeric->VarOffset = IfrNumeric->Question.VarStoreInfo.VarOffset;\r
+ Numeric->BitFieldStore = StoredInBitField;\r
+ if (StoredInBitField) {\r
+ Numeric->StorageWidth = BitWidth;\r
+ } else {\r
+ Numeric->StorageWidth = Width;\r
+ }\r
\r
CopyMem (Numeric + 1, &IfrNumeric->data, Width * 2);\r
\r
OrderedList->VarOffset = IfrOrderedList->Question.VarStoreInfo.VarOffset;\r
OrderedList->StorageWidth = OptionWidth;\r
OrderedList->MaxContainers = IfrOrderedList->MaxContainers;\r
+ OrderedList->BitFieldStore = FALSE;\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, OrderedList + 1);\r
\r
@param[in] HiiVariableNode Pointer to Hii Variable node.\r
@param[in] IfrOpCodeHeader Pointer to Ifr OpCode header.\r
@param[in] FromFv Hii Question from FV.\r
+ @param[in] StoredInBitField Whether the Question is stored in bit field Storage.\r
\r
**/\r
VOID\r
ParseHiiQuestion (\r
IN VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode,\r
IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
- IN BOOLEAN FromFv\r
+ IN BOOLEAN FromFv,\r
+ IN BOOLEAN StoredInBitField\r
)\r
{\r
VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
+ UINTN ArrayIndex;\r
\r
+ //\r
+ // Currently only OneOf, CheckBox and Numeric can be stored in bit field.\r
+ //\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- HiiQuestion = ParseHiiQuestionOneOf (IfrOpCodeHeader);\r
+ HiiQuestion = ParseHiiQuestionOneOf (IfrOpCodeHeader, StoredInBitField);\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
- HiiQuestion = ParseHiiQuestionCheckBox (IfrOpCodeHeader);\r
+ HiiQuestion = ParseHiiQuestionCheckBox (IfrOpCodeHeader, StoredInBitField);\r
break;\r
\r
case EFI_IFR_NUMERIC_OP:\r
- HiiQuestion = ParseHiiQuestionNumeric (IfrOpCodeHeader);\r
+ HiiQuestion = ParseHiiQuestionNumeric (IfrOpCodeHeader, StoredInBitField);\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
break;\r
}\r
\r
- if (HiiVariableNode->HiiQuestionArray[HiiQuestion->VarOffset] != NULL) {\r
+ if (StoredInBitField) {\r
+ ArrayIndex = HiiQuestion->VarOffset;\r
+ } else {\r
+ ArrayIndex = HiiQuestion->VarOffset * 8;\r
+ }\r
+ if (HiiVariableNode->HiiQuestionArray[ArrayIndex] != NULL) {\r
MergeHiiQuestion (HiiVariableNode, HiiQuestion, FromFv);\r
} else {\r
- HiiVariableNode->HiiQuestionArray[HiiQuestion->VarOffset] = HiiQuestion;\r
+ HiiVariableNode->HiiQuestionArray[ArrayIndex] = HiiQuestion;\r
}\r
}\r
\r
// The variable store identifier, which is unique within the current form set.\r
//\r
HiiVariableNode->VarStoreId = IfrEfiVarStore->VarStoreId;\r
- HiiVariableNode->HiiQuestionArray = InternalVarCheckAllocateZeroPool (IfrEfiVarStore->Size * sizeof (VAR_CHECK_HII_QUESTION_HEADER *));\r
+ HiiVariableNode->HiiQuestionArray = InternalVarCheckAllocateZeroPool (IfrEfiVarStore->Size * 8 * sizeof (VAR_CHECK_HII_QUESTION_HEADER *));\r
\r
InsertTailList (&mVarCheckHiiList, &HiiVariableNode->Link);\r
} else {\r
EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ BOOLEAN QuestionStoredInBitField;\r
\r
//\r
// Parse and create Hii Variable node list for this Hii Package.\r
\r
HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;\r
\r
+ QuestionStoredInBitField = FALSE;\r
+\r
switch (HiiPackageHeader->Type) {\r
case EFI_HII_PACKAGE_FORMS:\r
IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) (HiiPackageHeader + 1);\r
\r
while ((UINTN) IfrOpCodeHeader < (UINTN) HiiPackageHeader + HiiPackageHeader->Length) {\r
switch (IfrOpCodeHeader->OpCode) {\r
+ case EFI_IFR_GUID_OP:\r
+ if (CompareGuid ((EFI_GUID *)((UINTN)IfrOpCodeHeader + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
+ QuestionStoredInBitField = TRUE;\r
+ }\r
+ break;\r
+\r
+ case EFI_IFR_END_OP:\r
+ QuestionStoredInBitField = FALSE;\r
+ break;\r
+\r
case EFI_IFR_ONE_OF_OP:\r
case EFI_IFR_CHECKBOX_OP:\r
case EFI_IFR_NUMERIC_OP:\r
//\r
// Normal IFR\r
//\r
- ParseHiiQuestion (HiiVariableNode, IfrOpCodeHeader, FromFv);\r
+ ParseHiiQuestion (HiiVariableNode, IfrOpCodeHeader, FromFv, QuestionStoredInBitField);\r
}\r
default:\r
break;\r
\r
while ((UINTN) HiiPackageHeader < ((UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength)) {\r
//\r
- // Parse Hii Pacakge.\r
+ // Parse Hii Package.\r
//\r
VarCheckParseHiiPackage (HiiPackageHeader, FALSE);\r
\r
//\r
// Free the allocated buffer.\r
//\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size; Index++) {\r
+ for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; Index++) {\r
if (HiiVariableNode->HiiQuestionArray[Index] != NULL) {\r
InternalVarCheckFreePool (HiiVariableNode->HiiQuestionArray[Index]);\r
}\r
HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (HiiVariableLink);\r
HiiVariableLength = HiiVariableNode->HiiVariable->HeaderLength;\r
\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size; Index++) {\r
+ for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; Index++) {\r
if (HiiVariableNode->HiiQuestionArray[Index] != NULL) {\r
//\r
// For Hii Question header align.\r
BinSize += HiiVariableLength;\r
}\r
\r
- DEBUG ((EFI_D_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));\r
if (BinSize == 0) {\r
*Size = BinSize;\r
return NULL;\r
//\r
Data = AllocateRuntimeZeroPool (BinSize);\r
ASSERT (Data != NULL);\r
- DEBUG ((EFI_D_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));\r
+ //\r
+ // Make sure the allocated buffer for VarCheckHiiBin at required alignment.\r
+ //\r
+ ASSERT ((((UINTN) Data) & (HEADER_ALIGNMENT - 1)) == 0);\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));\r
\r
//\r
// Gen Data\r
CopyMem (Ptr, HiiVariableNode->HiiVariable, HiiVariableNode->HiiVariable->HeaderLength);\r
Ptr += HiiVariableNode->HiiVariable->HeaderLength;\r
\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size; Index++) {\r
+ for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; Index++) {\r
if (HiiVariableNode->HiiQuestionArray[Index] != NULL) {\r
//\r
// For Hii Question header align.\r
\r
mVarCheckHiiBin = BuildVarCheckHiiBin (&mVarCheckHiiBinSize);\r
if (mVarCheckHiiBin == NULL) {\r
- DEBUG ((EFI_D_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));\r
+ DEBUG ((DEBUG_INFO, "[VarCheckHii] This driver could be removed from *.dsc and *.fdf\n"));\r
return;\r
}\r
\r
projects / mirror_edk2.git / blobdiff