/** @file\r
Module for clarifying the content of the smbios structure element information.\r
\r
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+ (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR> \r
+ (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
**/\r
\r
-#include "../UefiShellDebug1CommandsLib.h"\r
+#include "UefiShellDebug1CommandsLib.h"\r
#include "PrintInfo.h"\r
#include "LibSmbiosView.h"\r
#include "QueryTable.h"\r
//\r
#define BIT(value, bit) ((value) & ((UINT64) 1) << (bit))\r
\r
+//\r
+// Check if above or equal to version\r
+//\r
+#define AE_SMBIOS_VERSION(MajorVersion, MinorVersion) \\r
+ (SmbiosMajorVersion > (MajorVersion) || (SmbiosMajorVersion == (MajorVersion) && SmbiosMinorVersion >= (MinorVersion)))\r
+\r
//\r
//////////////////////////////////////////////////////////\r
// Macros of print structure element, simplify coding.\r
//\r
#define PRINT_PENDING_STRING(pStruct, type, element) \\r
do { \\r
- CHAR8 StringBuf[64]; \\r
- SetMem (StringBuf, sizeof (StringBuf), 0x00); \\r
- SmbiosGetPendingString ((pStruct), (pStruct->type->element), StringBuf); \\r
+ CHAR8 *StringBuf; \\r
+ StringBuf = LibGetSmbiosString ((pStruct), (pStruct->type->element)); \\r
ShellPrintEx(-1,-1,L"%a",#element); \\r
- ShellPrintEx(-1,-1,L": %a\n", StringBuf); \\r
+ ShellPrintEx(-1,-1,L": %a\n", (StringBuf != NULL) ? StringBuf: ""); \\r
} while (0);\r
\r
#define PRINT_SMBIOS_STRING(pStruct, stringnumber, element) \\r
do { \\r
- CHAR8 StringBuf[64]; \\r
- SetMem (StringBuf, sizeof (StringBuf), 0x00); \\r
- SmbiosGetPendingString ((pStruct), (stringnumber), StringBuf); \\r
+ CHAR8 *StringBuf; \\r
+ StringBuf = LibGetSmbiosString ((pStruct), (stringnumber)); \\r
ShellPrintEx(-1,-1,L"%a",#element); \\r
- ShellPrintEx(-1,-1,L": %a\n", StringBuf); \\r
+ ShellPrintEx(-1,-1,L": %a\n", (StringBuf != NULL) ? StringBuf: ""); \\r
} while (0);\r
\r
#define PRINT_STRUCT_VALUE(pStruct, type, element) \\r
ShellPrintEx(-1,-1,L": 0x%x\n", (pStruct->type->element)); \\r
} while (0);\r
\r
+#define PRINT_STRUCT_VALUE_LH(pStruct, type, element) \\r
+ do { \\r
+ ShellPrintEx(-1,-1,L"%a",#element); \\r
+ ShellPrintEx(-1,-1,L": 0x%lx\n", (pStruct->type->element)); \\r
+ } while (0);\r
+\r
#define PRINT_BIT_FIELD(pStruct, type, element, size) \\r
do { \\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DUMP), gShellDebug1HiiHandle); \\r
Copy Length of Src buffer to Dest buffer,\r
add a NULL termination to Dest buffer.\r
\r
- @param[in,out] Dest Destination buffer head.\r
- @param[in] Src Source buffer head.\r
- @param[in] Length Length of buffer to be copied.\r
+ @param[in, out] Dest Destination buffer head.\r
+ @param[in] Src Source buffer head.\r
+ @param[in] Length Length of buffer to be copied.\r
**/\r
VOID\r
MemToString (\r
**/\r
VOID\r
SmbiosPrintEPSInfo (\r
- IN SMBIOS_STRUCTURE_TABLE *SmbiosTable,\r
- IN UINT8 Option\r
+ IN SMBIOS_TABLE_ENTRY_POINT *SmbiosTable,\r
+ IN UINT8 Option\r
)\r
{\r
UINT8 Anchor[5];\r
Print (L"\n");\r
}\r
\r
+/**\r
+ Print the info of 64-bit EPS(Entry Point Structure).\r
+\r
+ @param[in] SmbiosTable Pointer to the SMBIOS table entry point.\r
+ @param[in] Option Display option.\r
+**/\r
+VOID\r
+Smbios64BitPrintEPSInfo (\r
+ IN SMBIOS_TABLE_3_0_ENTRY_POINT *SmbiosTable,\r
+ IN UINT8 Option\r
+ )\r
+{\r
+ UINT8 Anchor[5];\r
+\r
+ if (SmbiosTable == NULL) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_SMBIOSTABLE_NULL), gShellDebug1HiiHandle);\r
+ return ;\r
+ }\r
+\r
+ if (Option == SHOW_NONE) {\r
+ return ;\r
+ }\r
+\r
+ if (Option >= SHOW_NORMAL) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_64_BIT_ENTRY_POINT_SIGN), gShellDebug1HiiHandle);\r
+\r
+ MemToString (Anchor, SmbiosTable->AnchorString, 5);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ANCHOR_STR), gShellDebug1HiiHandle, Anchor);\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,\r
+ STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_EPS_CHECKSUM),\r
+ gShellDebug1HiiHandle,\r
+ SmbiosTable->EntryPointStructureChecksum\r
+ );\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENTRY_POINT_LEN), gShellDebug1HiiHandle, SmbiosTable->EntryPointLength);\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,\r
+ STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_VERSION),\r
+ gShellDebug1HiiHandle,\r
+ SmbiosTable->MajorVersion,\r
+ SmbiosTable->MinorVersion\r
+ );\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,\r
+ STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DOCREV),\r
+ gShellDebug1HiiHandle,\r
+ SmbiosTable->DocRev\r
+ );\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TABLE_MAX_SIZE), gShellDebug1HiiHandle, SmbiosTable->TableMaximumSize);\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TABLE_ADDR), gShellDebug1HiiHandle, SmbiosTable->TableAddress);\r
+\r
+ }\r
+ //\r
+ // If SHOW_ALL, also print followings.\r
+ //\r
+ if (Option >= SHOW_DETAIL) {\r
+ ShellPrintHiiEx(-1,-1,NULL,\r
+ STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENTRY_POINT_REVISION),\r
+ gShellDebug1HiiHandle,\r
+ SmbiosTable->EntryPointRevision\r
+ );\r
+ }\r
+\r
+ Print (L"\n");\r
+}\r
+\r
/**\r
This function print the content of the structure pointed by Struct.\r
\r
UINT8 Index;\r
UINT8 *Buffer;\r
\r
- Buffer = (UINT8 *) (UINTN) (Struct->Raw);\r
-\r
if (Struct == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
if (Option == SHOW_NONE) {\r
return EFI_SUCCESS;\r
}\r
+\r
+ Buffer = (UINT8 *) (UINTN) (Struct->Raw);\r
+\r
//\r
// Display structure header\r
//\r
\r
switch (Struct->Hdr->Type) {\r
//\r
- //\r
+ // BIOS Information (Type 0)\r
//\r
case 0:\r
PRINT_PENDING_STRING (Struct, Type0, Vendor);\r
PRINT_PENDING_STRING (Struct, Type0, BiosVersion);\r
- PRINT_STRUCT_VALUE (Struct, Type0, BiosSegment);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type0, BiosSegment);\r
PRINT_PENDING_STRING (Struct, Type0, BiosReleaseDate);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE), gShellDebug1HiiHandle, 64 * (Struct->Type0->BiosSize + 1));\r
\r
- if (Option < SHOW_DETAIL) {\r
- PRINT_STRUCT_VALUE_H (Struct, Type0, BiosCharacteristics);\r
- } else {\r
- DisplayBiosCharacteristics (Struct->Type0->BiosCharacteristics, Option);\r
+ DisplayBiosCharacteristics (ReadUnaligned64 ((UINT64 *) (UINTN) &(Struct->Type0->BiosCharacteristics)), Option);\r
\r
- //\r
- // The length of above format part is 0x12 bytes,\r
- // Ext bytes are following, size = 'len-0x12'.\r
- // If len-0x12 > 0, then\r
- // there are extension bytes (Byte1, byte2, byte3...)\r
- // And byte3 not stated in spec, so dump all extension bytes(1, 2, 3..)\r
- //\r
- if ((Buffer[1] - (CHAR8) 0x12) > 0) {\r
- DisplayBiosCharacteristicsExt1 (Buffer[0x12], Option);\r
- }\r
-\r
- if ((Buffer[1] - (CHAR8) 0x12) > 1) {\r
- DisplayBiosCharacteristicsExt2 (Buffer[0x13], Option);\r
- }\r
+ if (Struct->Hdr->Length > 0x12) {\r
+ DisplayBiosCharacteristicsExt1 (Struct->Type0->BIOSCharacteristicsExtensionBytes[0], Option);\r
+ }\r
+ if (Struct->Hdr->Length > 0x13) {\r
+ DisplayBiosCharacteristicsExt2 (Struct->Type0->BIOSCharacteristicsExtensionBytes[1], Option);\r
+ }\r
\r
- if ((Buffer[1] - (CHAR8) 0x12) > 2) {\r
- PRINT_BIT_FIELD (\r
- Struct,\r
- Type0,\r
- BiosCharacteristics,\r
- Buffer[1] - (CHAR8) 0x12\r
- );\r
- }\r
+ if (AE_SMBIOS_VERSION (0x2, 0x4) && (Struct->Hdr->Length > 0x14)) {\r
+ PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMajorRelease);\r
+ PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMinorRelease);\r
+ PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMajorRelease);\r
+ PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMinorRelease);\r
+ }\r
+ if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x18)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE),\r
+ gShellDebug1HiiHandle,\r
+ Struct->Type0->ExtendedBiosSize.Size,\r
+ (Struct->Type0->ExtendedBiosSize.Unit == 0x0) ? L"MB": L"GB"\r
+ );\r
}\r
break;\r
\r
PRINT_PENDING_STRING (Struct, Type1, SerialNumber);\r
PRINT_BIT_FIELD (Struct, Type1, Uuid, 16);\r
DisplaySystemWakeupType (Struct->Type1->WakeUpType, Option);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x4) && (Struct->Hdr->Length > 0x19)) {\r
+ PRINT_PENDING_STRING (Struct, Type1, SKUNumber);\r
+ PRINT_PENDING_STRING (Struct, Type1, Family);\r
+ }\r
+\r
break;\r
\r
+ //\r
+ // Baseboard Information (Type 2)\r
+ //\r
case 2:\r
PRINT_PENDING_STRING (Struct, Type2, Manufacturer);\r
PRINT_PENDING_STRING (Struct, Type2, ProductName);\r
PRINT_PENDING_STRING (Struct, Type2, Version);\r
PRINT_PENDING_STRING (Struct, Type2, SerialNumber);\r
+ if (Struct->Hdr->Length > 0x8) {\r
+ PRINT_PENDING_STRING (Struct, Type2, AssetTag);\r
+ DisplayBaseBoardFeatureFlags (*(UINT8 *) &Struct->Type2->FeatureFlag, Option);\r
+ PRINT_PENDING_STRING (Struct, Type2, LocationInChassis);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type2, ChassisHandle);\r
+ DisplayBaseBoardBoardType (Struct->Type2->BoardType, Option);\r
+ }\r
break;\r
\r
//\r
DisplaySystemEnclosureStatus (Struct->Type3->ThermalState, Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_SECURITY_STATUS), gShellDebug1HiiHandle);\r
DisplaySESecurityStatus (Struct->Type3->SecurityStatus, Option);\r
- PRINT_BIT_FIELD (Struct, Type3, OemDefined, 4);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x3)) {\r
+ if (Struct->Hdr->Length > 0xD) {\r
+ PRINT_BIT_FIELD (Struct, Type3, OemDefined, 4);\r
+ }\r
+ if (Struct->Hdr->Length > 0x11) {\r
+ PRINT_STRUCT_VALUE (Struct, Type3, Height);\r
+ }\r
+ if (Struct->Hdr->Length > 0x12) {\r
+ PRINT_STRUCT_VALUE (Struct, Type3, NumberofPowerCords);\r
+ }\r
+ }\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x13)) {\r
+ if (Struct->Hdr->Length > (0x15 + (Struct->Type3->ContainedElementCount * Struct->Type3->ContainedElementRecordLength))) {\r
+ PRINT_SMBIOS_STRING (Struct, Buffer[0x15 + (Struct->Type3->ContainedElementCount * Struct->Type3->ContainedElementRecordLength)], SKUNumber);\r
+ }\r
+ }\r
break;\r
\r
//\r
// Processor Information (Type 4)\r
//\r
case 4:\r
- PRINT_STRUCT_VALUE (Struct, Type4, Socket);\r
+ PRINT_SMBIOS_STRING (Struct, Struct->Type4->Socket, SocketDesignation)\r
DisplayProcessorType (Struct->Type4->ProcessorType, Option);\r
- if ((SmbiosMajorVersion > 0x2 || (SmbiosMajorVersion == 0x2 && SmbiosMinorVersion >= 0x6)) &&\r
+ if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) &&\r
(Struct->Type4->ProcessorFamily == 0xFE)) {\r
//\r
// Get family from ProcessorFamily2 field\r
PRINT_PENDING_STRING (Struct, Type4, ProcessorManufacture);\r
PRINT_BIT_FIELD (Struct, Type4, ProcessorId, 8);\r
PRINT_PENDING_STRING (Struct, Type4, ProcessorVersion);\r
- DisplayProcessorVoltage (Struct->Type4->Voltage, Option);\r
+ DisplayProcessorVoltage (*(UINT8 *) &(Struct->Type4->Voltage), Option);\r
PRINT_STRUCT_VALUE (Struct, Type4, ExternalClock);\r
PRINT_STRUCT_VALUE (Struct, Type4, MaxSpeed);\r
PRINT_STRUCT_VALUE (Struct, Type4, CurrentSpeed);\r
PRINT_STRUCT_VALUE_H (Struct, Type4, L1CacheHandle);\r
PRINT_STRUCT_VALUE_H (Struct, Type4, L2CacheHandle);\r
PRINT_STRUCT_VALUE_H (Struct, Type4, L3CacheHandle);\r
- PRINT_PENDING_STRING (Struct, Type4, SerialNumber);\r
- PRINT_PENDING_STRING (Struct, Type4, AssetTag);\r
- PRINT_PENDING_STRING (Struct, Type4, PartNumber);\r
- if (SmbiosMajorVersion > 0x2 || (SmbiosMajorVersion == 0x2 && SmbiosMinorVersion >= 0x5)) {\r
+ if (AE_SMBIOS_VERSION (0x2, 0x3) && (Struct->Hdr->Length > 0x20)) {\r
+ PRINT_PENDING_STRING (Struct, Type4, SerialNumber);\r
+ PRINT_PENDING_STRING (Struct, Type4, AssetTag);\r
+ PRINT_PENDING_STRING (Struct, Type4, PartNumber);\r
+ }\r
+ if (AE_SMBIOS_VERSION (0x2, 0x5) && (Struct->Hdr->Length > 0x23)) {\r
PRINT_STRUCT_VALUE (Struct, Type4, CoreCount);\r
PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount);\r
PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount);\r
- PRINT_STRUCT_VALUE_H (Struct, Type4, ProcessorCharacteristics);\r
+ DisplayProcessorCharacteristics (Struct->Type4->ProcessorCharacteristics, Option);\r
+ }\r
+ if ((SmbiosMajorVersion >= 0x3) && (Struct->Hdr->Length > 0x2A)) {\r
+ PRINT_STRUCT_VALUE (Struct, Type4, CoreCount2);\r
+ PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount2);\r
+ PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount2);\r
}\r
break;\r
\r
SlotNum = Struct->Type5->AssociatedMemorySlotNum;\r
\r
DisplayMcErrorDetectMethod (Struct->Type5->ErrDetectMethod, Option);\r
- DisplayMcErrorCorrectCapability (Struct->Type5->ErrCorrectCapability, Option);\r
+ DisplayMcErrorCorrectCapability (*(UINT8 *) &(Struct->Type5->ErrCorrectCapability), Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_SUPOPRT), gShellDebug1HiiHandle);\r
DisplayMcInterleaveSupport (Struct->Type5->SupportInterleave, Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CURRENT), gShellDebug1HiiHandle);\r
DisplayMcInterleaveSupport (Struct->Type5->CurrentInterleave, Option);\r
DisplayMaxMemoryModuleSize (Struct->Type5->MaxMemoryModuleSize, SlotNum, Option);\r
- DisplayMcMemorySpeeds (Struct->Type5->SupportSpeed, Option);\r
+ DisplayMcMemorySpeeds (*(UINT16 *) &(Struct->Type5->SupportSpeed), Option);\r
DisplayMmMemoryType (Struct->Type5->SupportMemoryType, Option);\r
DisplayMemoryModuleVoltage (Struct->Type5->MemoryModuleVoltage, Option);\r
PRINT_STRUCT_VALUE (Struct, Type5, AssociatedMemorySlotNum);\r
PRINT_PENDING_STRING (Struct, Type6, SocketDesignation);\r
DisplayMmBankConnections (Struct->Type6->BankConnections, Option);\r
PRINT_STRUCT_VALUE (Struct, Type6, CurrentSpeed);\r
- DisplayMmMemoryType (Struct->Type6->CurrentMemoryType, Option);\r
+ DisplayMmMemoryType (*(UINT16 *) &(Struct->Type6->CurrentMemoryType), Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INSTALLED), gShellDebug1HiiHandle);\r
- DisplayMmMemorySize (Struct->Type6->InstalledSize, Option);\r
+ DisplayMmMemorySize (*(UINT8 *) &(Struct->Type6->InstalledSize), Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENABLED), gShellDebug1HiiHandle);\r
- DisplayMmMemorySize (Struct->Type6->EnabledSize, Option);\r
+ DisplayMmMemorySize (*(UINT8 *) &(Struct->Type6->EnabledSize), Option);\r
DisplayMmErrorStatus (Struct->Type6->ErrorStatus, Option);\r
break;\r
\r
//\r
case 7:\r
PRINT_PENDING_STRING (Struct, Type7, SocketDesignation);\r
- PRINT_STRUCT_VALUE_H (Struct, Type7, CacheConfiguration);\r
+ DisplayCacheConfiguration (Struct->Type7->CacheConfiguration, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type7, MaximumCacheSize);\r
PRINT_STRUCT_VALUE_H (Struct, Type7, InstalledSize);\r
PRINT_STRUCT_VALUE_H (Struct, Type7, SupportedSRAMType);\r
PRINT_STRUCT_VALUE_H (Struct, Type7, CurrentSRAMType);\r
- DisplayCacheSRAMType (Struct->Type7->CurrentSRAMType, Option);\r
+ DisplayCacheSRAMType (ReadUnaligned16 ((UINT16 *) (UINTN) &(Struct->Type7->CurrentSRAMType)), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type7, CacheSpeed);\r
DisplayCacheErrCorrectingType (Struct->Type7->ErrorCorrectionType, Option);\r
DisplayCacheSystemCacheType (Struct->Type7->SystemCacheType, Option);\r
DisplayCacheAssociativity (Struct->Type7->Associativity, Option);\r
+ if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x13)) {\r
+ PRINT_STRUCT_VALUE_H (Struct, Type7, MaximumCacheSize2);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type7, InstalledSize2);\r
+ }\r
break;\r
\r
//\r
Struct->Type9->SlotType,\r
Option\r
);\r
- DisplaySlotCharacteristics1 (Struct->Type9->SlotCharacteristics1, Option);\r
- DisplaySlotCharacteristics2 (Struct->Type9->SlotCharacteristics2, Option);\r
- if (SmbiosMajorVersion > 0x2 || (SmbiosMajorVersion == 0x2 && SmbiosMinorVersion >= 0x6)) {\r
+ DisplaySlotCharacteristics1 (*(UINT8 *) &(Struct->Type9->SlotCharacteristics1), Option);\r
+ DisplaySlotCharacteristics2 (*(UINT8 *) &(Struct->Type9->SlotCharacteristics2), Option);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0xD)) {\r
PRINT_STRUCT_VALUE_H (Struct, Type9, SegmentGroupNum);\r
PRINT_STRUCT_VALUE_H (Struct, Type9, BusNum);\r
PRINT_STRUCT_VALUE_H (Struct, Type9, DevFuncNum);\r
case 10:\r
{\r
UINTN NumOfDevice;\r
- NumOfDevice = (Struct->Type10->Hdr.Length - sizeof (SMBIOS_HEADER)) / (2 * sizeof (UINT8));\r
+ NumOfDevice = (Struct->Type10->Hdr.Length - sizeof (SMBIOS_STRUCTURE)) / (2 * sizeof (UINT8));\r
for (Index = 0; Index < NumOfDevice; Index++) {\r
- DisplayOnboardDeviceTypes (Struct->Type10->Device[Index].DeviceType, Option);\r
+ ShellPrintEx(-1,-1,(((Struct->Type10->Device[Index].DeviceType) & 0x80) != 0) ? L"Device Enabled\n": L"Device Disabled\n");\r
+ DisplayOnboardDeviceTypes ((Struct->Type10->Device[Index].DeviceType) & 0x7F, Option);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DESC_STRING), gShellDebug1HiiHandle);\r
- ShellPrintEx(-1,-1,L"%a",LibGetSmbiosString (Struct, Struct->Type10->Device[Index].DescriptionString));\r
+ ShellPrintEx(-1,-1,L"%a\n",LibGetSmbiosString (Struct, Struct->Type10->Device[Index].DescriptionString));\r
}\r
}\r
break;\r
\r
+ //\r
+ // Oem Strings (Type 11)\r
+ //\r
case 11:\r
PRINT_STRUCT_VALUE (Struct, Type11, StringCount);\r
for (Index = 1; Index <= Struct->Type11->StringCount; Index++) {\r
}\r
break;\r
\r
+ //\r
+ // System Configuration Options (Type 12)\r
+ //\r
case 12:\r
PRINT_STRUCT_VALUE (Struct, Type12, StringCount);\r
for (Index = 1; Index <= Struct->Type12->StringCount; Index++) {\r
}\r
break;\r
\r
+ //\r
+ // BIOS Language Information (Type 13)\r
+ //\r
case 13:\r
PRINT_STRUCT_VALUE (Struct, Type13, InstallableLanguages);\r
PRINT_STRUCT_VALUE (Struct, Type13, Flags);\r
PRINT_PENDING_STRING (Struct, Type13, CurrentLanguages);\r
break;\r
\r
+ //\r
+ // Group Associations (Type 14)\r
+ //\r
case 14:\r
- PRINT_PENDING_STRING (Struct, Type14, GroupName);\r
- PRINT_STRUCT_VALUE (Struct, Type14, ItemType);\r
- PRINT_STRUCT_VALUE (Struct, Type14, ItemHandle);\r
+ {\r
+ UINT8 NumOfItem;\r
+ NumOfItem = (Struct->Type14->Hdr.Length - 5) / 3;\r
+ PRINT_PENDING_STRING (Struct, Type14, GroupName);\r
+ for (Index = 0; Index < NumOfItem; Index++) {\r
+ ShellPrintEx(-1,-1,L"ItemType %d: %d\n", Index + 1, Struct->Type14->Group[Index].ItemType);\r
+ ShellPrintEx(-1,-1,L"ItemHandle %d: %d\n", Index + 1, Struct->Type14->Group[Index].ItemHandle);\r
+ }\r
+ }\r
break;\r
\r
//\r
//\r
case 15:\r
{\r
- EVENTLOGTYPE *Ptr;\r
- UINT8 Count;\r
- UINT8 *AccessMethodAddress;\r
+ EVENT_LOG_TYPE *Ptr;\r
+ UINT8 Count;\r
+ UINT8 *AccessMethodAddress;\r
\r
PRINT_STRUCT_VALUE_H (Struct, Type15, LogAreaLength);\r
PRINT_STRUCT_VALUE_H (Struct, Type15, LogHeaderStartOffset);\r
AccessMethodAddress + Struct->Type15->LogDataStartOffset,\r
(UINT16)\r
(\r
- Struct->Type15->LogAreaLength -\r
- (Struct->Type15->LogDataStartOffset - Struct->Type15->LogDataStartOffset)\r
- )\r
+ Struct->Type15->LogAreaLength -\r
+ (Struct->Type15->LogDataStartOffset - Struct->Type15->LogHeaderStartOffset)\r
+ )\r
);\r
}\r
\r
PRINT_STRUCT_VALUE_H (Struct, Type16, MaximumCapacity);\r
PRINT_STRUCT_VALUE_H (Struct, Type16, MemoryErrorInformationHandle);\r
PRINT_STRUCT_VALUE_H (Struct, Type16, NumberOfMemoryDevices);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && Struct->Hdr->Length > 0xF) {\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type16, ExtendedMaximumCapacity);\r
+ }\r
break;\r
\r
//\r
PRINT_PENDING_STRING (Struct, Type17, DeviceLocator);\r
PRINT_PENDING_STRING (Struct, Type17, BankLocator);\r
DisplayMemoryDeviceType (Struct->Type17->MemoryType, Option);\r
- DisplayMemoryDeviceTypeDetail (Struct->Type17->TypeDetail, Option);\r
+ DisplayMemoryDeviceTypeDetail (ReadUnaligned16 ((UINT16 *) (UINTN) &(Struct->Type17->TypeDetail)), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type17, Speed);\r
PRINT_PENDING_STRING (Struct, Type17, Manufacturer);\r
PRINT_PENDING_STRING (Struct, Type17, SerialNumber);\r
PRINT_PENDING_STRING (Struct, Type17, AssetTag);\r
PRINT_PENDING_STRING (Struct, Type17, PartNumber);\r
- if (SmbiosMajorVersion > 0x2 || (SmbiosMajorVersion == 0x2 && SmbiosMinorVersion >= 0x6)) {\r
+ if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x1B)) {\r
PRINT_STRUCT_VALUE_H (Struct, Type17, Attributes);\r
}\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x1C)) {\r
+ PRINT_STRUCT_VALUE (Struct, Type17, ExtendedSize);\r
+ PRINT_STRUCT_VALUE (Struct, Type17, ConfiguredMemoryClockSpeed);\r
+ }\r
+ if (AE_SMBIOS_VERSION (0x2, 0x8) && (Struct->Hdr->Length > 0x22)) {\r
+ PRINT_STRUCT_VALUE (Struct, Type17, MinimumVoltage);\r
+ PRINT_STRUCT_VALUE (Struct, Type17, MaximumVoltage);\r
+ PRINT_STRUCT_VALUE (Struct, Type17, ConfiguredVoltage);\r
+ }\r
break;\r
\r
//\r
PRINT_STRUCT_VALUE_H (Struct, Type19, EndingAddress);\r
PRINT_STRUCT_VALUE_H (Struct, Type19, MemoryArrayHandle);\r
PRINT_STRUCT_VALUE_H (Struct, Type19, PartitionWidth);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0xF)) {\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type19, ExtendedStartingAddress);\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type19, ExtendedEndingAddress);\r
+ }\r
break;\r
\r
//\r
- // Memory Device Mapped Address (Type 20)\r
+ // Memory Device Mapped Address (Type 20)\r
//\r
case 20:\r
PRINT_STRUCT_VALUE_H (Struct, Type20, StartingAddress);\r
PRINT_STRUCT_VALUE_H (Struct, Type20, PartitionRowPosition);\r
PRINT_STRUCT_VALUE_H (Struct, Type20, InterleavePosition);\r
PRINT_STRUCT_VALUE_H (Struct, Type20, InterleavedDataDepth);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x13)) {\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type19, ExtendedStartingAddress);\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type19, ExtendedEndingAddress);\r
+ }\r
break;\r
\r
//\r
- // Built-in Pointing Device (Type 21)\r
+ // Built-in Pointing Device (Type 21)\r
//\r
case 21:\r
DisplayPointingDeviceType (Struct->Type21->Type, Option);\r
break;\r
\r
//\r
- // Portable Battery (Type 22)\r
+ // Portable Battery (Type 22)\r
//\r
case 22:\r
PRINT_PENDING_STRING (Struct, Type22, Location);\r
PRINT_STRUCT_VALUE_H (Struct, Type22, OEMSpecific);\r
break;\r
\r
+ //\r
+ // System Reset (Type 23)\r
+ //\r
case 23:\r
DisplaySystemResetCapabilities (\r
Struct->Type23->Capabilities,\r
PRINT_STRUCT_VALUE_H (Struct, Type23, Timeout);\r
break;\r
\r
+ //\r
+ // Hardware Security (Type 24)\r
+ //\r
case 24:\r
DisplayHardwareSecuritySettings (\r
Struct->Type24->HardwareSecuritySettings,\r
);\r
break;\r
\r
+ //\r
+ // System Power Controls (Type 25)\r
+ //\r
case 25:\r
PRINT_STRUCT_VALUE_H (Struct, Type25, NextScheduledPowerOnMonth);\r
PRINT_STRUCT_VALUE_H (Struct, Type25, NextScheduledPowerOnDayOfMonth);\r
PRINT_STRUCT_VALUE_H (Struct, Type25, NextScheduledPowerOnSecond);\r
break;\r
\r
+ //\r
+ // Voltage Probe (Type 26)\r
+ //\r
case 26:\r
PRINT_PENDING_STRING (Struct, Type26, Description);\r
- DisplayVPLocation (Struct->Type26->LocationAndStatus, Option);\r
- DisplayVPStatus (Struct->Type26->LocationAndStatus, Option);\r
+ DisplayVPLocation (*(UINT8 *) &(Struct->Type26->LocationAndStatus), Option);\r
+ DisplayVPStatus (*(UINT8 *) &(Struct->Type26->LocationAndStatus), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type26, MaximumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type26, MinimumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type26, Resolution);\r
PRINT_STRUCT_VALUE_H (Struct, Type26, NominalValue);\r
break;\r
\r
+ //\r
+ // Cooling Device (Type 27)\r
+ //\r
case 27:\r
PRINT_STRUCT_VALUE_H (Struct, Type27, TemperatureProbeHandle);\r
- DisplayCoolingDeviceStatus (Struct->Type27->DeviceTypeAndStatus, Option);\r
- DisplayCoolingDeviceType (Struct->Type27->DeviceTypeAndStatus, Option);\r
+ DisplayCoolingDeviceStatus (*(UINT8 *) &(Struct->Type27->DeviceTypeAndStatus), Option);\r
+ DisplayCoolingDeviceType (*(UINT8 *) &(Struct->Type27->DeviceTypeAndStatus), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type27, CoolingUnitGroup);\r
PRINT_STRUCT_VALUE_H (Struct, Type27, OEMDefined);\r
PRINT_STRUCT_VALUE_H (Struct, Type27, NominalSpeed);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0xE)) {\r
+ PRINT_PENDING_STRING (Struct, Type27, Description);\r
+ }\r
break;\r
\r
+ //\r
+ // Temperature Probe (Type 28)\r
+ //\r
case 28:\r
PRINT_PENDING_STRING (Struct, Type28, Description);\r
- DisplayTemperatureProbeStatus (Struct->Type28->LocationAndStatus, Option);\r
- DisplayTemperatureProbeLoc (Struct->Type28->LocationAndStatus, Option);\r
+ DisplayTemperatureProbeStatus (*(UINT8 *) &(Struct->Type28->LocationAndStatus), Option);\r
+ DisplayTemperatureProbeLoc (*(UINT8 *) &(Struct->Type28->LocationAndStatus), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type28, MaximumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type28, MinimumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type28, Resolution);\r
PRINT_STRUCT_VALUE_H (Struct, Type28, NominalValue);\r
break;\r
\r
+ //\r
+ // Electrical Current Probe (Type 29)\r
+ //\r
case 29:\r
PRINT_PENDING_STRING (Struct, Type29, Description);\r
- DisplayECPStatus (Struct->Type29->LocationAndStatus, Option);\r
- DisplayECPLoc (Struct->Type29->LocationAndStatus, Option);\r
+ DisplayECPStatus (*(UINT8 *) &(Struct->Type29->LocationAndStatus), Option);\r
+ DisplayECPLoc (*(UINT8 *) &(Struct->Type29->LocationAndStatus), Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type29, MaximumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type29, MinimumValue);\r
PRINT_STRUCT_VALUE_H (Struct, Type29, Resolution);\r
PRINT_STRUCT_VALUE_H (Struct, Type29, NominalValue);\r
break;\r
\r
+ //\r
+ // Out-of-Band Remote Access (Type 30)\r
+ //\r
case 30:\r
PRINT_PENDING_STRING (Struct, Type30, ManufacturerName);\r
DisplayOBRAConnections (Struct->Type30->Connections, Option);\r
break;\r
\r
+ //\r
+ // Boot Integrity Services (BIS) Entry Point (Type 31)\r
+ //\r
case 31:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_STRUCT_TYPE31), gShellDebug1HiiHandle);\r
break;\r
\r
+ //\r
+ // System Boot Information (Type 32)\r
+ //\r
case 32:\r
PRINT_BIT_FIELD (Struct, Type32, Reserved, 6);\r
- DisplaySystemBootStatus (Struct->Type32->BootStatus[0], Option);\r
+ DisplaySystemBootStatus (Struct->Type32->BootStatus, Option);\r
break;\r
\r
+ //\r
+ // 64-Bit Memory Error Information (Type 33)\r
+ //\r
case 33:\r
DisplayMemoryErrorType (Struct->Type33->ErrorType, Option);\r
DisplayMemoryErrorGranularity (\r
);\r
DisplayMemoryErrorOperation (Struct->Type33->ErrorOperation, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type33, VendorSyndrome);\r
- PRINT_STRUCT_VALUE_H (Struct, Type33, MemoryArrayErrorAddress);\r
- PRINT_STRUCT_VALUE_H (Struct, Type33, DeviceErrorAddress);\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type33, MemoryArrayErrorAddress);\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type33, DeviceErrorAddress);\r
PRINT_STRUCT_VALUE_H (Struct, Type33, ErrorResolution);\r
break;\r
\r
//\r
- // Management Device (Type 34)\r
+ // Management Device (Type 34)\r
//\r
case 34:\r
PRINT_PENDING_STRING (Struct, Type34, Description);\r
DisplayMDType (Struct->Type34->Type, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type34, Address);\r
- PRINT_STRUCT_VALUE_H (Struct, Type34, AddressType);\r
+ DisplayMDAddressType (Struct->Type34->AddressType, Option);\r
break;\r
\r
+ //\r
+ // Management Device Component (Type 35)\r
+ //\r
case 35:\r
PRINT_PENDING_STRING (Struct, Type35, Description);\r
PRINT_STRUCT_VALUE_H (Struct, Type35, ManagementDeviceHandle);\r
PRINT_STRUCT_VALUE_H (Struct, Type35, ThresholdHandle);\r
break;\r
\r
+ //\r
+ // Management Device Threshold Data (Type 36)\r
+ //\r
case 36:\r
PRINT_STRUCT_VALUE_H (Struct, Type36, LowerThresholdNonCritical);\r
PRINT_STRUCT_VALUE_H (Struct, Type36, UpperThresholdNonCritical);\r
break;\r
\r
//\r
- // Memory Channel (Type 37)\r
+ // Memory Channel (Type 37)\r
//\r
case 37:\r
{\r
- UINT8 Count;\r
- MEMORYDEVICE *Ptr;\r
+ UINT8 Count;\r
+ MEMORY_DEVICE *Ptr;\r
DisplayMemoryChannelType (Struct->Type37->ChannelType, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type37, MaximumChannelLoad);\r
PRINT_STRUCT_VALUE_H (Struct, Type37, MemoryDeviceCount);\r
Ptr = Struct->Type37->MemoryDevice;\r
for (Index = 0; Index < Count; Index++) {\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_MEM_DEVICE), gShellDebug1HiiHandle, Index + 1);\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DEV_LOAD), gShellDebug1HiiHandle, Ptr->DeviceLoad);\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DEV_HANDLE), gShellDebug1HiiHandle, Ptr->DeviceHandle);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DEV_LOAD), gShellDebug1HiiHandle, Ptr[Index].DeviceLoad);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DEV_HANDLE), gShellDebug1HiiHandle, Ptr[Index].DeviceHandle);\r
}\r
}\r
break;\r
\r
//\r
- // IPMI Device Information (Type 38)\r
+ // IPMI Device Information (Type 38)\r
//\r
case 38:\r
DisplayIPMIDIBMCInterfaceType (Struct->Type38->InterfaceType, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type38, IPMISpecificationRevision);\r
PRINT_STRUCT_VALUE_H (Struct, Type38, I2CSlaveAddress);\r
PRINT_STRUCT_VALUE_H (Struct, Type38, NVStorageDeviceAddress);\r
- PRINT_STRUCT_VALUE_H (Struct, Type38, BaseAddress);\r
+ PRINT_STRUCT_VALUE_LH (Struct, Type38, BaseAddress);\r
break;\r
\r
//\r
PRINT_PENDING_STRING (Struct, Type39, RevisionLevel);\r
PRINT_STRUCT_VALUE_H (Struct, Type39, MaxPowerCapacity);\r
DisplaySPSCharacteristics (\r
- Struct->Type39->PowerSupplyCharacteristics,\r
+ *(UINT16 *) &(Struct->Type39->PowerSupplyCharacteristics),\r
Option\r
);\r
PRINT_STRUCT_VALUE_H (Struct, Type39, InputVoltageProbeHandle);\r
//\r
case 41:\r
PRINT_PENDING_STRING (Struct, Type41, ReferenceDesignation);\r
- PRINT_STRUCT_VALUE_H (Struct, Type41, DeviceType);\r
+ ShellPrintEx(-1,-1,(((Struct->Type41->DeviceType) & 0x80) != 0) ? L"Device Enabled\n": L"Device Disabled\n");\r
+ DisplayOnboardDeviceTypes ((Struct->Type41->DeviceType) & 0x7F, Option);\r
PRINT_STRUCT_VALUE_H (Struct, Type41, DeviceTypeInstance);\r
PRINT_STRUCT_VALUE_H (Struct, Type41, SegmentGroupNum);\r
PRINT_STRUCT_VALUE_H (Struct, Type41, BusNum);\r
PRINT_STRUCT_VALUE_H (Struct, Type41, DevFuncNum);\r
break;\r
\r
+ //\r
+ // Management Controller Host Interface (Type 42)\r
+ //\r
+ case 42:\r
+ DisplayMCHostInterfaceType (Struct->Type42->InterfaceType, Option);\r
+ break;\r
+\r
+ //\r
+ // TPM Device (Type 43)\r
+ //\r
+ case 43:\r
+ PRINT_BIT_FIELD (Struct, Type43, VendorID, 4);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type43, MajorSpecVersion);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type43, MinorSpecVersion);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type43, FirmwareVersion1);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type43, FirmwareVersion2);\r
+ PRINT_PENDING_STRING (Struct, Type43, Description);\r
+ DisplayTpmDeviceCharacteristics (ReadUnaligned64 ((UINT64 *) (UINTN) &(Struct->Type43->Characteristics)), Option);\r
+ PRINT_STRUCT_VALUE_H (Struct, Type43, OemDefined);\r
+ break;\r
+\r
+ //\r
+ // Inactive (Type 126)\r
+ //\r
case 126:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INACTIVE_STRUCT), gShellDebug1HiiHandle);\r
break;\r
\r
+ //\r
+ // End-of-Table (Type 127)\r
+ //\r
case 127:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_THIS_STRUCT_END_TABLE), gShellDebug1HiiHandle);\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_FUNCTION_KEY_INIT), gShellDebug1HiiHandle);\r
}\r
\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE), gShellDebug1HiiHandle);\r
+ if (AE_SMBIOS_VERSION (0x2, 0x4)) {\r
+ if (BIT (byte2, 2) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENABLE_TAR_CONT_DIST), gShellDebug1HiiHandle);\r
+ }\r
+ if (AE_SMBIOS_VERSION (0x2, 0x7)) {\r
+ if (BIT (byte2, 3) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UEFI_SPEC_SUPPORT), gShellDebug1HiiHandle);\r
+ }\r
+ if (BIT (byte2, 4) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_VIRTUAL_MACHINE), gShellDebug1HiiHandle);\r
+ }\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE), gShellDebug1HiiHandle, 5);\r
+ } else {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE), gShellDebug1HiiHandle, 3);\r
+ }\r
+ } else {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE), gShellDebug1HiiHandle, 2);\r
+ }\r
}\r
\r
/**\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_M1_FAMILY), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0x13:\r
+ Print (L"M2 Family\n");\r
+ break;\r
+\r
+ case 0x14:\r
+ Print (L"Intel Celeron M\n");\r
+ break;\r
+\r
+ case 0x15:\r
+ Print (L"Intel Pentium 4 HT\n");\r
+ break;\r
+\r
case 0x18:\r
Print (L"AMD Duron\n");\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_K5_FAMILY), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0x1A:\r
+ Print (L"K6 Family\n");\r
+ break;\r
+\r
+ case 0x1B:\r
+ Print (L"K6-2\n");\r
+ break;\r
+\r
+ case 0x1C:\r
+ Print (L"K6-3\n");\r
+ break;\r
+\r
+ case 0x1D:\r
+ Print (L"AMD Althon Processor Family\n");\r
+ break;\r
+\r
+ case 0x1E:\r
+ Print (L"AMD 29000 Family\n");\r
+ break;\r
+\r
+ case 0x1F:\r
+ Print (L"K6-2+\n");\r
+ break;\r
+\r
case 0x20:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_POWER_PC_FAMILY), gShellDebug1HiiHandle);\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INTEL_ATOM), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0x2C:\r
+ Print (L"Intel(R) Core(TM) M processor\n");\r
+ break;\r
+\r
+ case 0x2D:\r
+ Print (L"Intel(R) Core(TM) m3 processor\n");\r
+ break;\r
+\r
+ case 0x2E:\r
+ Print (L"Intel(R) Core(TM) m5 processor\n");\r
+ break;\r
+\r
+ case 0x2F:\r
+ Print (L"Intel(R) Core(TM) m7 processor\n");\r
+ break;\r
+\r
case 0x30:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ALPHA_FAMILY_2), gShellDebug1HiiHandle);\r
break;\r
Print (L"Alpha 21364\n");\r
break;\r
\r
+ case 0x38:\r
+ Print (L"AMD Turion II Ultra Dual-Core Mobile M Processor Family\n");\r
+ break;\r
+\r
+ case 0x39:\r
+ Print (L"AMD Turion II Dual-Core Mobile M Processor Family\n");\r
+ break;\r
+\r
+ case 0x3A:\r
+ Print (L"AMD Althon II Dual-Core M Processor Family\n");\r
+ break;\r
+\r
+ case 0x3B:\r
+ Print (L"AMD Opteron 6100 Series Processor\n");\r
+ break;\r
+\r
+ case 0x3C:\r
+ Print (L"AMD Opteron 4100 Series Processor\n");\r
+ break;\r
+\r
+ case 0x3D:\r
+ Print (L"AMD Opteron 6200 Series Processor\n");\r
+ break;\r
+\r
+ case 0x3E:\r
+ Print (L"AMD Opteron 4200 Series Processor\n");\r
+ break;\r
+\r
+ case 0x3F:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_FX_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
case 0x40:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_MIPS_FAMILY), gShellDebug1HiiHandle);\r
break;\r
Print (L"MIPS R10000\n");\r
break;\r
\r
+ case 0x46:\r
+ Print (L"AMD C-Series Processor\n");\r
+ break;\r
+\r
+ case 0x47:\r
+ Print (L"AMD E-Series Processor\n");\r
+ break;\r
+\r
+ case 0x48:\r
+ Print (L"AMD A-Series Processor\n");\r
+ break;\r
+\r
+ case 0x49:\r
+ Print (L"AMD G-Series Processor\n");\r
+ break;\r
+\r
+ case 0x4A:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_Z_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0x4B:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_R_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0x4C:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_4300_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0x4D:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_6300_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0x4E:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_3300_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0x4F:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_FIREPRO_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
case 0x50:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_SPARC_FAMILY), gShellDebug1HiiHandle);\r
break;\r
Print (L"68030\n");\r
break;\r
\r
+ case 0x66:\r
+ Print (L"AMD Athlon(TM) X4 Quad-Core Processor Family\n");\r
+ break;\r
+\r
+ case 0x67:\r
+ Print (L"AMD Opteron(TM) X1000 Series Processor\n");\r
+ break;\r
+\r
+ case 0x68:\r
+ Print (L"AMD Opteron(TM) X2000 Series APU\n");\r
+ break;\r
+\r
+ case 0x69:\r
+ Print (L"AMD Opteron(TM) A-Series Processor\n");\r
+ break;\r
+\r
+ case 0x6A:\r
+ Print (L"AMD Opteron(TM) X3000 Series APU\n");\r
+ break;\r
+\r
+ case 0x6B:\r
+ Print (L"AMD Zen Processor Family\n");\r
+ break;\r
+\r
case 0x70:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle);\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PA_RISC_FAMILY), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0x91:\r
+ Print (L"PA-RISC 8500\n");\r
+ break;\r
+\r
+ case 0x92:\r
+ Print (L"PA-RISC 8000\n");\r
+ break;\r
+\r
+ case 0x93:\r
+ Print (L"PA-RISC 7300LC\n");\r
+ break;\r
+\r
+ case 0x94:\r
+ Print (L"PA-RISC 7200\n");\r
+ break;\r
+\r
+ case 0x95:\r
+ Print (L"PA-RISC 7100LC\n");\r
+ break;\r
+\r
+ case 0x96:\r
+ Print (L"PA-RISC 7100\n");\r
+ break;\r
+\r
case 0xA0:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_V30_FAMILY), gShellDebug1HiiHandle);\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PENTIUM_III_XEON), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0xB1:\r
+ Print (L"Pentium III Processorwith Intel SpeedStep Technology\n");\r
+ break;\r
+\r
+ case 0xB2:\r
+ Print (L"Pentium 4 processor\n");\r
+ break;\r
+\r
+ case 0xB3:\r
+ Print (L"Intel Xeon Processor\n");\r
+ break;\r
+\r
+ case 0xB4:\r
+ Print (L"AS400 Family\n");\r
+ break;\r
+\r
+ case 0xB5:\r
+ Print (L"Intel Xeon processor MP\n");\r
+ break;\r
+\r
+ case 0xB6:\r
+ Print (L"AMD Althon XP Processor Family\n");\r
+ break;\r
+\r
+ case 0xB7:\r
+ Print (L"AMD Althon MP Promcessor Family\n");\r
+ break;\r
+\r
+ case 0xB8:\r
+ Print (L"Intel Itanium 2 processor\n");\r
+ break;\r
+\r
+ case 0xB9:\r
+ Print (L"Intel Penium M processor\n");\r
+ break;\r
+\r
+ case 0xBA:\r
+ Print (L"Intel Celeron D processor\n");\r
+ break;\r
+\r
+ case 0xBB:\r
+ Print (L"Intel Pentium D processor\n");\r
+ break;\r
+\r
+ case 0xBC:\r
+ Print (L"Intel Pentium Processor Extreme Edition\n");\r
+ break;\r
+\r
+ case 0xBD:\r
+ Print (L"Intel Core Solo Processor\n");\r
+ break;\r
+\r
+ case 0xBF:\r
+ Print (L"Intel Core 2 Duo Processor\n");\r
+ break;\r
+\r
case 0xC0:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INTEL_CORE2_SOLO), gShellDebug1HiiHandle);\r
break;\r
break;\r
\r
case 0xCC:\r
- Print (L"zArchitectur\n");\r
+ Print (L"zArchitecture\n");\r
+ break;\r
+\r
+ case 0xCD:\r
+ Print (L"Intel Core i5 processor\n");\r
+ break;\r
+\r
+ case 0xCE:\r
+ Print (L"Intel Core i3 processor\n");\r
break;\r
\r
case 0xD2:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INTEL_XEON_7_SERIES_MULTI_CORE), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0xE0:\r
+ Print (L"Multi-Core Intel Xeon processor 3400 Series\n");\r
+ break;\r
+\r
+ case 0xE4:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_3000_SERIES), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 0xE5:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_SEMPRON_II), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+\r
case 0xE6:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_EMBEDDED_OPTERON_QUAD_CORE), gShellDebug1HiiHandle);\r
break;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_SEMPRON_SI), gShellDebug1HiiHandle);\r
break;\r
\r
+ case 0xEC:\r
+ Print (L"AMD Phenom II Processor Family\n");\r
+ break;\r
+\r
+ case 0xED:\r
+ Print (L"AMD Althon II Processor Family\n");\r
+ break;\r
+\r
+ case 0xEE:\r
+ Print (L"Six-Core AMD Opteron Processor Family\n");\r
+ break;\r
+\r
+ case 0xEF:\r
+ Print (L"AMD Sempron M Processor Family\n");\r
+ break;\r
+\r
case 0xFA:\r
Print (L"i860\n");\r
break;\r
break;\r
\r
default:\r
- //\r
- // In order to reduce code quality notice of\r
- // case & break not pair, so\r
- // move multiple case into the else part and\r
- // use if/else to check value.\r
- //\r
- if (Family >= 0x13 && Family <= 0x17) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_M1), gShellDebug1HiiHandle);\r
- } else if (Family >= 0x1A && Family <= 0x1F) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_K5), gShellDebug1HiiHandle);\r
- } else if (Family >= 0xB1 && Family <= 0xBF) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_PENTIUM), gShellDebug1HiiHandle);\r
- } else {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), gShellDebug1HiiHandle);\r
- }\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), gShellDebug1HiiHandle);\r
}\r
//\r
// end switch\r
// Use switch to check\r
//\r
switch (Family2) {\r
+ case 0x100:\r
+ Print (L"ARMv7\n");\r
+ break;\r
+\r
+ case 0x101:\r
+ Print (L"ARMv8\n");\r
+ break;\r
+\r
case 0x104:\r
Print (L"SH-3\n");\r
break;\r
Display processor voltage information.\r
\r
@param[in] Voltage The Voltage.\r
- Bit 7 Set to 0, indicating 'legacy' mode for processor voltage\r
- Bits 6:4 Reserved, must be zero\r
- Bits 3:0 Voltage Capability.\r
- A Set bit indicates that the voltage is supported.\r
- Bit 0 - 5V\r
- Bit 1 - 3.3V\r
- Bit 2 - 2.9V\r
- Bit 3 - Reserved, must be zero.\r
-\r
- Note:\r
- Setting of multiple bits indicates the socket is configurable\r
- If bit 7 is set to 1, the remaining seven bits of the field are set to\r
- contain the processor's current voltage times 10.\r
- For example, the field value for a processor voltage of 1.8 volts would be\r
- 92h = 80h + (1.8 * 10) = 80h + 18 = 80h +12h.\r
+ Bit 7 Set to 0, indicating 'legacy' mode for processor voltage\r
+ Bits 6:4 Reserved, must be zero\r
+ Bits 3:0 Voltage Capability.\r
+ A Set bit indicates that the voltage is supported.\r
+ Bit 0 - 5V\r
+ Bit 1 - 3.3V\r
+ Bit 2 - 2.9V\r
+ Bit 3 - Reserved, must be zero.\r
+\r
+ Note:\r
+ Setting of multiple bits indicates the socket is configurable\r
+ If bit 7 is set to 1, the remaining seven bits of the field are set to\r
+ contain the processor's current voltage times 10.\r
+ For example, the field value for a processor voltage of 1.8 volts would be\r
+ 92h = 80h + (1.8 * 10) = 80h + 18 = 80h +12h.\r
\r
@param[in] Option The option.\r
**/\r
Display processor information.\r
\r
@param[in] Status The status.\r
- Bit 7 Reserved, must be 0\r
- Bit 6 CPU Socket Populated\r
- 1 - CPU Socket Populated\r
- 0 - CPU Socket UnpopulatedBits\r
- 5:3 Reserved, must be zero\r
- Bits 2:0 CPU Status\r
- 0h - Unknown\r
- 1h - CPU Enabled\r
- 2h - CPU Disabled by User via BIOS Setup\r
- 3h - CPU Disabled By BIOS (POST Error)\r
- 4h - CPU is Idle, waiting to be enabled.\r
- 5-6h - Reserved\r
- 7h - Other\r
+Bit 7 Reserved, must be 0\r
+Bit 6 CPU Socket Populated\r
+ 1 - CPU Socket Populated\r
+ 0 - CPU Socket Unpopulated\r
+Bits 5:3 Reserved, must be zero\r
+Bits 2:0 CPU Status\r
+ 0h - Unknown\r
+ 1h - CPU Enabled\r
+ 2h - CPU Disabled by User via BIOS Setup\r
+ 3h - CPU Disabled By BIOS (POST Error)\r
+ 4h - CPU is Idle, waiting to be enabled.\r
+ 5-6h - Reserved\r
+ 7h - Other\r
\r
@param[in] Option The option\r
**/\r
PRINT_INFO_OPTION (Status, Option);\r
\r
if (BIT (Status, 7) != 0) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ERROR_BIT7), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT7_NOT_ZERO), gShellDebug1HiiHandle);\r
} else if (BIT (Status, 5) != 0) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ERROR_BIT5), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT5_NOT_ZERO), gShellDebug1HiiHandle);\r
} else if (BIT (Status, 4) != 0) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ERROR_BIT4), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT4_NOT_ZERO), gShellDebug1HiiHandle);\r
} else if (BIT (Status, 3) != 0) {\r
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ERROR_BIT3), gShellDebug1HiiHandle);\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT3_NOT_ZERO), gShellDebug1HiiHandle);\r
}\r
//\r
// Check BIT 6\r
}\r
}\r
\r
+/**\r
+ Display Cache Configuration.\r
+\r
+ @param[in] CacheConfiguration Cache Configuration.\r
+Bits 15:10 Reserved, must be 0\r
+Bits 9:8 Operational Mode\r
+ 0h - Write Through\r
+ 1h - Write Back\r
+ 2h - Varies with Memory Address\r
+ 3h - Unknown\r
+Bit 7 Enabled/Disabled\r
+ 1 - Enabled\r
+ 0 - Disabled\r
+Bits 6:5 Location\r
+ 0h - Internal\r
+ 1h - External\r
+ 2h - Reserved\r
+ 3h - Unknown\r
+Bit 4 Reserved, must be zero\r
+Bit 3 Cache Socketed\r
+ 1 - Socketed\r
+ 0 - Unsocketed\r
+Bits 2:0 Cache Level\r
+ 1 through 8 (For example, an L1 cache would\r
+ use value 000b and an L3 cache would use 010b.)\r
+\r
+ @param[in] Option The option\r
+**/\r
+VOID\r
+DisplayCacheConfiguration (\r
+ IN UINT16 CacheConfiguration,\r
+ IN UINT8 Option\r
+ )\r
+{\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_CONFIGURATION), gShellDebug1HiiHandle);\r
+ PRINT_INFO_OPTION (CacheConfiguration, Option);\r
+\r
+ if (BIT (CacheConfiguration, 15) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT15_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 14) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT14_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 13) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT13_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 12) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT12_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 11) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT11_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 10) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT10_NOT_ZERO), gShellDebug1HiiHandle);\r
+ } else if (BIT (CacheConfiguration, 4) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIT4_NOT_ZERO), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ //\r
+ // Check BITs 9:8\r
+ //\r
+ switch ((CacheConfiguration & 0x300) >> 8) {\r
+ case 0:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_WRITE_THROUGH), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 1:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_WRITE_BACK), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 2:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_VARIES_WITH_MEM_ADDR), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 3:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNKNOWN), gShellDebug1HiiHandle);\r
+ break;\r
+ }\r
+\r
+ //\r
+ // Check BIT 7\r
+ //\r
+ if (BIT (CacheConfiguration, 7) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENABLED), gShellDebug1HiiHandle);\r
+ } else {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DISABLED), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ //\r
+ // Check BITs 6:5\r
+ //\r
+ switch ((CacheConfiguration & 0x60) >> 5) {\r
+ case 0:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_INTERNAL), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 1:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_EXTERNAL), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 2:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RESERVED), gShellDebug1HiiHandle);\r
+ break;\r
+\r
+ case 3:\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNKNOWN), gShellDebug1HiiHandle);\r
+ break;\r
+ }\r
+\r
+ //\r
+ // Check BIT 3\r
+ //\r
+ if (BIT (CacheConfiguration, 3) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_SOCKETED), gShellDebug1HiiHandle);\r
+ } else {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_NOT_SOCKETED), gShellDebug1HiiHandle);\r
+ }\r
+\r
+\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CACHE_LEVEL), gShellDebug1HiiHandle, (CacheConfiguration & 0x07) + 1);\r
+}\r
+\r
/**\r
The Slot ID field of the System Slot structure provides a mechanism to\r
correlate the physical attributes of the slot to its logical access method\r
break;\r
\r
default:\r
- if (SlotType >= 0x0E && SlotType <= 0x12) {\r
+ if ((SlotType >= 0x0E && SlotType <= 0x12) || (SlotType >= 0xA6 && SlotType <= 0xB6)){\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_VALUE_PRESENT), gShellDebug1HiiHandle, SlotId);\r
} else {\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_SLOT_ID), gShellDebug1HiiHandle);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RSVD_FUTURE_ASSIGNMENT), gShellDebug1HiiHandle);\r
} else if (Parameter >= 128 && Parameter <= 191) {\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_VENDOR_OEM_SPECIFIC), gShellDebug1HiiHandle);\r
- } else if (Parameter >= 192 && Parameter <= 255) {\r
+ } else if (Parameter >= 192) {\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PRODUCT_SPEC_IMPLMENTATION), gShellDebug1HiiHandle);\r
} else {\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ERROR_VALUE), gShellDebug1HiiHandle);\r
// Print date\r
//\r
Day = Date & 0x001F;\r
- Month = (Date & 0x00E0) >> 5;\r
- Year = ((Date & 0xFF00) >> 8) + 1980;\r
+ Month = (Date & 0x01E0) >> 5;\r
+ Year = ((Date & 0xFE00) >> 9) + 1980;\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_MONTH_DAY_YEAR), gShellDebug1HiiHandle, Day, Month, Year);\r
\r
}\r
\r
/**\r
- Display System Reset (Type 23) information.\r
+ Display System Reset (Type 23) information.\r
\r
\r
- Identifies the system-reset capabilities for the system.\r
- Bits 7:6 Reserved for future assignment via this specification, set to 00b.\r
- Bit 5 System contains a watchdog timer, either True (1) or False (0).\r
- Bits 4:3 Boot Option on Limit.\r
- Identifies the system action to be taken when the Reset Limit is reached, one of:\r
- 00b Reserved, do not use.\r
- 01b Operating system\r
- 10b System utilities\r
- 11b Do not rebootBits\r
- 2:1 Boot Option. Indicates the action to be taken following a watchdog reset, one of:\r
- 00b Reserved, do not use.\r
- 01b Operating system\r
- 10b System utilities\r
- 11b Do not reboot\r
- Bit 0 Status.\r
- 1b The system reset is enabled by the user\r
- 0b The system reset is not enabled by the user\r
+Identifies the system-reset capabilities for the system.\r
+ Bits 7:6 Reserved for future assignment via this specification, set to 00b.\r
+ Bit 5 System contains a watchdog timer, either True (1) or False (0).\r
+ Bits 4:3 Boot Option on Limit.\r
+ Identifies the system action to be taken when the Reset Limit is reached, one of:\r
+ 00b Reserved, do not use.\r
+ 01b Operating system\r
+ 10b System utilities\r
+ 11b Do not rebootBits\r
+ 2:1 Boot Option. Indicates the action to be taken following a watchdog reset, one of:\r
+ 00b Reserved, do not use.\r
+ 01b Operating system\r
+ 10b System utilities\r
+ 11b Do not reboot\r
+ Bit 0 Status.\r
+ 1b The system reset is enabled by the user\r
+ 0b The system reset is not enabled by the user\r
\r
@param[in] Reset Reset\r
@param[in] Option The option\r
Display Hardware Security (Type 24) information.\r
\r
\r
- Identifies the password and reset status for the system:\r
-\r
- Bits 7:6 Power-on Password Status, one of:\r
- 00b Disabled\r
- 01b Enabled\r
- 10b Not Implemented\r
- 11b Unknown\r
- Bits 5:4 Keyboard Password Status, one of:\r
- 00b Disabled\r
- 01b Enabled\r
- 10b Not Implemented\r
- 11b Unknown\r
- Bits 3:2 Administrator Password Status, one of:\r
- 00b Disabled\r
- 01b Enabled\r
- 10b Not Implemented\r
- 11b Unknown\r
- Bits 1:0 Front Panel Reset Status, one of:\r
- 00b Disabled\r
- 01b Enabled\r
- 10b Not Implemented\r
- 11b Unknown\r
+Identifies the password and reset status for the system:\r
+\r
+Bits 7:6 Power-on Password Status, one of:\r
+ 00b Disabled\r
+ 01b Enabled\r
+ 10b Not Implemented\r
+ 11b Unknown\r
+Bits 5:4 Keyboard Password Status, one of:\r
+ 00b Disabled\r
+ 01b Enabled\r
+ 10b Not Implemented\r
+ 11b Unknown\r
+Bits 3:2 Administrator Password Status, one of:\r
+ 00b Disabled\r
+ 01b Enabled\r
+ 10b Not Implemented\r
+ 11b Unknown\r
+Bits 1:0 Front Panel Reset Status, one of:\r
+ 00b Disabled\r
+ 01b Enabled\r
+ 10b Not Implemented\r
+ 11b Unknown\r
\r
@param[in] Settings The device settings.\r
@param[in] Option The device options.\r
// Bits 13:10 - DMTF Power Supply Type\r
//\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TYPE), gShellDebug1HiiHandle);\r
- Temp = (Characteristics & 0x1C00) << 10;\r
+ Temp = (Characteristics & 0x1C00) >> 10;\r
switch (Temp) {\r
case 1:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_OTHER_SPACE), gShellDebug1HiiHandle);\r
// Bits 9:7 - Status\r
//\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_STATUS_DASH), gShellDebug1HiiHandle);\r
- Temp = (Characteristics & 0x380) << 7;\r
+ Temp = (Characteristics & 0x380) >> 7;\r
switch (Temp) {\r
case 1:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_OTHER_SPACE), gShellDebug1HiiHandle);\r
// Bits 6:3 - DMTF Input Voltage Range Switching\r
//\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_INPUT_VOLTAGE_RANGE), gShellDebug1HiiHandle);\r
- Temp = (Characteristics & 0x78) << 3;\r
+ Temp = (Characteristics & 0x78) >> 3;\r
switch (Temp) {\r
case 1:\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_OTHER_SPACE), gShellDebug1HiiHandle);\r
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE), gShellDebug1HiiHandle);\r
}\r
}\r
+\r
+/**\r
+ Display TPM Device (Type 43) Characteristics.\r
+\r
+ @param[in] Chara The information bits.\r
+ @param[in] Option The optional information.\r
+**/\r
+VOID\r
+DisplayTpmDeviceCharacteristics (\r
+ IN UINT64 Chara,\r
+ IN UINT8 Option\r
+ )\r
+{\r
+ //\r
+ // Print header\r
+ //\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TPM_DEVICE_CHAR), gShellDebug1HiiHandle);\r
+ //\r
+ // print option\r
+ //\r
+ PRINT_INFO_OPTION (Chara, Option);\r
+\r
+ //\r
+ // Check all the bits and print information\r
+ // This function does not use Table because table of bits\r
+ // are designed not to deal with UINT64\r
+ //\r
+ if (BIT (Chara, 0) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RESERVED_BIT), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ if (BIT (Chara, 1) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_RESERVED_BIT), gShellDebug1HiiHandle);\r
+ }\r
+ if (BIT (Chara, 2) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TPM_DEVICE_CHAR_NOT_SUPPORTED), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ if (BIT (Chara, 3) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TPM_DEVICE_CONFIG_FWU), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ if (BIT (Chara, 4) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TPM_DEVICE_CONFIG_PLAT_SW), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ if (BIT (Chara, 5) != 0) {\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_TPM_DEVICE_CONFIG_OEM), gShellDebug1HiiHandle);\r
+ }\r
+\r
+ //\r
+ // Just print the Reserved\r
+ //\r
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BITS_06_63), gShellDebug1HiiHandle);\r
+\r
+}\r
projects / mirror_edk2.git / blobdiff