\r
#include "VarCheckHii.h"\r
\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mVarCheckHiiHex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mVarCheckHiiHex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };\r
\r
/**\r
Dump some hexadecimal data.\r
**/\r
VOID\r
VarCheckHiiInternalDumpHex (\r
- IN UINTN Indent,\r
- IN UINTN Offset,\r
- IN UINTN DataSize,\r
- IN VOID *UserData\r
+ IN UINTN Indent,\r
+ IN UINTN Offset,\r
+ IN UINTN DataSize,\r
+ IN VOID *UserData\r
)\r
{\r
- UINT8 *Data;\r
+ UINT8 *Data;\r
\r
- CHAR8 Val[50];\r
+ CHAR8 Val[50];\r
\r
- CHAR8 Str[20];\r
+ CHAR8 Str[20];\r
\r
- UINT8 TempByte;\r
- UINTN Size;\r
- UINTN Index;\r
+ UINT8 TempByte;\r
+ UINTN Size;\r
+ UINTN Index;\r
\r
Data = UserData;\r
while (DataSize != 0) {\r
}\r
\r
for (Index = 0; Index < Size; Index += 1) {\r
- TempByte = Data[Index];\r
- Val[Index * 3 + 0] = mVarCheckHiiHex[TempByte >> 4];\r
- Val[Index * 3 + 1] = mVarCheckHiiHex[TempByte & 0xF];\r
- Val[Index * 3 + 2] = (CHAR8) ((Index == 7) ? '-' : ' ');\r
- Str[Index] = (CHAR8) ((TempByte < ' ' || TempByte > 'z') ? '.' : TempByte);\r
+ TempByte = Data[Index];\r
+ Val[Index * 3 + 0] = mVarCheckHiiHex[TempByte >> 4];\r
+ Val[Index * 3 + 1] = mVarCheckHiiHex[TempByte & 0xF];\r
+ Val[Index * 3 + 2] = (CHAR8)((Index == 7) ? '-' : ' ');\r
+ Str[Index] = (CHAR8)((TempByte < ' ' || TempByte > 'z') ? '.' : TempByte);\r
}\r
\r
- Val[Index * 3] = 0;\r
- Str[Index] = 0;\r
- DEBUG ((DEBUG_INFO , "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));\r
+ Val[Index * 3] = 0;\r
+ Str[Index] = 0;\r
+ DEBUG ((DEBUG_INFO, "%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str));\r
\r
- Data += Size;\r
- Offset += Size;\r
+ Data += Size;\r
+ Offset += Size;\r
DataSize -= Size;\r
}\r
}\r
IN UINTN DataSize\r
)\r
{\r
- UINT64 OneData;\r
- UINT64 Minimum;\r
- UINT64 Maximum;\r
- UINT64 OneValue;\r
- UINT8 *Ptr;\r
- UINT8 Index;\r
- UINT8 MaxContainers;\r
- UINT8 StartBit;\r
- UINT8 EndBit;\r
- UINT8 TotalBits;\r
- UINT16 VarOffsetByteLevel;\r
- UINT8 StorageWidthByteLevel;\r
+ UINT64 OneData;\r
+ UINT64 Minimum;\r
+ UINT64 Maximum;\r
+ UINT64 OneValue;\r
+ UINT8 *Ptr;\r
+ UINT8 Index;\r
+ UINT8 MaxContainers;\r
+ UINT8 StartBit;\r
+ UINT8 EndBit;\r
+ UINT8 TotalBits;\r
+ UINT16 VarOffsetByteLevel;\r
+ UINT8 StorageWidthByteLevel;\r
\r
if (HiiQuestion->BitFieldStore) {\r
VarOffsetByteLevel = HiiQuestion->VarOffset / 8;\r
TotalBits = HiiQuestion->VarOffset % 8 + HiiQuestion->StorageWidth;\r
- StorageWidthByteLevel = (TotalBits % 8 == 0 ? TotalBits / 8: TotalBits / 8 + 1);\r
+ StorageWidthByteLevel = (TotalBits % 8 == 0 ? TotalBits / 8 : TotalBits / 8 + 1);\r
} else {\r
VarOffsetByteLevel = HiiQuestion->VarOffset;\r
StorageWidthByteLevel = HiiQuestion->StorageWidth;\r
}\r
\r
- if (((UINT32) VarOffsetByteLevel + StorageWidthByteLevel) > DataSize) {\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", VarOffsetByteLevel, StorageWidthByteLevel, DataSize));\r
+ if (((UINT32)VarOffsetByteLevel + StorageWidthByteLevel) > DataSize) {\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x)) > Size(0x%x)\n", VarOffsetByteLevel, StorageWidthByteLevel, DataSize));\r
return FALSE;\r
}\r
\r
OneData = 0;\r
- CopyMem (&OneData, (UINT8 *) Data + VarOffsetByteLevel, StorageWidthByteLevel);\r
+ CopyMem (&OneData, (UINT8 *)Data + VarOffsetByteLevel, StorageWidthByteLevel);\r
if (HiiQuestion->BitFieldStore) {\r
//\r
// Get the value from the bit field.\r
\r
switch (HiiQuestion->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion + 1);\r
- while ((UINTN) Ptr < (UINTN) HiiQuestion + HiiQuestion->Length) {\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion + 1);\r
+ while ((UINTN)Ptr < (UINTN)HiiQuestion + HiiQuestion->Length) {\r
OneValue = 0;\r
if (HiiQuestion->BitFieldStore) {\r
//\r
} else {\r
CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);\r
}\r
+\r
if (OneData == OneValue) {\r
//\r
// Match\r
//\r
break;\r
}\r
+\r
if (HiiQuestion->BitFieldStore) {\r
Ptr += sizeof (UINT32);\r
} else {\r
Ptr += HiiQuestion->StorageWidth;\r
}\r
}\r
- if ((UINTN) Ptr >= ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
+\r
+ if ((UINTN)Ptr >= ((UINTN)HiiQuestion + HiiQuestion->Length)) {\r
//\r
// No match\r
//\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));\r
- DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: OneOf mismatch (0x%lx)\n", OneData));\r
+ DEBUG_CODE (\r
+ VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *)HiiQuestion);\r
+ );\r
return FALSE;\r
}\r
+\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
if ((OneData != 0) && (OneData != 1)) {\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));\r
- DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: CheckBox mismatch (0x%lx)\n", OneData));\r
+ DEBUG_CODE (\r
+ VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *)HiiQuestion);\r
+ );\r
return FALSE;\r
}\r
+\r
break;\r
\r
case EFI_IFR_NUMERIC_OP:\r
Minimum = 0;\r
Maximum = 0;\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_NUMERIC *) HiiQuestion + 1);\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_NUMERIC *)HiiQuestion + 1);\r
if (HiiQuestion->BitFieldStore) {\r
//\r
// For Numeric stored in bit field, the value of Maximum/Minimum are saved as UINT32 type.\r
// No need to check Step, because it is ONLY for UI.\r
//\r
if ((OneData < Minimum) || (OneData > Maximum)) {\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));\r
- DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: Numeric mismatch (0x%lx)\n", OneData));\r
+ DEBUG_CODE (\r
+ VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *)HiiQuestion);\r
+ );\r
return FALSE;\r
}\r
+\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
- MaxContainers = ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers;\r
- if (((UINT32) HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));\r
+ MaxContainers = ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion)->MaxContainers;\r
+ if (((UINT32)HiiQuestion->VarOffset + HiiQuestion->StorageWidth * MaxContainers) > DataSize) {\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: (VarOffset(0x%04x) + StorageWidth(0x%02x) * MaxContainers(0x%02x)) > Size(0x%x)\n", HiiQuestion->VarOffset, HiiQuestion->StorageWidth, MaxContainers, DataSize));\r
return FALSE;\r
}\r
+\r
for (Index = 0; Index < MaxContainers; Index++) {\r
OneData = 0;\r
- CopyMem (&OneData, (UINT8 *) Data + HiiQuestion->VarOffset + HiiQuestion->StorageWidth * Index, HiiQuestion->StorageWidth);\r
+ CopyMem (&OneData, (UINT8 *)Data + HiiQuestion->VarOffset + HiiQuestion->StorageWidth * Index, HiiQuestion->StorageWidth);\r
if (OneData == 0) {\r
//\r
// The value of 0 is used to determine if a particular "slot" in the array is empty.\r
continue;\r
}\r
\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion + 1);\r
- while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion + 1);\r
+ while ((UINTN)Ptr < ((UINTN)HiiQuestion + HiiQuestion->Length)) {\r
OneValue = 0;\r
CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);\r
if (OneData == OneValue) {\r
//\r
break;\r
}\r
+\r
Ptr += HiiQuestion->StorageWidth;\r
}\r
- if ((UINTN) Ptr >= ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
+\r
+ if ((UINTN)Ptr >= ((UINTN)HiiQuestion + HiiQuestion->Length)) {\r
//\r
// No match\r
//\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiQuestion fail: OrderedList mismatch\n"));\r
- DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->StorageWidth * MaxContainers, (UINT8 *) Data + HiiQuestion->VarOffset););\r
- DEBUG_CODE (VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *) HiiQuestion););\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiQuestion fail: OrderedList mismatch\n"));\r
+ DEBUG_CODE (\r
+ VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->StorageWidth * MaxContainers, (UINT8 *)Data + HiiQuestion->VarOffset);\r
+ );\r
+ DEBUG_CODE (\r
+ VarCheckHiiInternalDumpHex (2, 0, HiiQuestion->Length, (UINT8 *)HiiQuestion);\r
+ );\r
return FALSE;\r
}\r
}\r
+\r
break;\r
\r
default:\r
return TRUE;\r
}\r
\r
-VAR_CHECK_HII_VARIABLE_HEADER *mVarCheckHiiBin = NULL;\r
-UINTN mVarCheckHiiBinSize = 0;\r
+VAR_CHECK_HII_VARIABLE_HEADER *mVarCheckHiiBin = NULL;\r
+UINTN mVarCheckHiiBinSize = 0;\r
\r
/**\r
SetVariable check handler HII.\r
EFI_STATUS\r
EFIAPI\r
SetVariableCheckHandlerHii (\r
- IN CHAR16 *VariableName,\r
- IN EFI_GUID *VendorGuid,\r
- IN UINT32 Attributes,\r
- IN UINTN DataSize,\r
- IN VOID *Data\r
+ IN CHAR16 *VariableName,\r
+ IN EFI_GUID *VendorGuid,\r
+ IN UINT32 Attributes,\r
+ IN UINTN DataSize,\r
+ IN VOID *Data\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
- VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
+ VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
+ VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
\r
if (mVarCheckHiiBin == NULL) {\r
return EFI_SUCCESS;\r
//\r
// For Hii Variable header align.\r
//\r
- HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (mVarCheckHiiBin);\r
- while ((UINTN) HiiVariable < ((UINTN) mVarCheckHiiBin + mVarCheckHiiBinSize)) {\r
- if ((StrCmp ((CHAR16 *) (HiiVariable + 1), VariableName) == 0) &&\r
- (CompareGuid (&HiiVariable->Guid, VendorGuid))) {\r
+ HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *)HEADER_ALIGN (mVarCheckHiiBin);\r
+ while ((UINTN)HiiVariable < ((UINTN)mVarCheckHiiBin + mVarCheckHiiBinSize)) {\r
+ if ((StrCmp ((CHAR16 *)(HiiVariable + 1), VariableName) == 0) &&\r
+ (CompareGuid (&HiiVariable->Guid, VendorGuid)))\r
+ {\r
//\r
// Found the Hii Variable that could be used to do check.\r
//\r
- DEBUG ((DEBUG_INFO , "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));\r
+ DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - %s:%g with Attributes = 0x%08x Size = 0x%x\n", VariableName, VendorGuid, Attributes, DataSize));\r
if (HiiVariable->Attributes != Attributes) {\r
DEBUG ((DEBUG_INFO, "VarCheckHiiVariable fail for Attributes - 0x%08x\n", HiiVariable->Attributes));\r
return EFI_SECURITY_VIOLATION;\r
// Do the check.\r
// For Hii Question header align.\r
//\r
- HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiVariable + HiiVariable->HeaderLength));\r
- while ((UINTN) HiiQuestion < ((UINTN) HiiVariable + HiiVariable->Length)) {\r
+ HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *)HEADER_ALIGN (((UINTN)HiiVariable + HiiVariable->HeaderLength));\r
+ while ((UINTN)HiiQuestion < ((UINTN)HiiVariable + HiiVariable->Length)) {\r
if (!VarCheckHiiQuestion (HiiQuestion, Data, DataSize)) {\r
return EFI_SECURITY_VIOLATION;\r
}\r
+\r
//\r
// For Hii Question header align.\r
//\r
- HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiQuestion + HiiQuestion->Length));\r
+ HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *)HEADER_ALIGN (((UINTN)HiiQuestion + HiiQuestion->Length));\r
}\r
\r
DEBUG ((DEBUG_INFO, "VarCheckHiiVariable - ALL CHECK PASS!\n"));\r
return EFI_SUCCESS;\r
}\r
+\r
//\r
// For Hii Variable header align.\r
//\r
- HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (((UINTN) HiiVariable + HiiVariable->Length));\r
+ HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *)HEADER_ALIGN (((UINTN)HiiVariable + HiiVariable->Length));\r
}\r
\r
// Not found, so pass.\r
}\r
\r
#ifdef DUMP_VAR_CHECK_HII\r
-GLOBAL_REMOVE_IF_UNREFERENCED VAR_CHECK_HII_OPCODE_STRING mHiiOpCodeStringTable[] = {\r
- {EFI_IFR_VARSTORE_EFI_OP, "EfiVarStore"},\r
- {EFI_IFR_ONE_OF_OP, "OneOf"},\r
- {EFI_IFR_CHECKBOX_OP, "CheckBox"},\r
- {EFI_IFR_NUMERIC_OP, "Numeric"},\r
- {EFI_IFR_ORDERED_LIST_OP, "OrderedList"},\r
+GLOBAL_REMOVE_IF_UNREFERENCED VAR_CHECK_HII_OPCODE_STRING mHiiOpCodeStringTable[] = {\r
+ { EFI_IFR_VARSTORE_EFI_OP, "EfiVarStore" },\r
+ { EFI_IFR_ONE_OF_OP, "OneOf" },\r
+ { EFI_IFR_CHECKBOX_OP, "CheckBox" },\r
+ { EFI_IFR_NUMERIC_OP, "Numeric" },\r
+ { EFI_IFR_ORDERED_LIST_OP, "OrderedList" },\r
};\r
\r
/**\r
IN UINT8 HiiOpCode\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
+\r
for (Index = 0; Index < ARRAY_SIZE (mHiiOpCodeStringTable); Index++) {\r
if (mHiiOpCodeStringTable[Index].HiiOpCode == HiiOpCode) {\r
return mHiiOpCodeStringTable[Index].HiiOpCodeStr;\r
IN VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion\r
)\r
{\r
- UINT64 Minimum;\r
- UINT64 Maximum;\r
- UINT64 OneValue;\r
- UINT8 *Ptr;\r
+ UINT64 Minimum;\r
+ UINT64 Maximum;\r
+ UINT64 OneValue;\r
+ UINT8 *Ptr;\r
\r
DEBUG ((DEBUG_INFO, " VAR_CHECK_HII_QUESTION_HEADER\n"));\r
- DEBUG ((DEBUG_INFO, " OpCode - 0x%02x (%a) (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode), (HiiQuestion->BitFieldStore? "bit level": "byte level")));\r
+ DEBUG ((DEBUG_INFO, " OpCode - 0x%02x (%a) (%a)\n", HiiQuestion->OpCode, HiiOpCodeToStr (HiiQuestion->OpCode), (HiiQuestion->BitFieldStore ? "bit level" : "byte level")));\r
DEBUG ((DEBUG_INFO, " Length - 0x%02x\n", HiiQuestion->Length));\r
- DEBUG ((DEBUG_INFO, " VarOffset - 0x%04x (%a)\n", HiiQuestion->VarOffset, (HiiQuestion->BitFieldStore? "bit level": "byte level")));\r
- DEBUG ((DEBUG_INFO, " StorageWidth - 0x%02x (%a)\n", HiiQuestion->StorageWidth, (HiiQuestion->BitFieldStore? "bit level": "byte level")));\r
+ DEBUG ((DEBUG_INFO, " VarOffset - 0x%04x (%a)\n", HiiQuestion->VarOffset, (HiiQuestion->BitFieldStore ? "bit level" : "byte level")));\r
+ DEBUG ((DEBUG_INFO, " StorageWidth - 0x%02x (%a)\n", HiiQuestion->StorageWidth, (HiiQuestion->BitFieldStore ? "bit level" : "byte level")));\r
\r
switch (HiiQuestion->OpCode) {\r
case EFI_IFR_ONE_OF_OP:\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ONEOF *) HiiQuestion + 1);\r
- while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_ONEOF *)HiiQuestion + 1);\r
+ while ((UINTN)Ptr < ((UINTN)HiiQuestion + HiiQuestion->Length)) {\r
OneValue = 0;\r
if (HiiQuestion->BitFieldStore) {\r
//\r
break;\r
}\r
}\r
+\r
if (HiiQuestion->BitFieldStore) {\r
Ptr += sizeof (UINT32);\r
} else {\r
Ptr += HiiQuestion->StorageWidth;\r
}\r
}\r
+\r
break;\r
\r
case EFI_IFR_CHECKBOX_OP:\r
case EFI_IFR_NUMERIC_OP:\r
Minimum = 0;\r
Maximum = 0;\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_NUMERIC *) HiiQuestion + 1);\r
- if(HiiQuestion->BitFieldStore) {\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_NUMERIC *)HiiQuestion + 1);\r
+ if (HiiQuestion->BitFieldStore) {\r
//\r
// For Numeric stored in bit field, the value of Maximum/Minimum are saved as UINT32 type.\r
//\r
break;\r
}\r
}\r
+\r
break;\r
\r
case EFI_IFR_ORDERED_LIST_OP:\r
- DEBUG ((DEBUG_INFO, " MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion)->MaxContainers));\r
- Ptr = (UINT8 *) ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *) HiiQuestion + 1);\r
- while ((UINTN) Ptr < ((UINTN) HiiQuestion + HiiQuestion->Length)) {\r
+ DEBUG ((DEBUG_INFO, " MaxContainers - 0x%02x\n", ((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion)->MaxContainers));\r
+ Ptr = (UINT8 *)((VAR_CHECK_HII_QUESTION_ORDEREDLIST *)HiiQuestion + 1);\r
+ while ((UINTN)Ptr < ((UINTN)HiiQuestion + HiiQuestion->Length)) {\r
OneValue = 0;\r
CopyMem (&OneValue, Ptr, HiiQuestion->StorageWidth);\r
switch (HiiQuestion->StorageWidth) {\r
ASSERT (FALSE);\r
break;\r
}\r
+\r
Ptr += HiiQuestion->StorageWidth;\r
}\r
+\r
break;\r
\r
default:\r
IN VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable\r
)\r
{\r
- VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
+ VAR_CHECK_HII_QUESTION_HEADER *HiiQuestion;\r
\r
DEBUG ((DEBUG_INFO, "VAR_CHECK_HII_VARIABLE_HEADER\n"));\r
DEBUG ((DEBUG_INFO, " Revision - 0x%04x\n", HiiVariable->Revision));\r
//\r
// For Hii Question header align.\r
//\r
- HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiVariable + HiiVariable->HeaderLength));\r
- while ((UINTN) HiiQuestion < ((UINTN) HiiVariable + HiiVariable->Length)) {\r
+ HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *)HEADER_ALIGN (((UINTN)HiiVariable + HiiVariable->HeaderLength));\r
+ while ((UINTN)HiiQuestion < ((UINTN)HiiVariable + HiiVariable->Length)) {\r
//\r
// Dump Hii Question related to the Hii Variable.\r
//\r
//\r
// For Hii Question header align.\r
//\r
- HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *) HEADER_ALIGN (((UINTN) HiiQuestion + HiiQuestion->Length));\r
+ HiiQuestion = (VAR_CHECK_HII_QUESTION_HEADER *)HEADER_ALIGN (((UINTN)HiiQuestion + HiiQuestion->Length));\r
}\r
}\r
\r
IN UINTN VarCheckHiiBinSize\r
)\r
{\r
- VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
+ VAR_CHECK_HII_VARIABLE_HEADER *HiiVariable;\r
\r
DEBUG ((DEBUG_INFO, "DumpVarCheckHii\n"));\r
\r
//\r
// For Hii Variable header align.\r
//\r
- HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (VarCheckHiiBin);\r
- while ((UINTN) HiiVariable < ((UINTN) VarCheckHiiBin + VarCheckHiiBinSize)) {\r
+ HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *)HEADER_ALIGN (VarCheckHiiBin);\r
+ while ((UINTN)HiiVariable < ((UINTN)VarCheckHiiBin + VarCheckHiiBinSize)) {\r
DumpHiiVariable (HiiVariable);\r
//\r
// For Hii Variable header align.\r
//\r
- HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *) HEADER_ALIGN (((UINTN) HiiVariable + HiiVariable->Length));\r
+ HiiVariable = (VAR_CHECK_HII_VARIABLE_HEADER *)HEADER_ALIGN (((UINTN)HiiVariable + HiiVariable->Length));\r
}\r
}\r
+\r
#endif\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
VarCheckHiiLibNullClassConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
VarCheckLibRegisterEndOfDxeCallback (VarCheckHiiGen);\r
- VarCheckLibRegisterAddressPointer ((VOID **) &mVarCheckHiiBin);\r
+ VarCheckLibRegisterAddressPointer ((VOID **)&mVarCheckHiiBin);\r
VarCheckLibRegisterSetVariableCheckHandler (SetVariableCheckHandlerHii);\r
\r
return EFI_SUCCESS;\r
}\r
-\r
projects / mirror_edk2.git / blobdiff