\r
#include "VarCheckHiiGen.h"\r
\r
-LIST_ENTRY mVarCheckHiiList = INITIALIZE_LIST_HEAD_VARIABLE (mVarCheckHiiList);\r
+LIST_ENTRY mVarCheckHiiList = INITIALIZE_LIST_HEAD_VARIABLE (mVarCheckHiiList);\r
\r
-#define VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE SIGNATURE_32 ('V', 'C', 'H', 'V')\r
+#define VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE SIGNATURE_32 ('V', 'C', 'H', 'V')\r
\r
typedef struct {\r
- UINTN Signature;\r
- LIST_ENTRY Link;\r
- VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
- EFI_VARSTORE_ID VarStoreId;\r
+ UINTN Signature;\r
+ LIST_ENTRY Link;\r
+ VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
+ EFI_VARSTORE_ID VarStoreId;\r
\r
- VAR_CHECK_HII_QUESTION_HEADER **HiiQuestionArray;\r
+ VAR_CHECK_HII_QUESTION_HEADER **HiiQuestionArray;\r
} VAR_CHECK_HII_VARIABLE_NODE;\r
\r
-#define VAR_CHECK_HII_VARIABLE_FROM_LINK(a) CR (a, VAR_CHECK_HII_VARIABLE_NODE, Link, VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE)\r
+#define VAR_CHECK_HII_VARIABLE_FROM_LINK(a) CR (a, VAR_CHECK_HII_VARIABLE_NODE, Link, VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE)\r
\r
-CHAR16 *mVarName = NULL;\r
-UINTN mMaxVarNameSize = 0;\r
+CHAR16 *mVarName = NULL;\r
+UINTN mMaxVarNameSize = 0;\r
\r
#ifdef DUMP_HII_DATA\r
-GLOBAL_REMOVE_IF_UNREFERENCED VAR_CHECK_HII_OPCODE_STRING mIfrOpCodeStringTable[] = {\r
- {EFI_IFR_VARSTORE_OP, "EFI_IFR_VARSTORE_OP"},\r
- {EFI_IFR_VARSTORE_EFI_OP, "EFI_IFR_VARSTORE_EFI_OP"},\r
- {EFI_IFR_ONE_OF_OP, "EFI_IFR_ONE_OF_OP"},\r
- {EFI_IFR_CHECKBOX_OP, "EFI_IFR_CHECKBOX_OP"},\r
- {EFI_IFR_NUMERIC_OP, "EFI_IFR_NUMERIC_OP"},\r
- {EFI_IFR_ORDERED_LIST_OP, "EFI_IFR_ORDERED_LIST_OP"},\r
- {EFI_IFR_ONE_OF_OPTION_OP, "EFI_IFR_ONE_OF_OPTION_OP"},\r
+GLOBAL_REMOVE_IF_UNREFERENCED VAR_CHECK_HII_OPCODE_STRING mIfrOpCodeStringTable[] = {\r
+ { EFI_IFR_VARSTORE_OP, "EFI_IFR_VARSTORE_OP" },\r
+ { EFI_IFR_VARSTORE_EFI_OP, "EFI_IFR_VARSTORE_EFI_OP" },\r
+ { EFI_IFR_ONE_OF_OP, "EFI_IFR_ONE_OF_OP" },\r
+ { EFI_IFR_CHECKBOX_OP, "EFI_IFR_CHECKBOX_OP" },\r
+ { EFI_IFR_NUMERIC_OP, "EFI_IFR_NUMERIC_OP" },\r
+ { EFI_IFR_ORDERED_LIST_OP, "EFI_IFR_ORDERED_LIST_OP" },\r
+ { EFI_IFR_ONE_OF_OPTION_OP, "EFI_IFR_ONE_OF_OPTION_OP" },\r
};\r
\r
/**\r
)\r
{\r
UINTN Index;\r
+\r
for (Index = 0; Index < ARRAY_SIZE (mIfrOpCodeStringTable); Index++) {\r
if (mIfrOpCodeStringTable[Index].HiiOpCode == IfrOpCode) {\r
return mIfrOpCodeStringTable[Index].HiiOpCodeStr;\r
}\r
\r
GLOBAL_REMOVE_IF_UNREFERENCED VAR_CHECK_HII_PACKAGE_TYPE_STRING mPackageTypeStringTable[] = {\r
- {EFI_HII_PACKAGE_TYPE_ALL, "EFI_HII_PACKAGE_TYPE_ALL"},\r
- {EFI_HII_PACKAGE_TYPE_GUID, "EFI_HII_PACKAGE_TYPE_GUID"},\r
- {EFI_HII_PACKAGE_FORMS, "EFI_HII_PACKAGE_FORMS"},\r
- {EFI_HII_PACKAGE_STRINGS, "EFI_HII_PACKAGE_STRINGS"},\r
- {EFI_HII_PACKAGE_FONTS, "EFI_HII_PACKAGE_FONTS"},\r
- {EFI_HII_PACKAGE_IMAGES, "EFI_HII_PACKAGE_IMAGES"},\r
- {EFI_HII_PACKAGE_SIMPLE_FONTS, "EFI_HII_PACKAGE_SIMPLE_FONTS"},\r
- {EFI_HII_PACKAGE_DEVICE_PATH, "EFI_HII_PACKAGE_DEVICE_PATH"},\r
- {EFI_HII_PACKAGE_KEYBOARD_LAYOUT, "EFI_HII_PACKAGE_KEYBOARD_LAYOUT"},\r
- {EFI_HII_PACKAGE_ANIMATIONS, "EFI_HII_PACKAGE_ANIMATIONS"},\r
- {EFI_HII_PACKAGE_END, "EFI_HII_PACKAGE_END"},\r
- {EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN, "EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN"},\r
- {EFI_HII_PACKAGE_TYPE_SYSTEM_END, "EFI_HII_PACKAGE_TYPE_SYSTEM_END"},\r
+ { EFI_HII_PACKAGE_TYPE_ALL, "EFI_HII_PACKAGE_TYPE_ALL" },\r
+ { EFI_HII_PACKAGE_TYPE_GUID, "EFI_HII_PACKAGE_TYPE_GUID" },\r
+ { EFI_HII_PACKAGE_FORMS, "EFI_HII_PACKAGE_FORMS" },\r
+ { EFI_HII_PACKAGE_STRINGS, "EFI_HII_PACKAGE_STRINGS" },\r
+ { EFI_HII_PACKAGE_FONTS, "EFI_HII_PACKAGE_FONTS" },\r
+ { EFI_HII_PACKAGE_IMAGES, "EFI_HII_PACKAGE_IMAGES" },\r
+ { EFI_HII_PACKAGE_SIMPLE_FONTS, "EFI_HII_PACKAGE_SIMPLE_FONTS" },\r
+ { EFI_HII_PACKAGE_DEVICE_PATH, "EFI_HII_PACKAGE_DEVICE_PATH" },\r
+ { EFI_HII_PACKAGE_KEYBOARD_LAYOUT, "EFI_HII_PACKAGE_KEYBOARD_LAYOUT" },\r
+ { EFI_HII_PACKAGE_ANIMATIONS, "EFI_HII_PACKAGE_ANIMATIONS" },\r
+ { EFI_HII_PACKAGE_END, "EFI_HII_PACKAGE_END" },\r
+ { EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN, "EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN" },\r
+ { EFI_HII_PACKAGE_TYPE_SYSTEM_END, "EFI_HII_PACKAGE_TYPE_SYSTEM_END" },\r
};\r
\r
/**\r
IN UINT8 PackageType\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
+\r
for (Index = 0; Index < ARRAY_SIZE (mPackageTypeStringTable); Index++) {\r
if (mPackageTypeStringTable[Index].PackageType == PackageType) {\r
return mPackageTypeStringTable[Index].PackageTypeStr;\r
**/\r
VOID\r
DumpHiiPackage (\r
- IN VOID *HiiPackage\r
+ IN VOID *HiiPackage\r
)\r
{\r
- EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
- EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
- EFI_IFR_VARSTORE *IfrVarStore;\r
- EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;\r
- BOOLEAN QuestionStoredInBitField;\r
+ EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\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
+ HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)HiiPackage;\r
QuestionStoredInBitField = FALSE;\r
\r
- DEBUG ((DEBUG_INFO, " HiiPackageHeader->Type - 0x%02x (%a)\n", HiiPackageHeader->Type, HiiPackageTypeToStr ((UINT8) HiiPackageHeader->Type)));\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
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) (HiiPackageHeader + 1);\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)(HiiPackageHeader + 1);\r
\r
- while ((UINTN) IfrOpCodeHeader < ((UINTN) HiiPackageHeader + HiiPackageHeader->Length)) {\r
+ while ((UINTN)IfrOpCodeHeader < ((UINTN)HiiPackageHeader + HiiPackageHeader->Length)) {\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_VARSTORE_OP:\r
- IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpCodeHeader;\r
+ IfrVarStore = (EFI_IFR_VARSTORE *)IfrOpCodeHeader;\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
break;\r
\r
case EFI_IFR_VARSTORE_EFI_OP:\r
- IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader;\r
+ IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *)IfrOpCodeHeader;\r
if (IfrEfiVarStore->Header.Length >= sizeof (EFI_IFR_VARSTORE_EFI)) {\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, " Attributes - 0x%08x\n", IfrEfiVarStore->Attributes));\r
DEBUG ((DEBUG_INFO, " Name - %a\n", IfrEfiVarStore->Name));\r
}\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
+\r
break;\r
\r
case EFI_IFR_ONE_OF_OP:\r
case EFI_IFR_CHECKBOX_OP:\r
case EFI_IFR_NUMERIC_OP:\r
case EFI_IFR_ORDERED_LIST_OP:\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->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
+ 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
- EFI_IFR_NUMERIC *IfrNumeric;\r
- EFI_IFR_ORDERED_LIST *IfrOrderedList;\r
+ EFI_IFR_ONE_OF *IfrOneOf;\r
+ EFI_IFR_CHECKBOX *IfrCheckBox;\r
+ EFI_IFR_NUMERIC *IfrNumeric;\r
+ EFI_IFR_ORDERED_LIST *IfrOrderedList;\r
\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;\r
+ IfrOneOf = (EFI_IFR_ONE_OF *)IfrOpCodeHeader;\r
DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrOneOf->Flags));\r
if (QuestionStoredInBitField) {\r
//\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
+ 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
+\r
break;\r
case EFI_IFR_CHECKBOX_OP:\r
- IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpCodeHeader;\r
+ IfrCheckBox = (EFI_IFR_CHECKBOX *)IfrOpCodeHeader;\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
+ IfrNumeric = (EFI_IFR_NUMERIC *)IfrOpCodeHeader;\r
DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrNumeric->Flags));\r
if (QuestionStoredInBitField) {\r
//\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
+ 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
+\r
break;\r
case EFI_IFR_ORDERED_LIST_OP:\r
- IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpCodeHeader;\r
+ IfrOrderedList = (EFI_IFR_ORDERED_LIST *)IfrOpCodeHeader;\r
DEBUG ((DEBUG_INFO, " MaxContainers - 0x%02x\n", IfrOrderedList->MaxContainers));\r
DEBUG ((DEBUG_INFO, " Flags - 0x%02x\n", IfrOrderedList->Flags));\r
break;\r
}\r
\r
if (IfrOpCodeHeader->Scope != 0) {\r
- UINTN Scope;\r
- EFI_IFR_ONE_OF_OPTION *IfrOneOfOption;\r
+ UINTN Scope;\r
+ EFI_IFR_ONE_OF_OPTION *IfrOneOfOption;\r
\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
- Scope = 1;\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+ Scope = 1;\r
while (Scope != 0) {\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OPTION_OP:\r
default:\r
break;\r
}\r
+\r
break;\r
}\r
\r
} else if (IfrOpCodeHeader->Scope != 0) {\r
Scope++;\r
}\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
}\r
}\r
}\r
default:\r
break;\r
}\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
}\r
+\r
break;\r
default:\r
break;\r
**/\r
VOID\r
DumpHiiDatabase (\r
- IN VOID *HiiDatabase,\r
- IN UINTN HiiDatabaseSize\r
+ IN VOID *HiiDatabase,\r
+ IN UINTN HiiDatabaseSize\r
)\r
{\r
- EFI_HII_PACKAGE_LIST_HEADER *HiiPackageListHeader;\r
- EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
+ EFI_HII_PACKAGE_LIST_HEADER *HiiPackageListHeader;\r
+ EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
\r
DEBUG ((DEBUG_INFO, "HiiDatabaseSize - 0x%x\n", HiiDatabaseSize));\r
- HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase;\r
+ HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)HiiDatabase;\r
\r
- while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabaseSize)) {\r
+ while ((UINTN)HiiPackageListHeader < ((UINTN)HiiDatabase + HiiDatabaseSize)) {\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
-\r
+ while ((UINTN)HiiPackageHeader < (UINTN)HiiPackageListHeader + HiiPackageListHeader->PackageLength) {\r
DumpHiiPackage (HiiPackageHeader);\r
\r
- HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) ((UINTN) HiiPackageHeader + HiiPackageHeader->Length);\r
+ HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)((UINTN)HiiPackageHeader + HiiPackageHeader->Length);\r
}\r
\r
- HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) ((UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength);\r
+ HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)((UINTN)HiiPackageListHeader + HiiPackageListHeader->PackageLength);\r
}\r
\r
- return ;\r
+ return;\r
}\r
+\r
#endif\r
\r
/**\r
if (EFI_ERROR (Status)) {\r
Memory = NULL;\r
}\r
+\r
return Memory;\r
}\r
\r
**/\r
VOID *\r
InternalVarCheckAllocateZeroPool (\r
- IN UINTN AllocationSize\r
+ IN UINTN AllocationSize\r
)\r
{\r
VOID *Memory;\r
if (Memory != NULL) {\r
Memory = ZeroMem (Memory, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
VOID\r
EFIAPI\r
InternalVarCheckFreePool (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = gBS->FreePool (Buffer);\r
ASSERT_EFI_ERROR (Status);\r
**/\r
VOID *\r
InternalVarCheckReallocatePool (\r
- IN UINTN OldSize,\r
- IN UINTN NewSize,\r
- IN VOID *OldBuffer OPTIONAL\r
+ IN UINTN OldSize,\r
+ IN UINTN NewSize,\r
+ IN VOID *OldBuffer OPTIONAL\r
)\r
{\r
VOID *NewBuffer;\r
\r
NewBuffer = InternalVarCheckAllocateZeroPool (NewSize);\r
- if (NewBuffer != NULL && OldBuffer != NULL) {\r
+ if ((NewBuffer != NULL) && (OldBuffer != NULL)) {\r
CopyMem (NewBuffer, OldBuffer, MIN (OldSize, NewSize));\r
InternalVarCheckFreePool (OldBuffer);\r
}\r
+\r
return NewBuffer;\r
}\r
\r
**/\r
VOID\r
MergeHiiQuestion (\r
- IN OUT VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode,\r
- IN VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion,\r
- IN BOOLEAN FromFv\r
+ IN OUT VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode,\r
+ IN VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion,\r
+ IN BOOLEAN FromFv\r
)\r
{\r
- VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion1;\r
- VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion2;\r
- VAR_CHECK_HII_QUESTION_HEADER *NewHiiQuestion;\r
- UINT8 NewLength;\r
- UINT64 Minimum1;\r
- UINT64 Maximum1;\r
- UINT64 OneValue1;\r
- UINT64 Minimum2;\r
- UINT64 Maximum2;\r
- UINT64 OneValue2;\r
- UINT8 *Ptr;\r
- UINT8 *Ptr1;\r
- UINT8 *Ptr2;\r
- UINTN ArrayIndex;\r
+ VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion1;\r
+ VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion2;\r
+ VAR_CHECK_HII_QUESTION_HEADER *NewHiiQuestion;\r
+ UINT8 NewLength;\r
+ UINT64 Minimum1;\r
+ UINT64 Maximum1;\r
+ UINT64 OneValue1;\r
+ UINT64 Minimum2;\r
+ UINT64 Maximum2;\r
+ UINT64 OneValue2;\r
+ UINT8 *Ptr;\r
+ UINT8 *Ptr1;\r
+ UINT8 *Ptr2;\r
+ UINTN ArrayIndex;\r
\r
//\r
// Hii Question from Hii Database has high priority.\r
\r
switch (HiiQuestion1->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_ONE_OF_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\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
//\r
// Check if the one of options in Hii Question 2 have been in Hii Question 1.\r
//\r
- Ptr2 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion2 + 1);\r
- while ((UINTN) Ptr2 < (UINTN) HiiQuestion2 + HiiQuestion2->Length) {\r
+ Ptr2 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion2 + 1);\r
+ while ((UINTN)Ptr2 < (UINTN)HiiQuestion2 + HiiQuestion2->Length) {\r
OneValue2 = 0;\r
CopyMem (&OneValue2, Ptr2, HiiQuestion2->StorageWidth);\r
\r
- Ptr1 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion1 + 1);\r
- while ((UINTN) Ptr1 < (UINTN) HiiQuestion1 + HiiQuestion1->Length) {\r
+ Ptr1 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion1 + 1);\r
+ while ((UINTN)Ptr1 < (UINTN)HiiQuestion1 + HiiQuestion1->Length) {\r
OneValue1 = 0;\r
CopyMem (&OneValue1, Ptr1, HiiQuestion1->StorageWidth);\r
if (OneValue2 == OneValue1) {\r
//\r
break;\r
}\r
+\r
Ptr1 += HiiQuestion1->StorageWidth;\r
}\r
- if ((UINTN) Ptr1 >= ((UINTN) HiiQuestion1 + HiiQuestion1->Length)) {\r
+\r
+ if ((UINTN)Ptr1 >= ((UINTN)HiiQuestion1 + HiiQuestion1->Length)) {\r
//\r
// No match\r
//\r
- NewLength = (UINT8) (NewLength + HiiQuestion1->StorageWidth);\r
+ NewLength = (UINT8)(NewLength + HiiQuestion1->StorageWidth);\r
}\r
+\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
// Use the new length.\r
//\r
NewHiiQuestion->Length = NewLength;\r
- Ptr = (UINT8 *) NewHiiQuestion + HiiQuestion1->Length;\r
+ Ptr = (UINT8 *)NewHiiQuestion + HiiQuestion1->Length;\r
\r
- Ptr2 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion2 + 1);\r
- while ((UINTN) Ptr2 < (UINTN) HiiQuestion2 + HiiQuestion2->Length) {\r
+ Ptr2 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion2 + 1);\r
+ while ((UINTN)Ptr2 < (UINTN)HiiQuestion2 + HiiQuestion2->Length) {\r
OneValue2 = 0;\r
CopyMem (&OneValue2, Ptr2, HiiQuestion2->StorageWidth);\r
\r
- Ptr1 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion1 + 1);\r
- while ((UINTN) Ptr1 < (UINTN) HiiQuestion1 + HiiQuestion1->Length) {\r
+ Ptr1 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion1 + 1);\r
+ while ((UINTN)Ptr1 < (UINTN)HiiQuestion1 + HiiQuestion1->Length) {\r
OneValue1 = 0;\r
CopyMem (&OneValue1, Ptr1, HiiQuestion1->StorageWidth);\r
if (OneValue2 == OneValue1) {\r
//\r
break;\r
}\r
+\r
Ptr1 += HiiQuestion1->StorageWidth;\r
}\r
- if ((UINTN) Ptr1 >= ((UINTN) HiiQuestion1 + HiiQuestion1->Length)) {\r
+\r
+ if ((UINTN)Ptr1 >= ((UINTN)HiiQuestion1 + HiiQuestion1->Length)) {\r
//\r
// No match\r
//\r
CopyMem (Ptr, &OneValue2, HiiQuestion1->StorageWidth);\r
Ptr += HiiQuestion1->StorageWidth;\r
}\r
+\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
HiiVariableNode->HiiQuestionArray[ArrayIndex] = NewHiiQuestion;\r
InternalVarCheckFreePool (HiiQuestion1);\r
}\r
+\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
- DEBUG ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_CHECKBOX_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\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 ((DEBUG_INFO, "MergeHiiQuestion - EFI_IFR_NUMERIC_OP VarOffset = 0x%04x (%a)\n", HiiQuestion1->VarOffset, (HiiQuestion1->BitFieldStore? "bit level": "byte level")));\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
Minimum1 = 0;\r
Maximum1 = 0;\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_NUMERIC *) HiiQuestion1 + 1);\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_NUMERIC *)HiiQuestion1 + 1);\r
CopyMem (&Minimum1, Ptr, HiiQuestion1->StorageWidth);\r
Ptr += HiiQuestion1->StorageWidth;\r
CopyMem (&Maximum1, Ptr, HiiQuestion1->StorageWidth);\r
//\r
Minimum2 = 0;\r
Maximum2 = 0;\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_NUMERIC *) HiiQuestion2 + 1);\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_NUMERIC *)HiiQuestion2 + 1);\r
CopyMem (&Minimum2, Ptr, HiiQuestion2->StorageWidth);\r
Ptr += HiiQuestion2->StorageWidth;\r
CopyMem (&Maximum2, Ptr, HiiQuestion2->StorageWidth);\r
//\r
// Update minimum.\r
//\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_NUMERIC *) HiiQuestion1 + 1);\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_NUMERIC *)HiiQuestion1 + 1);\r
if (Minimum2 < Minimum1) {\r
Minimum1 = Minimum2;\r
CopyMem (Ptr, &Minimum1, HiiQuestion1->StorageWidth);\r
}\r
+\r
//\r
// Update maximum.\r
//\r
Maximum1 = Maximum2;\r
CopyMem (Ptr, &Maximum1, HiiQuestion1->StorageWidth);\r
}\r
+\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
//\r
// Check if the one of options in Hii Question 2 have been in Hii Question 1.\r
//\r
- Ptr2 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion2 + 1);\r
- while ((UINTN) Ptr2 < (UINTN) HiiQuestion2 + HiiQuestion2->Length) {\r
+ Ptr2 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion2 + 1);\r
+ while ((UINTN)Ptr2 < (UINTN)HiiQuestion2 + HiiQuestion2->Length) {\r
OneValue2 = 0;\r
CopyMem (&OneValue2, Ptr2, HiiQuestion2->StorageWidth);\r
\r
- Ptr1 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion1 + 1);\r
- while ((UINTN) Ptr1 < (UINTN) HiiQuestion1 + HiiQuestion1->Length) {\r
+ Ptr1 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion1 + 1);\r
+ while ((UINTN)Ptr1 < (UINTN)HiiQuestion1 + HiiQuestion1->Length) {\r
OneValue1 = 0;\r
CopyMem (&OneValue1, Ptr1, HiiQuestion1->StorageWidth);\r
if (OneValue2 == OneValue1) {\r
//\r
break;\r
}\r
+\r
Ptr1 += HiiQuestion1->StorageWidth;\r
}\r
- if ((UINTN) Ptr1 >= ((UINTN) HiiQuestion1 + HiiQuestion1->Length)) {\r
+\r
+ if ((UINTN)Ptr1 >= ((UINTN)HiiQuestion1 + HiiQuestion1->Length)) {\r
//\r
// No match\r
//\r
- NewLength = (UINT8) (NewLength + HiiQuestion1->StorageWidth);\r
+ NewLength = (UINT8)(NewLength + HiiQuestion1->StorageWidth);\r
}\r
+\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
// Use the new length.\r
//\r
NewHiiQuestion->Length = NewLength;\r
- Ptr = (UINT8 *) NewHiiQuestion + HiiQuestion1->Length;\r
+ Ptr = (UINT8 *)NewHiiQuestion + HiiQuestion1->Length;\r
\r
- Ptr2 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion2 + 1);\r
- while ((UINTN) Ptr2 < (UINTN) HiiQuestion2 + HiiQuestion2->Length) {\r
+ Ptr2 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion2 + 1);\r
+ while ((UINTN)Ptr2 < (UINTN)HiiQuestion2 + HiiQuestion2->Length) {\r
OneValue2 = 0;\r
CopyMem (&OneValue2, Ptr2, HiiQuestion2->StorageWidth);\r
\r
- Ptr1 = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion1 + 1);\r
- while ((UINTN) Ptr1 < (UINTN) HiiQuestion1 + HiiQuestion1->Length) {\r
+ Ptr1 = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion1 + 1);\r
+ while ((UINTN)Ptr1 < (UINTN)HiiQuestion1 + HiiQuestion1->Length) {\r
OneValue1 = 0;\r
CopyMem (&OneValue1, Ptr1, HiiQuestion1->StorageWidth);\r
if (OneValue2 == OneValue1) {\r
//\r
break;\r
}\r
+\r
Ptr1 += HiiQuestion1->StorageWidth;\r
}\r
- if ((UINTN) Ptr1 >= ((UINTN) HiiQuestion1 + HiiQuestion1->Length)) {\r
+\r
+ if ((UINTN)Ptr1 >= ((UINTN)HiiQuestion1 + HiiQuestion1->Length)) {\r
//\r
// No match\r
//\r
CopyMem (Ptr, &OneValue2, HiiQuestion1->StorageWidth);\r
Ptr += HiiQuestion1->StorageWidth;\r
}\r
+\r
Ptr2 += HiiQuestion2->StorageWidth;\r
}\r
\r
HiiVariableNode->HiiQuestionArray[ArrayIndex] = NewHiiQuestion;\r
InternalVarCheckFreePool (HiiQuestion1);\r
}\r
+\r
break;\r
\r
default:\r
**/\r
VOID\r
GetOneOfOption (\r
- IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
- OUT UINTN *Count,\r
- OUT UINT8 *Width,\r
- OUT VOID *OptionBuffer OPTIONAL\r
+ IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
+ OUT UINTN *Count,\r
+ OUT UINT8 *Width,\r
+ OUT VOID *OptionBuffer OPTIONAL\r
)\r
{\r
- UINTN Scope;\r
- EFI_IFR_ONE_OF_OPTION *IfrOneOfOption;\r
+ UINTN Scope;\r
+ EFI_IFR_ONE_OF_OPTION *IfrOneOfOption;\r
\r
//\r
// Assume all OPTION has same Width.\r
//\r
// Nested OpCode.\r
//\r
- Scope = 1;\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+ Scope = 1;\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
while (Scope != 0) {\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_ONE_OF_OPTION_OP:\r
- IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *) IfrOpCodeHeader;\r
+ IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *)IfrOpCodeHeader;\r
switch (IfrOneOfOption->Type) {\r
case EFI_IFR_TYPE_NUM_SIZE_8:\r
*Count = *Count + 1;\r
*Width = sizeof (UINT8);\r
if (OptionBuffer != NULL) {\r
CopyMem (OptionBuffer, &IfrOneOfOption->Value.u8, sizeof (UINT8));\r
- OptionBuffer = (UINT8 *) OptionBuffer + 1;\r
+ OptionBuffer = (UINT8 *)OptionBuffer + 1;\r
}\r
+\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_16:\r
*Count = *Count + 1;\r
*Width = sizeof (UINT16);\r
if (OptionBuffer != NULL) {\r
CopyMem (OptionBuffer, &IfrOneOfOption->Value.u16, sizeof (UINT16));\r
- OptionBuffer = (UINT16 *) OptionBuffer + 1;\r
+ OptionBuffer = (UINT16 *)OptionBuffer + 1;\r
}\r
+\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_32:\r
*Count = *Count + 1;\r
*Width = sizeof (UINT32);\r
if (OptionBuffer != NULL) {\r
CopyMem (OptionBuffer, &IfrOneOfOption->Value.u32, sizeof (UINT32));\r
- OptionBuffer = (UINT32 *) OptionBuffer + 1;\r
+ OptionBuffer = (UINT32 *)OptionBuffer + 1;\r
}\r
+\r
break;\r
case EFI_IFR_TYPE_NUM_SIZE_64:\r
*Count = *Count + 1;\r
*Width = sizeof (UINT64);\r
if (OptionBuffer != NULL) {\r
CopyMem (OptionBuffer, &IfrOneOfOption->Value.u64, sizeof (UINT64));\r
- OptionBuffer = (UINT64 *) OptionBuffer + 1;\r
+ OptionBuffer = (UINT64 *)OptionBuffer + 1;\r
}\r
+\r
break;\r
case EFI_IFR_TYPE_BOOLEAN:\r
*Count = *Count + 1;\r
*Width = sizeof (BOOLEAN);\r
if (OptionBuffer != NULL) {\r
CopyMem (OptionBuffer, &IfrOneOfOption->Value.b, sizeof (BOOLEAN));\r
- OptionBuffer = (BOOLEAN *) OptionBuffer + 1;\r
+ OptionBuffer = (BOOLEAN *)OptionBuffer + 1;\r
}\r
+\r
break;\r
default:\r
break;\r
}\r
+\r
break;\r
}\r
\r
//\r
Scope++;\r
}\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
}\r
}\r
\r
- return ;\r
+ return;\r
}\r
\r
/**\r
UINT8 OptionWidth;\r
UINT8 BitWidth;\r
\r
- IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpCodeHeader;\r
+ IfrOneOf = (EFI_IFR_ONE_OF *)IfrOpCodeHeader;\r
BitWidth = 0;\r
\r
if (StoredInBitField) {\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
+ Width = sizeof (UINT32);\r
} else {\r
- Width = (UINT8) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
+ Width = (UINT8)(1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));\r
}\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, NULL);\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->BitFieldStore = StoredInBitField;\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
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, OneOf + 1);\r
\r
- return (VAR_CHECK_HII_QUESTION_HEADER *) OneOf;\r
+ return (VAR_CHECK_HII_QUESTION_HEADER *)OneOf;\r
}\r
\r
/**\r
IN BOOLEAN StoredInBitField\r
)\r
{\r
- EFI_IFR_CHECKBOX *IfrCheckBox;\r
- VAR_CHECK_HII_QUESTION_CHECKBOX *CheckBox;\r
+ EFI_IFR_CHECKBOX *IfrCheckBox;\r
+ VAR_CHECK_HII_QUESTION_CHECKBOX *CheckBox;\r
\r
- IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpCodeHeader;\r
+ IfrCheckBox = (EFI_IFR_CHECKBOX *)IfrOpCodeHeader;\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->BitFieldStore = StoredInBitField;\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
+ CheckBox->StorageWidth = (UINT8)sizeof (BOOLEAN);\r
}\r
\r
- return (VAR_CHECK_HII_QUESTION_HEADER *) CheckBox;\r
+ return (VAR_CHECK_HII_QUESTION_HEADER *)CheckBox;\r
}\r
\r
/**\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
+ 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
+ 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
// 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
+ Width = sizeof (UINT32);\r
} else {\r
- Width = (UINT8) (1 << (IfrNumeric->Flags & EFI_IFR_NUMERIC_SIZE));\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->BitFieldStore = StoredInBitField;\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
\r
CopyMem (Numeric + 1, &IfrNumeric->data, Width * 2);\r
\r
- return (VAR_CHECK_HII_QUESTION_HEADER *) Numeric;\r
+ return (VAR_CHECK_HII_QUESTION_HEADER *)Numeric;\r
}\r
\r
/**\r
IN EFI_IFR_OP_HEADER *IfrOpCodeHeader\r
)\r
{\r
- EFI_IFR_ORDERED_LIST *IfrOrderedList;\r
- VAR_CHECK_HII_QUESTION_ORDEREDLIST *OrderedList;\r
- UINTN Length;\r
- UINTN OptionCount;\r
- UINT8 OptionWidth;\r
+ EFI_IFR_ORDERED_LIST *IfrOrderedList;\r
+ VAR_CHECK_HII_QUESTION_ORDEREDLIST *OrderedList;\r
+ UINTN Length;\r
+ UINTN OptionCount;\r
+ UINT8 OptionWidth;\r
\r
- IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpCodeHeader;\r
+ IfrOrderedList = (EFI_IFR_ORDERED_LIST *)IfrOpCodeHeader;\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, NULL);\r
\r
OrderedList = InternalVarCheckAllocateZeroPool (Length);\r
ASSERT (OrderedList != NULL);\r
OrderedList->OpCode = EFI_IFR_ORDERED_LIST_OP;\r
- OrderedList->Length = (UINT8) Length;\r
+ OrderedList->Length = (UINT8)Length;\r
OrderedList->VarOffset = IfrOrderedList->Question.VarStoreInfo.VarOffset;\r
OrderedList->StorageWidth = OptionWidth;\r
OrderedList->MaxContainers = IfrOrderedList->MaxContainers;\r
\r
GetOneOfOption (IfrOpCodeHeader, &OptionCount, &OptionWidth, OrderedList + 1);\r
\r
- return (VAR_CHECK_HII_QUESTION_HEADER *) OrderedList;\r
+ return (VAR_CHECK_HII_QUESTION_HEADER *)OrderedList;\r
}\r
\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 StoredInBitField\r
+ IN VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode,\r
+ IN EFI_IFR_OP_HEADER *IfrOpCodeHeader,\r
+ IN BOOLEAN FromFv,\r
+ IN BOOLEAN StoredInBitField\r
)\r
{\r
- VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
- UINTN ArrayIndex;\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
} else {\r
ArrayIndex = HiiQuestion->VarOffset * 8;\r
}\r
+\r
if (HiiVariableNode->HiiQuestionArray[ArrayIndex] != NULL) {\r
MergeHiiQuestion (HiiVariableNode, HiiQuestion, FromFv);\r
} else {\r
**/\r
VAR_CHECK_HII_VARIABLE_NODE *\r
FindHiiVariableNode (\r
- IN CHAR16 *Name,\r
- IN EFI_GUID *Guid\r
+ IN CHAR16 *Name,\r
+ IN EFI_GUID *Guid\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- LIST_ENTRY *Link;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ LIST_ENTRY *Link;\r
\r
for (Link = mVarCheckHiiList.ForwardLink\r
- ;Link != &mVarCheckHiiList\r
- ;Link = Link->ForwardLink) {\r
+ ; Link != &mVarCheckHiiList\r
+ ; Link = Link->ForwardLink)\r
+ {\r
HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (Link);\r
\r
- if ((StrCmp (Name, (CHAR16 *) (HiiVariableNode->HiiVariable + 1)) == 0) &&\r
- CompareGuid (Guid, &HiiVariableNode->HiiVariable->Guid)) {\r
+ if ((StrCmp (Name, (CHAR16 *)(HiiVariableNode->HiiVariable + 1)) == 0) &&\r
+ CompareGuid (Guid, &HiiVariableNode->HiiVariable->Guid))\r
+ {\r
return HiiVariableNode;\r
}\r
}\r
**/\r
VAR_CHECK_HII_VARIABLE_NODE *\r
FindHiiVariableNodeByVarStoreId (\r
- IN EFI_VARSTORE_ID VarStoreId\r
+ IN EFI_VARSTORE_ID VarStoreId\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- LIST_ENTRY *Link;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ LIST_ENTRY *Link;\r
\r
if (VarStoreId == 0) {\r
//\r
}\r
\r
for (Link = mVarCheckHiiList.ForwardLink\r
- ;Link != &mVarCheckHiiList\r
- ;Link = Link->ForwardLink) {\r
+ ; Link != &mVarCheckHiiList\r
+ ; Link = Link->ForwardLink)\r
+ {\r
HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (Link);\r
//\r
// The variable store identifier, which is unique within the current form set.\r
VOID\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- LIST_ENTRY *Link;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ LIST_ENTRY *Link;\r
\r
for (Link = mVarCheckHiiList.ForwardLink\r
- ;Link != &mVarCheckHiiList\r
- ;Link = Link->ForwardLink) {\r
+ ; Link != &mVarCheckHiiList\r
+ ; Link = Link->ForwardLink)\r
+ {\r
HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (Link);\r
//\r
// The variable store identifier, which is unique within the current form set.\r
**/\r
VOID\r
CreateHiiVariableNode (\r
- IN EFI_IFR_VARSTORE_EFI *IfrEfiVarStore\r
+ IN EFI_IFR_VARSTORE_EFI *IfrEfiVarStore\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
- UINTN HeaderLength;\r
- CHAR16 *VarName;\r
- UINTN VarNameSize;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
+ UINTN HeaderLength;\r
+ CHAR16 *VarName;\r
+ UINTN VarNameSize;\r
\r
//\r
// Get variable name.\r
//\r
- VarNameSize = AsciiStrSize ((CHAR8 *) IfrEfiVarStore->Name) * sizeof (CHAR16);\r
+ VarNameSize = AsciiStrSize ((CHAR8 *)IfrEfiVarStore->Name) * sizeof (CHAR16);\r
if (VarNameSize > mMaxVarNameSize) {\r
mVarName = InternalVarCheckReallocatePool (mMaxVarNameSize, VarNameSize, mVarName);\r
ASSERT (mVarName != NULL);\r
mMaxVarNameSize = VarNameSize;\r
}\r
- AsciiStrToUnicodeStrS ((CHAR8 *) IfrEfiVarStore->Name, mVarName, mMaxVarNameSize / sizeof (CHAR16));\r
+\r
+ AsciiStrToUnicodeStrS ((CHAR8 *)IfrEfiVarStore->Name, mVarName, mMaxVarNameSize / sizeof (CHAR16));\r
VarName = mVarName;\r
\r
HiiVariableNode = FindHiiVariableNode (\r
// Not found, then create new.\r
//\r
HeaderLength = sizeof (*HiiVariable) + VarNameSize;\r
- HiiVariable = InternalVarCheckAllocateZeroPool (HeaderLength);\r
+ HiiVariable = InternalVarCheckAllocateZeroPool (HeaderLength);\r
ASSERT (HiiVariable != NULL);\r
- HiiVariable->Revision = VAR_CHECK_HII_REVISION;\r
- HiiVariable->OpCode = EFI_IFR_VARSTORE_EFI_OP;\r
- HiiVariable->HeaderLength = (UINT16) HeaderLength;\r
- HiiVariable->Size = IfrEfiVarStore->Size;\r
- HiiVariable->Attributes = IfrEfiVarStore->Attributes;\r
+ HiiVariable->Revision = VAR_CHECK_HII_REVISION;\r
+ HiiVariable->OpCode = EFI_IFR_VARSTORE_EFI_OP;\r
+ HiiVariable->HeaderLength = (UINT16)HeaderLength;\r
+ HiiVariable->Size = IfrEfiVarStore->Size;\r
+ HiiVariable->Attributes = IfrEfiVarStore->Attributes;\r
CopyGuid (&HiiVariable->Guid, &IfrEfiVarStore->Guid);\r
- StrCpyS ((CHAR16 *) (HiiVariable + 1), VarNameSize / sizeof (CHAR16), VarName);\r
+ StrCpyS ((CHAR16 *)(HiiVariable + 1), VarNameSize / sizeof (CHAR16), VarName);\r
\r
HiiVariableNode = InternalVarCheckAllocateZeroPool (sizeof (*HiiVariableNode));\r
ASSERT (HiiVariableNode != NULL);\r
- HiiVariableNode->Signature = VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE;\r
+ HiiVariableNode->Signature = VAR_CHECK_HII_VARIABLE_NODE_SIGNATURE;\r
HiiVariableNode->HiiVariable = HiiVariable;\r
//\r
// The variable store identifier, which is unique within the current form set.\r
//\r
- HiiVariableNode->VarStoreId = IfrEfiVarStore->VarStoreId;\r
+ HiiVariableNode->VarStoreId = IfrEfiVarStore->VarStoreId;\r
HiiVariableNode->HiiQuestionArray = InternalVarCheckAllocateZeroPool (IfrEfiVarStore->Size * 8 * sizeof (VAR_CHECK_HII_QUESTION_HEADER *));\r
\r
InsertTailList (&mVarCheckHiiList, &HiiVariableNode->Link);\r
**/\r
VOID\r
ParseHiiVariable (\r
- IN VOID *HiiPackage\r
+ IN VOID *HiiPackage\r
)\r
{\r
- EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
- EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
- EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;\r
+ EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
+ EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
+ EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;\r
\r
- HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;\r
+ HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)HiiPackage;\r
\r
switch (HiiPackageHeader->Type) {\r
case EFI_HII_PACKAGE_FORMS:\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) (HiiPackageHeader + 1);\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)(HiiPackageHeader + 1);\r
\r
- while ((UINTN) IfrOpCodeHeader < (UINTN) HiiPackageHeader + HiiPackageHeader->Length) {\r
+ while ((UINTN)IfrOpCodeHeader < (UINTN)HiiPackageHeader + HiiPackageHeader->Length) {\r
switch (IfrOpCodeHeader->OpCode) {\r
case EFI_IFR_VARSTORE_EFI_OP:\r
//\r
// Come to EFI VARSTORE in Form Package.\r
//\r
- IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpCodeHeader;\r
+ IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *)IfrOpCodeHeader;\r
if ((IfrEfiVarStore->Header.Length >= sizeof (EFI_IFR_VARSTORE_EFI)) &&\r
- ((IfrEfiVarStore->Attributes & EFI_VARIABLE_NON_VOLATILE) != 0)) {\r
+ ((IfrEfiVarStore->Attributes & EFI_VARIABLE_NON_VOLATILE) != 0))\r
+ {\r
//\r
// Only create node list for Hii Variable with NV attribute.\r
//\r
CreateHiiVariableNode (IfrEfiVarStore);\r
}\r
+\r
break;\r
\r
default:\r
break;\r
}\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
}\r
+\r
break;\r
\r
default:\r
**/\r
VOID\r
VarCheckParseHiiPackage (\r
- IN VOID *HiiPackage,\r
- IN BOOLEAN FromFv\r
+ IN VOID *HiiPackage,\r
+ IN BOOLEAN FromFv\r
)\r
{\r
- EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
- EFI_IFR_OP_HEADER *IfrOpCodeHeader;\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- BOOLEAN QuestionStoredInBitField;\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
ParseHiiVariable (HiiPackage);\r
\r
- HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiPackage;\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
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)(HiiPackageHeader + 1);\r
\r
- while ((UINTN) IfrOpCodeHeader < (UINTN) HiiPackageHeader + HiiPackageHeader->Length) {\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
+\r
break;\r
\r
case EFI_IFR_END_OP:\r
case EFI_IFR_CHECKBOX_OP:\r
case EFI_IFR_NUMERIC_OP:\r
case EFI_IFR_ORDERED_LIST_OP:\r
- HiiVariableNode = FindHiiVariableNodeByVarStoreId (((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.VarStoreId);\r
+ HiiVariableNode = FindHiiVariableNodeByVarStoreId (((EFI_IFR_ONE_OF *)IfrOpCodeHeader)->Question.VarStoreId);\r
if ((HiiVariableNode == NULL) ||\r
//\r
// No related Hii Variable node found.\r
//\r
- ((((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Prompt == 0) && (((EFI_IFR_ONE_OF *) IfrOpCodeHeader)->Question.Header.Help == 0))) {\r
- //\r
- // meanless IFR item introduced by ECP.\r
- //\r
+ ((((EFI_IFR_ONE_OF *)IfrOpCodeHeader)->Question.Header.Prompt == 0) && (((EFI_IFR_ONE_OF *)IfrOpCodeHeader)->Question.Header.Help == 0)))\r
+ {\r
+ //\r
+ // meanless IFR item introduced by ECP.\r
+ //\r
} else {\r
//\r
// Normal IFR\r
//\r
ParseHiiQuestion (HiiVariableNode, IfrOpCodeHeader, FromFv, QuestionStoredInBitField);\r
}\r
+\r
default:\r
break;\r
}\r
- IfrOpCodeHeader = (EFI_IFR_OP_HEADER *) ((UINTN) IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
+\r
+ IfrOpCodeHeader = (EFI_IFR_OP_HEADER *)((UINTN)IfrOpCodeHeader + IfrOpCodeHeader->Length);\r
}\r
+\r
break;\r
\r
default:\r
break;\r
}\r
+\r
DestroyVarStoreId ();\r
}\r
\r
**/\r
VOID\r
VarCheckParseHiiDatabase (\r
- IN VOID *HiiDatabase,\r
- IN UINTN HiiDatabaseSize\r
+ IN VOID *HiiDatabase,\r
+ IN UINTN HiiDatabaseSize\r
)\r
{\r
- EFI_HII_PACKAGE_LIST_HEADER *HiiPackageListHeader;\r
- EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
+ EFI_HII_PACKAGE_LIST_HEADER *HiiPackageListHeader;\r
+ EFI_HII_PACKAGE_HEADER *HiiPackageHeader;\r
\r
- HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) HiiDatabase;\r
+ HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)HiiDatabase;\r
\r
- while ((UINTN) HiiPackageListHeader < ((UINTN) HiiDatabase + HiiDatabaseSize)) {\r
- HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) (HiiPackageListHeader + 1);\r
+ while ((UINTN)HiiPackageListHeader < ((UINTN)HiiDatabase + HiiDatabaseSize)) {\r
+ HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)(HiiPackageListHeader + 1);\r
\r
- while ((UINTN) HiiPackageHeader < ((UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength)) {\r
+ while ((UINTN)HiiPackageHeader < ((UINTN)HiiPackageListHeader + HiiPackageListHeader->PackageLength)) {\r
//\r
// Parse Hii Package.\r
//\r
VarCheckParseHiiPackage (HiiPackageHeader, FALSE);\r
\r
- HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *) ((UINTN) HiiPackageHeader + HiiPackageHeader->Length);\r
+ HiiPackageHeader = (EFI_HII_PACKAGE_HEADER *)((UINTN)HiiPackageHeader + HiiPackageHeader->Length);\r
}\r
\r
- HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *) ((UINTN) HiiPackageListHeader + HiiPackageListHeader->PackageLength);\r
+ HiiPackageListHeader = (EFI_HII_PACKAGE_LIST_HEADER *)((UINTN)HiiPackageListHeader + HiiPackageListHeader->PackageLength);\r
}\r
}\r
\r
VOID\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- LIST_ENTRY *HiiVariableLink;\r
- UINTN Index;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ LIST_ENTRY *HiiVariableLink;\r
+ UINTN Index;\r
\r
while (mVarCheckHiiList.ForwardLink != &mVarCheckHiiList) {\r
HiiVariableLink = mVarCheckHiiList.ForwardLink;\r
//\r
// Free the allocated buffer.\r
//\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; 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
}\r
+\r
InternalVarCheckFreePool (HiiVariableNode->HiiQuestionArray);\r
InternalVarCheckFreePool (HiiVariableNode->HiiVariable);\r
InternalVarCheckFreePool (HiiVariableNode);\r
OUT UINTN *Size\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
- LIST_ENTRY *HiiVariableLink;\r
- UINTN Index;\r
- VOID *Data;\r
- UINT8 *Ptr;\r
- UINT32 BinSize;\r
- UINT32 HiiVariableLength;\r
+ VAR_CHECK_HII_VARIABLE_NODE *HiiVariableNode;\r
+ LIST_ENTRY *HiiVariableLink;\r
+ UINTN Index;\r
+ VOID *Data;\r
+ UINT8 *Ptr;\r
+ UINT32 BinSize;\r
+ UINT32 HiiVariableLength;\r
\r
//\r
// Get Size\r
BinSize = 0;\r
\r
for (HiiVariableLink = mVarCheckHiiList.ForwardLink\r
- ;HiiVariableLink != &mVarCheckHiiList\r
- ;HiiVariableLink = HiiVariableLink->ForwardLink) {\r
+ ; HiiVariableLink != &mVarCheckHiiList\r
+ ; HiiVariableLink = HiiVariableLink->ForwardLink)\r
+ {\r
//\r
// For Hii Variable header align.\r
//\r
- BinSize = (UINT32) HEADER_ALIGN (BinSize);\r
+ BinSize = (UINT32)HEADER_ALIGN (BinSize);\r
\r
- HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (HiiVariableLink);\r
+ HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (HiiVariableLink);\r
HiiVariableLength = HiiVariableNode->HiiVariable->HeaderLength;\r
\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; 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
- HiiVariableLength = (UINT32) HEADER_ALIGN (HiiVariableLength);\r
+ HiiVariableLength = (UINT32)HEADER_ALIGN (HiiVariableLength);\r
HiiVariableLength += HiiVariableNode->HiiQuestionArray[Index]->Length;\r
}\r
}\r
\r
HiiVariableNode->HiiVariable->Length = HiiVariableLength;\r
- BinSize += HiiVariableLength;\r
+ BinSize += HiiVariableLength;\r
}\r
\r
DEBUG ((DEBUG_INFO, "VarCheckHiiBin - size = 0x%x\n", BinSize));\r
//\r
// Make sure the allocated buffer for VarCheckHiiBin at required alignment.\r
//\r
- ASSERT ((((UINTN) Data) & (HEADER_ALIGNMENT - 1)) == 0);\r
+ ASSERT ((((UINTN)Data) & (HEADER_ALIGNMENT - 1)) == 0);\r
DEBUG ((DEBUG_INFO, "VarCheckHiiBin - built at 0x%x\n", Data));\r
\r
//\r
//\r
Ptr = Data;\r
for (HiiVariableLink = mVarCheckHiiList.ForwardLink\r
- ;HiiVariableLink != &mVarCheckHiiList\r
- ;HiiVariableLink = HiiVariableLink->ForwardLink) {\r
+ ; HiiVariableLink != &mVarCheckHiiList\r
+ ; HiiVariableLink = HiiVariableLink->ForwardLink)\r
+ {\r
//\r
// For Hii Variable header align.\r
//\r
- Ptr = (UINT8 *) HEADER_ALIGN (Ptr);\r
+ Ptr = (UINT8 *)HEADER_ALIGN (Ptr);\r
\r
HiiVariableNode = VAR_CHECK_HII_VARIABLE_FROM_LINK (HiiVariableLink);\r
CopyMem (Ptr, HiiVariableNode->HiiVariable, HiiVariableNode->HiiVariable->HeaderLength);\r
Ptr += HiiVariableNode->HiiVariable->HeaderLength;\r
\r
- for (Index = 0; Index < HiiVariableNode->HiiVariable->Size * (UINTN) 8; 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
- Ptr = (UINT8 *) HEADER_ALIGN (Ptr);\r
+ Ptr = (UINT8 *)HEADER_ALIGN (Ptr);\r
CopyMem (Ptr, HiiVariableNode->HiiQuestionArray[Index], HiiVariableNode->HiiQuestionArray[Index]->Length);\r
Ptr += HiiVariableNode->HiiQuestionArray[Index]->Length;\r
}\r
InternalVarCheckFreePool (mVarName);\r
}\r
\r
-#ifdef DUMP_VAR_CHECK_HII\r
+ #ifdef DUMP_VAR_CHECK_HII\r
DEBUG_CODE (\r
DumpVarCheckHii (mVarCheckHiiBin, mVarCheckHiiBinSize);\r
- );\r
-#endif\r
+ );\r
+ #endif\r
}\r
-\r
projects / mirror_edk2.git / blobdiff