#include <Library/PcdLib.h>\r
#include <Library/TpmMeasurementLib.h>\r
\r
-#define FIELD_SIZE_OF(TYPE, Field) ((UINTN)sizeof(((TYPE *)0)->Field))\r
+#define FIELD_SIZE_OF(TYPE, Field) ((UINTN)sizeof(((TYPE *)0)->Field))\r
\r
typedef struct {\r
- UINT8 Type;\r
- UINTN Offset;\r
- UINTN Size;\r
- UINT32 Flags;\r
+ UINT8 Type;\r
+ UINTN Offset;\r
+ UINTN Size;\r
+ UINT32 Flags;\r
} SMBIOS_FILTER_TABLE;\r
#define SMBIOS_FILTER_TABLE_FLAG_IS_STRING BIT0\r
\r
typedef struct {\r
- UINT8 Type;\r
- SMBIOS_FILTER_TABLE *Filter; // NULL means all fields\r
- UINTN FilterCount;\r
+ UINT8 Type;\r
+ SMBIOS_FILTER_TABLE *Filter; // NULL means all fields\r
+ UINTN FilterCount;\r
} SMBIOS_FILTER_STRUCT;\r
\r
//\r
// Platform Specific Policy\r
//\r
SMBIOS_FILTER_TABLE mSmbiosFilterType1BlackList[] = {\r
- {0x01, OFFSET_OF(SMBIOS_TABLE_TYPE1, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE1, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x01, OFFSET_OF(SMBIOS_TABLE_TYPE1, Uuid), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE1, Uuid), 0},\r
- {0x01, OFFSET_OF(SMBIOS_TABLE_TYPE1, WakeUpType), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE1, WakeUpType), 0},\r
+ { 0x01, OFFSET_OF (SMBIOS_TABLE_TYPE1, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE1, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x01, OFFSET_OF (SMBIOS_TABLE_TYPE1, Uuid), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE1, Uuid), 0 },\r
+ { 0x01, OFFSET_OF (SMBIOS_TABLE_TYPE1, WakeUpType), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE1, WakeUpType), 0 },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType2BlackList[] = {\r
- {0x02, OFFSET_OF(SMBIOS_TABLE_TYPE2, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE2, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x02, OFFSET_OF(SMBIOS_TABLE_TYPE2, LocationInChassis), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE2, LocationInChassis), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
+ { 0x02, OFFSET_OF (SMBIOS_TABLE_TYPE2, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE2, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x02, OFFSET_OF (SMBIOS_TABLE_TYPE2, LocationInChassis), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE2, LocationInChassis), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType3BlackList[] = {\r
- {0x03, OFFSET_OF(SMBIOS_TABLE_TYPE3, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE3, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x03, OFFSET_OF(SMBIOS_TABLE_TYPE3, AssetTag), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE3, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
+ { 0x03, OFFSET_OF (SMBIOS_TABLE_TYPE3, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE3, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x03, OFFSET_OF (SMBIOS_TABLE_TYPE3, AssetTag), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE3, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType4BlackList[] = {\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, AssetTag), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, PartNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, PartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, CoreCount), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, CoreCount), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, EnabledCoreCount), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, EnabledCoreCount), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, ThreadCount), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, ThreadCount), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, CoreCount2), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, CoreCount2), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, EnabledCoreCount2), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, EnabledCoreCount2), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, ThreadCount2), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, ThreadCount2), 0},\r
- {0x04, OFFSET_OF(SMBIOS_TABLE_TYPE4, Voltage), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE4, Voltage), 0},\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, AssetTag), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, PartNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, PartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, CoreCount), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, CoreCount), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, EnabledCoreCount), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, EnabledCoreCount), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, ThreadCount), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, ThreadCount), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, CoreCount2), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, CoreCount2), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, EnabledCoreCount2), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, EnabledCoreCount2), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, ThreadCount2), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, ThreadCount2), 0 },\r
+ { 0x04, OFFSET_OF (SMBIOS_TABLE_TYPE4, Voltage), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE4, Voltage), 0 },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType17BlackList[] = {\r
- {0x11, OFFSET_OF(SMBIOS_TABLE_TYPE17, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE17, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x11, OFFSET_OF(SMBIOS_TABLE_TYPE17, AssetTag), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE17, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x11, OFFSET_OF(SMBIOS_TABLE_TYPE17, PartNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE17, PartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
+ { 0x11, OFFSET_OF (SMBIOS_TABLE_TYPE17, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE17, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x11, OFFSET_OF (SMBIOS_TABLE_TYPE17, AssetTag), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE17, AssetTag), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x11, OFFSET_OF (SMBIOS_TABLE_TYPE17, PartNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE17, PartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType22BlackList[] = {\r
- {0x16, OFFSET_OF(SMBIOS_TABLE_TYPE22, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE22, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x16, OFFSET_OF(SMBIOS_TABLE_TYPE22, SBDSSerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE22, SBDSSerialNumber), 0},\r
- {0x16, OFFSET_OF(SMBIOS_TABLE_TYPE22, SBDSManufactureDate), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE22, SBDSManufactureDate), 0},\r
+ { 0x16, OFFSET_OF (SMBIOS_TABLE_TYPE22, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE22, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x16, OFFSET_OF (SMBIOS_TABLE_TYPE22, SBDSSerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE22, SBDSSerialNumber), 0 },\r
+ { 0x16, OFFSET_OF (SMBIOS_TABLE_TYPE22, SBDSManufactureDate), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE22, SBDSManufactureDate), 0 },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType23BlackList[] = {\r
- {0x17, OFFSET_OF(SMBIOS_TABLE_TYPE23, ResetCount), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE23, ResetCount), 0},\r
+ { 0x17, OFFSET_OF (SMBIOS_TABLE_TYPE23, ResetCount), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE23, ResetCount), 0 },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType27BlackList[] = {\r
- {0x1B, OFFSET_OF(SMBIOS_TABLE_TYPE27, NominalSpeed), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE27, NominalSpeed), 0},\r
+ { 0x1B, OFFSET_OF (SMBIOS_TABLE_TYPE27, NominalSpeed), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE27, NominalSpeed), 0 },\r
};\r
SMBIOS_FILTER_TABLE mSmbiosFilterType39BlackList[] = {\r
- {0x27, OFFSET_OF(SMBIOS_TABLE_TYPE39, SerialNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE39, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x27, OFFSET_OF(SMBIOS_TABLE_TYPE39, AssetTagNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE39, AssetTagNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
- {0x27, OFFSET_OF(SMBIOS_TABLE_TYPE39, ModelPartNumber), FIELD_SIZE_OF(SMBIOS_TABLE_TYPE39, ModelPartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING},\r
+ { 0x27, OFFSET_OF (SMBIOS_TABLE_TYPE39, SerialNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE39, SerialNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x27, OFFSET_OF (SMBIOS_TABLE_TYPE39, AssetTagNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE39, AssetTagNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
+ { 0x27, OFFSET_OF (SMBIOS_TABLE_TYPE39, ModelPartNumber), FIELD_SIZE_OF (SMBIOS_TABLE_TYPE39, ModelPartNumber), SMBIOS_FILTER_TABLE_FLAG_IS_STRING },\r
};\r
\r
SMBIOS_FILTER_STRUCT mSmbiosFilterStandardTableBlackList[] = {\r
- {0x01, mSmbiosFilterType1BlackList, sizeof(mSmbiosFilterType1BlackList)/sizeof(mSmbiosFilterType1BlackList[0])},\r
- {0x02, mSmbiosFilterType2BlackList, sizeof(mSmbiosFilterType2BlackList)/sizeof(mSmbiosFilterType2BlackList[0])},\r
- {0x03, mSmbiosFilterType3BlackList, sizeof(mSmbiosFilterType3BlackList)/sizeof(mSmbiosFilterType3BlackList[0])},\r
- {0x04, mSmbiosFilterType4BlackList, sizeof(mSmbiosFilterType4BlackList)/sizeof(mSmbiosFilterType4BlackList[0])},\r
- {0x0B, NULL, 0},\r
- {0x0F, NULL, 0},\r
- {0x11, mSmbiosFilterType17BlackList, sizeof(mSmbiosFilterType17BlackList)/sizeof(mSmbiosFilterType17BlackList[0])},\r
- {0x12, NULL, 0},\r
- {0x16, mSmbiosFilterType22BlackList, sizeof(mSmbiosFilterType22BlackList)/sizeof(mSmbiosFilterType22BlackList[0])},\r
- {0x17, mSmbiosFilterType23BlackList, sizeof(mSmbiosFilterType23BlackList)/sizeof(mSmbiosFilterType23BlackList[0])},\r
- {0x1B, mSmbiosFilterType27BlackList, sizeof(mSmbiosFilterType27BlackList)/sizeof(mSmbiosFilterType27BlackList[0])},\r
- {0x1F, NULL, 0},\r
- {0x21, NULL, 0},\r
- {0x27, mSmbiosFilterType39BlackList, sizeof(mSmbiosFilterType39BlackList)/sizeof(mSmbiosFilterType39BlackList[0])},\r
+ { 0x01, mSmbiosFilterType1BlackList, sizeof (mSmbiosFilterType1BlackList)/sizeof (mSmbiosFilterType1BlackList[0]) },\r
+ { 0x02, mSmbiosFilterType2BlackList, sizeof (mSmbiosFilterType2BlackList)/sizeof (mSmbiosFilterType2BlackList[0]) },\r
+ { 0x03, mSmbiosFilterType3BlackList, sizeof (mSmbiosFilterType3BlackList)/sizeof (mSmbiosFilterType3BlackList[0]) },\r
+ { 0x04, mSmbiosFilterType4BlackList, sizeof (mSmbiosFilterType4BlackList)/sizeof (mSmbiosFilterType4BlackList[0]) },\r
+ { 0x0B, NULL, 0 },\r
+ { 0x0F, NULL, 0 },\r
+ { 0x11, mSmbiosFilterType17BlackList, sizeof (mSmbiosFilterType17BlackList)/sizeof (mSmbiosFilterType17BlackList[0]) },\r
+ { 0x12, NULL, 0 },\r
+ { 0x16, mSmbiosFilterType22BlackList, sizeof (mSmbiosFilterType22BlackList)/sizeof (mSmbiosFilterType22BlackList[0]) },\r
+ { 0x17, mSmbiosFilterType23BlackList, sizeof (mSmbiosFilterType23BlackList)/sizeof (mSmbiosFilterType23BlackList[0]) },\r
+ { 0x1B, mSmbiosFilterType27BlackList, sizeof (mSmbiosFilterType27BlackList)/sizeof (mSmbiosFilterType27BlackList[0]) },\r
+ { 0x1F, NULL, 0 },\r
+ { 0x21, NULL, 0 },\r
+ { 0x27, mSmbiosFilterType39BlackList, sizeof (mSmbiosFilterType39BlackList)/sizeof (mSmbiosFilterType39BlackList[0]) },\r
};\r
\r
-EFI_SMBIOS_PROTOCOL *mSmbios;\r
-UINTN mMaxLen;\r
+EFI_SMBIOS_PROTOCOL *mSmbios;\r
+UINTN mMaxLen;\r
\r
#pragma pack (1)\r
\r
#define SMBIOS_HANDOFF_TABLE_DESC "SmbiosTable"\r
typedef struct {\r
- UINT8 TableDescriptionSize;\r
- UINT8 TableDescription[sizeof(SMBIOS_HANDOFF_TABLE_DESC)];\r
- UINT64 NumberOfTables;\r
- EFI_CONFIGURATION_TABLE TableEntry[1];\r
+ UINT8 TableDescriptionSize;\r
+ UINT8 TableDescription[sizeof (SMBIOS_HANDOFF_TABLE_DESC)];\r
+ UINT64 NumberOfTables;\r
+ EFI_CONFIGURATION_TABLE TableEntry[1];\r
} SMBIOS_HANDOFF_TABLE_POINTERS2;\r
\r
#pragma pack ()\r
)\r
{\r
UINTN Index;\r
+\r
for (Index = 0; Index < Size; Index++) {\r
DEBUG ((DEBUG_VERBOSE, "%02x", (UINTN)Data[Index]));\r
}\r
IN UINTN Size\r
)\r
{\r
- UINTN Index;\r
- UINTN Count;\r
- UINTN Left;\r
+ UINTN Index;\r
+ UINTN Count;\r
+ UINTN Left;\r
\r
-#define COLUME_SIZE (16 * 2)\r
+ #define COLUME_SIZE (16 * 2)\r
\r
Count = Size / COLUME_SIZE;\r
Left = Size % COLUME_SIZE;\r
}\r
}\r
\r
-\r
/**\r
\r
This function get filter structure by SMBIOS type.\r
**/\r
SMBIOS_FILTER_STRUCT *\r
GetFilterStructByType (\r
- IN UINT8 Type\r
+ IN UINT8 Type\r
)\r
{\r
UINTN Index;\r
- for (Index = 0; Index < sizeof(mSmbiosFilterStandardTableBlackList)/sizeof(mSmbiosFilterStandardTableBlackList[0]); Index++) {\r
+\r
+ for (Index = 0; Index < sizeof (mSmbiosFilterStandardTableBlackList)/sizeof (mSmbiosFilterStandardTableBlackList[0]); Index++) {\r
if (mSmbiosFilterStandardTableBlackList[Index].Type == Type) {\r
return &mSmbiosFilterStandardTableBlackList[Index];\r
}\r
}\r
+\r
return NULL;\r
}\r
\r
**/\r
CHAR8 *\r
GetSmbiosStringById (\r
- IN EFI_SMBIOS_TABLE_HEADER *Head,\r
- IN SMBIOS_TABLE_STRING StringId,\r
- OUT UINTN *StringLen\r
+ IN EFI_SMBIOS_TABLE_HEADER *Head,\r
+ IN SMBIOS_TABLE_STRING StringId,\r
+ OUT UINTN *StringLen\r
)\r
{\r
UINTN Size;\r
UINTN StringsNumber;\r
CHAR8 *String;\r
\r
- CharInStr = (CHAR8 *)Head + Head->Length;\r
- Size = Head->Length;\r
+ CharInStr = (CHAR8 *)Head + Head->Length;\r
+ Size = Head->Length;\r
StringsNumber = 0;\r
- StrLen = 0;\r
+ StrLen = 0;\r
//\r
// look for the two consecutive zeros, check the string limit by the way.\r
//\r
Size += 1;\r
CharInStr++;\r
}\r
+\r
String = CharInStr;\r
\r
- for (StrLen = 0 ; StrLen < mMaxLen; StrLen++) {\r
+ for (StrLen = 0; StrLen < mMaxLen; StrLen++) {\r
if (*(CharInStr+StrLen) == 0) {\r
break;\r
}\r
}\r
+\r
*StringLen = StrLen;\r
\r
if (StrLen == mMaxLen) {\r
//\r
// forward the pointer\r
//\r
- CharInStr += StrLen;\r
- Size += StrLen;\r
+ CharInStr += StrLen;\r
+ Size += StrLen;\r
StringsNumber += 1;\r
if (StringsNumber == StringId) {\r
break;\r
**/\r
VOID\r
FilterSmbiosEntry (\r
- IN OUT VOID *TableEntry,\r
- IN UINTN TableEntrySize\r
+ IN OUT VOID *TableEntry,\r
+ IN UINTN TableEntrySize\r
)\r
{\r
SMBIOS_FILTER_STRUCT *FilterStruct;\r
UINTN StringLen;\r
\r
DEBUG ((DEBUG_INFO, "Smbios Table (Type - %d):\n", ((SMBIOS_STRUCTURE *)TableEntry)->Type));\r
- DEBUG_CODE (InternalDumpHex (TableEntry, TableEntrySize););\r
+ DEBUG_CODE (\r
+ InternalDumpHex (TableEntry, TableEntrySize);\r
+ );\r
\r
//\r
// Skip measurement for OEM types.\r
//\r
if (((SMBIOS_STRUCTURE *)TableEntry)->Type >= SMBIOS_OEM_BEGIN) {\r
// zero all table fields, except header\r
- ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySize - sizeof(SMBIOS_STRUCTURE));\r
+ ZeroMem ((UINT8 *)TableEntry + sizeof (SMBIOS_STRUCTURE), TableEntrySize - sizeof (SMBIOS_STRUCTURE));\r
} else {\r
FilterStruct = GetFilterStructByType (((SMBIOS_STRUCTURE *)TableEntry)->Type);\r
if (FilterStruct != NULL) {\r
- if (FilterStruct->Filter == NULL || FilterStruct->FilterCount == 0) {\r
+ if ((FilterStruct->Filter == NULL) || (FilterStruct->FilterCount == 0)) {\r
// zero all table fields, except header\r
- ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySize - sizeof(SMBIOS_STRUCTURE));\r
+ ZeroMem ((UINT8 *)TableEntry + sizeof (SMBIOS_STRUCTURE), TableEntrySize - sizeof (SMBIOS_STRUCTURE));\r
} else {\r
Filter = FilterStruct->Filter;\r
for (Index = 0; Index < FilterStruct->FilterCount; Index++) {\r
- if (((SMBIOS_STRUCTURE *) TableEntry)->Length >= (Filter[Index].Offset + Filter[Index].Size)) {\r
+ if (((SMBIOS_STRUCTURE *)TableEntry)->Length >= (Filter[Index].Offset + Filter[Index].Size)) {\r
//\r
// The field is present in the SMBIOS entry.\r
//\r
if ((Filter[Index].Flags & SMBIOS_FILTER_TABLE_FLAG_IS_STRING) != 0) {\r
- CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offset, sizeof(StringId));\r
+ CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offset, sizeof (StringId));\r
if (StringId != 0) {\r
// set ' ' for string field\r
String = GetSmbiosStringById (TableEntry, StringId, &StringLen);\r
ASSERT (String != NULL);\r
- //DEBUG ((DEBUG_INFO,"StrId(0x%x)-%a(%d)\n", StringId, String, StringLen));\r
+ // DEBUG ((DEBUG_INFO,"StrId(0x%x)-%a(%d)\n", StringId, String, StringLen));\r
SetMem (String, StringLen, ' ');\r
}\r
}\r
+\r
// zero non-string field\r
ZeroMem ((UINT8 *)TableEntry + Filter[Index].Offset, Filter[Index].Size);\r
}\r
}\r
\r
DEBUG ((DEBUG_INFO, "Filter Smbios Table (Type - %d):\n", ((SMBIOS_STRUCTURE *)TableEntry)->Type));\r
- DEBUG_CODE (InternalDumpHex (TableEntry, TableEntrySize););\r
+ DEBUG_CODE (\r
+ InternalDumpHex (TableEntry, TableEntrySize);\r
+ );\r
}\r
\r
/**\r
**/\r
UINTN\r
GetSmbiosStructureSize (\r
- IN EFI_SMBIOS_TABLE_HEADER *Head,\r
- OUT UINTN *NumberOfStrings\r
+ IN EFI_SMBIOS_TABLE_HEADER *Head,\r
+ OUT UINTN *NumberOfStrings\r
)\r
{\r
UINTN Size;\r
CHAR8 *CharInStr;\r
UINTN StringsNumber;\r
\r
- CharInStr = (CHAR8 *)Head + Head->Length;\r
- Size = Head->Length;\r
+ CharInStr = (CHAR8 *)Head + Head->Length;\r
+ Size = Head->Length;\r
StringsNumber = 0;\r
- StrLen = 0;\r
+ StrLen = 0;\r
//\r
// look for the two consecutive zeros, check the string limit by the way.\r
//\r
CharInStr++;\r
}\r
\r
- for (StrLen = 0 ; StrLen < mMaxLen; StrLen++) {\r
+ for (StrLen = 0; StrLen < mMaxLen; StrLen++) {\r
if (*(CharInStr+StrLen) == 0) {\r
break;\r
}\r
//\r
// forward the pointer\r
//\r
- CharInStr += StrLen;\r
- Size += StrLen;\r
+ CharInStr += StrLen;\r
+ Size += StrLen;\r
StringsNumber += 1;\r
}\r
\r
if (NumberOfStrings != NULL) {\r
*NumberOfStrings = StringsNumber;\r
}\r
+\r
return Size;\r
}\r
\r
**/\r
UINTN\r
GetSmbiosTableLength (\r
- IN VOID *TableAddress,\r
- IN UINTN TableMaximumSize\r
+ IN VOID *TableAddress,\r
+ IN UINTN TableMaximumSize\r
)\r
{\r
- VOID *TableEntry;\r
- VOID *TableAddressEnd;\r
- UINTN TableEntryLength;\r
+ VOID *TableEntry;\r
+ VOID *TableAddressEnd;\r
+ UINTN TableEntryLength;\r
\r
TableAddressEnd = (VOID *)((UINTN)TableAddress + TableMaximumSize);\r
- TableEntry = TableAddress;\r
+ TableEntry = TableAddress;\r
while (TableEntry < TableAddressEnd) {\r
TableEntryLength = GetSmbiosStructureSize (TableEntry, NULL);\r
if (TableEntryLength == 0) {\r
break;\r
}\r
+\r
if (((SMBIOS_STRUCTURE *)TableEntry)->Type == 127) {\r
TableEntry = (VOID *)((UINTN)TableEntry + TableEntryLength);\r
break;\r
}\r
+\r
TableEntry = (VOID *)((UINTN)TableEntry + TableEntryLength);\r
}\r
\r
VOID *TableEntry;\r
UINTN TableEntryLength;\r
\r
- TableEntry = TableAddress;\r
+ TableEntry = TableAddress;\r
TableAddressEnd = (VOID *)((UINTN)TableAddress + TableLength);\r
while ((UINTN)TableEntry < (UINTN)TableAddressEnd) {\r
TableEntryLength = GetSmbiosStructureSize (TableEntry, NULL);\r
VOID\r
EFIAPI\r
MeasureSmbiosTable (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDOFF_TABLE_POINTERS HandoffTables;\r
- SMBIOS_HANDOFF_TABLE_POINTERS2 SmbiosHandoffTables2;\r
- UINT32 EventType;\r
- VOID *EventLog;\r
- UINT32 EventLogSize;\r
- SMBIOS_TABLE_ENTRY_POINT *SmbiosTable;\r
- SMBIOS_TABLE_3_0_ENTRY_POINT *Smbios3Table;\r
- VOID *SmbiosTableAddress;\r
- VOID *TableAddress;\r
- UINTN TableLength;\r
-\r
- SmbiosTable = NULL;\r
- Smbios3Table = NULL;\r
+ EFI_STATUS Status;\r
+ EFI_HANDOFF_TABLE_POINTERS HandoffTables;\r
+ SMBIOS_HANDOFF_TABLE_POINTERS2 SmbiosHandoffTables2;\r
+ UINT32 EventType;\r
+ VOID *EventLog;\r
+ UINT32 EventLogSize;\r
+ SMBIOS_TABLE_ENTRY_POINT *SmbiosTable;\r
+ SMBIOS_TABLE_3_0_ENTRY_POINT *Smbios3Table;\r
+ VOID *SmbiosTableAddress;\r
+ VOID *TableAddress;\r
+ UINTN TableLength;\r
+\r
+ SmbiosTable = NULL;\r
+ Smbios3Table = NULL;\r
SmbiosTableAddress = NULL;\r
- TableLength = 0;\r
+ TableLength = 0;\r
\r
if (mSmbios->MajorVersion >= 3) {\r
Status = EfiGetSystemConfigurationTable (\r
&gEfiSmbios3TableGuid,\r
- (VOID **) &Smbios3Table\r
+ (VOID **)&Smbios3Table\r
);\r
if (!EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_INFO, "Smbios3Table:\n"));\r
- DEBUG ((DEBUG_INFO, " AnchorString - '%c%c%c%c%c'\n",\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ " AnchorString - '%c%c%c%c%c'\n",\r
Smbios3Table->AnchorString[0],\r
Smbios3Table->AnchorString[1],\r
Smbios3Table->AnchorString[2],\r
if (Smbios3Table == NULL) {\r
Status = EfiGetSystemConfigurationTable (\r
&gEfiSmbiosTableGuid,\r
- (VOID **) &SmbiosTable\r
+ (VOID **)&SmbiosTable\r
);\r
if (!EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_INFO, "SmbiosTable:\n"));\r
- DEBUG ((DEBUG_INFO, " AnchorString - '%c%c%c%c'\n",\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ " AnchorString - '%c%c%c%c'\n",\r
SmbiosTable->AnchorString[0],\r
SmbiosTable->AnchorString[1],\r
SmbiosTable->AnchorString[2],\r
DEBUG ((DEBUG_INFO, " MinorVersion - 0x%02x\n", SmbiosTable->MinorVersion));\r
DEBUG ((DEBUG_INFO, " MaxStructureSize - 0x%08x\n", SmbiosTable->MaxStructureSize));\r
DEBUG ((DEBUG_INFO, " EntryPointRevision - 0x%02x\n", SmbiosTable->EntryPointRevision));\r
- DEBUG ((DEBUG_INFO, " FormattedArea - '%c%c%c%c%c'\n",\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ " FormattedArea - '%c%c%c%c%c'\n",\r
SmbiosTable->FormattedArea[0],\r
SmbiosTable->FormattedArea[1],\r
SmbiosTable->FormattedArea[2],\r
SmbiosTable->FormattedArea[3],\r
SmbiosTable->FormattedArea[4]\r
));\r
- DEBUG ((DEBUG_INFO, " IntermediateAnchorString - '%c%c%c%c%c'\n",\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ " IntermediateAnchorString - '%c%c%c%c%c'\n",\r
SmbiosTable->IntermediateAnchorString[0],\r
SmbiosTable->IntermediateAnchorString[1],\r
SmbiosTable->IntermediateAnchorString[2],\r
\r
if (Smbios3Table != NULL) {\r
SmbiosTableAddress = (VOID *)(UINTN)Smbios3Table->TableAddress;\r
- TableLength = GetSmbiosTableLength (SmbiosTableAddress, Smbios3Table->TableMaximumSize);\r
+ TableLength = GetSmbiosTableLength (SmbiosTableAddress, Smbios3Table->TableMaximumSize);\r
} else if (SmbiosTable != NULL) {\r
SmbiosTableAddress = (VOID *)(UINTN)SmbiosTable->TableAddress;\r
- TableLength = SmbiosTable->TableLength;\r
+ TableLength = SmbiosTable->TableLength;\r
}\r
\r
if (SmbiosTableAddress != NULL) {\r
DEBUG ((DEBUG_INFO, "The Smbios Table starts at: 0x%x\n", SmbiosTableAddress));\r
DEBUG ((DEBUG_INFO, "The Smbios Table size: 0x%x\n", TableLength));\r
- DEBUG_CODE (InternalDumpHex ((UINT8 *)(UINTN)SmbiosTableAddress, TableLength););\r
+ DEBUG_CODE (\r
+ InternalDumpHex ((UINT8 *)(UINTN)SmbiosTableAddress, TableLength);\r
+ );\r
\r
TableAddress = AllocateCopyPool ((UINTN)TableLength, (VOID *)(UINTN)SmbiosTableAddress);\r
if (TableAddress == NULL) {\r
- return ;\r
+ return;\r
}\r
\r
FilterSmbiosTable (TableAddress, TableLength);\r
\r
DEBUG ((DEBUG_INFO, "The final Smbios Table starts at: 0x%x\n", TableAddress));\r
DEBUG ((DEBUG_INFO, "The final Smbios Table size: 0x%x\n", TableLength));\r
- DEBUG_CODE (InternalDumpHex (TableAddress, TableLength););\r
+ DEBUG_CODE (\r
+ InternalDumpHex (TableAddress, TableLength);\r
+ );\r
\r
HandoffTables.NumberOfTables = 1;\r
if (Smbios3Table != NULL) {\r
CopyGuid (&(HandoffTables.TableEntry[0].VendorGuid), &gEfiSmbiosTableGuid);\r
HandoffTables.TableEntry[0].VendorTable = SmbiosTable;\r
}\r
- EventType = EV_EFI_HANDOFF_TABLES;\r
- EventLog = &HandoffTables;\r
+\r
+ EventType = EV_EFI_HANDOFF_TABLES;\r
+ EventLog = &HandoffTables;\r
EventLogSize = sizeof (HandoffTables);\r
\r
- if (PcdGet32(PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105) {\r
- SmbiosHandoffTables2.TableDescriptionSize = sizeof(SmbiosHandoffTables2.TableDescription);\r
- CopyMem (SmbiosHandoffTables2.TableDescription, SMBIOS_HANDOFF_TABLE_DESC, sizeof(SmbiosHandoffTables2.TableDescription));\r
+ if (PcdGet32 (PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105) {\r
+ SmbiosHandoffTables2.TableDescriptionSize = sizeof (SmbiosHandoffTables2.TableDescription);\r
+ CopyMem (SmbiosHandoffTables2.TableDescription, SMBIOS_HANDOFF_TABLE_DESC, sizeof (SmbiosHandoffTables2.TableDescription));\r
SmbiosHandoffTables2.NumberOfTables = HandoffTables.NumberOfTables;\r
- CopyMem (&(SmbiosHandoffTables2.TableEntry[0]), &(HandoffTables.TableEntry[0]), sizeof(SmbiosHandoffTables2.TableEntry[0]));\r
- EventType = EV_EFI_HANDOFF_TABLES2;\r
- EventLog = &SmbiosHandoffTables2;\r
+ CopyMem (&(SmbiosHandoffTables2.TableEntry[0]), &(HandoffTables.TableEntry[0]), sizeof (SmbiosHandoffTables2.TableEntry[0]));\r
+ EventType = EV_EFI_HANDOFF_TABLES2;\r
+ EventLog = &SmbiosHandoffTables2;\r
EventLogSize = sizeof (SmbiosHandoffTables2);\r
}\r
+\r
Status = TpmMeasureAndLogData (\r
1, // PCRIndex\r
EventType, // EventType\r
TableLength // HashDataLen\r
);\r
if (!EFI_ERROR (Status)) {\r
- gBS->CloseEvent (Event) ;\r
+ gBS->CloseEvent (Event);\r
}\r
}\r
\r
- return ;\r
+ return;\r
}\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
SmbiosMeasurementDriverEntryPoint (\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
- EFI_STATUS Status;\r
- EFI_EVENT Event;\r
+ EFI_STATUS Status;\r
+ EFI_EVENT Event;\r
\r
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &mSmbios);\r
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **)&mSmbios);\r
ASSERT_EFI_ERROR (Status);\r
DEBUG ((DEBUG_INFO, "The Smbios Table Version: %x.%x\n", mSmbios->MajorVersion, mSmbios->MinorVersion));\r
\r
- if (mSmbios->MajorVersion < 2 || (mSmbios->MajorVersion == 2 && mSmbios->MinorVersion < 7)){\r
+ if ((mSmbios->MajorVersion < 2) || ((mSmbios->MajorVersion == 2) && (mSmbios->MinorVersion < 7))) {\r
mMaxLen = SMBIOS_STRING_MAX_LENGTH;\r
} else if (mSmbios->MajorVersion < 3) {\r
//\r
projects / mirror_edk2.git / blobdiff