ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS 3.5 fields

Signed-off-by: MillerX Lin <millerx.lin@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index 2611601230b9e544baee44a1ae076b5aa2ade563..1811cf0c442aef16e3555910120690464ca2ec8c 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -335,10 +335,10 @@ SmbiosPrintStructure (
     // 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_H (Struct, Type0, BiosSegment);\r
-      PRINT_PENDING_STRING (Struct, Type0, BiosReleaseDate);\r
+      ShellPrintEx (-1, -1, L"Vendor: %a\n", LibGetSmbiosString (Struct, Struct->Type0->Vendor));\r
+      ShellPrintEx (-1, -1, L"BIOS Version: %a\n", LibGetSmbiosString (Struct, Struct->Type0->BiosVersion));\r
+      ShellPrintEx (-1, -1, L"BIOS Starting Address Segment: 0x%x\n", Struct->Type0->BiosSegment);\r
+      ShellPrintEx (-1, -1, L"BIOS Release Date: %a\n", LibGetSmbiosString (Struct, Struct->Type0->BiosReleaseDate));\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE), gShellDebug1HiiHandle, 64 * (Struct->Type0->BiosSize + 1));\r
 \r
       DisplayBiosCharacteristics (ReadUnaligned64 ((UINT64 *)(UINTN)&(Struct->Type0->BiosCharacteristics)), Option);\r
@@ -352,10 +352,10 @@ SmbiosPrintStructure (
       }\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
+        ShellPrintEx (-1, -1, L"System BIOS Major Release: %u\n", Struct->Type0->SystemBiosMajorRelease);\r
+        ShellPrintEx (-1, -1, L"System BIOS Minor Release: %u\n", Struct->Type0->SystemBiosMinorRelease);\r
+        ShellPrintEx (-1, -1, L"Embedded Controller Firmware Major Release: %u\n", Struct->Type0->EmbeddedControllerFirmwareMajorRelease);\r
+        ShellPrintEx (-1, -1, L"Embedded Controller Firmware Minor Release: %u\n", Struct->Type0->EmbeddedControllerFirmwareMinorRelease);\r
       }\r
 \r
       if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x18)) {\r
@@ -470,48 +470,49 @@ SmbiosPrintStructure (
     // Processor Information (Type 4)\r
     //\r
     case 4:\r
-      PRINT_SMBIOS_STRING (Struct, Struct->Type4->Socket, SocketDesignation)\r
+      ShellPrintEx (-1, -1, L"Socket Designation: %a\n", LibGetSmbiosString (Struct, Struct->Type4->Socket));\r
       DisplayProcessorType (Struct->Type4->ProcessorType, Option);\r
-      if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) &&\r
-          (Struct->Type4->ProcessorFamily == 0xFE))\r
-      {\r
-        //\r
-        // Get family from ProcessorFamily2 field\r
-        //\r
-        DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option);\r
-      } else {\r
-        DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option);\r
-      }\r
-\r
-      PRINT_PENDING_STRING (Struct, Type4, ProcessorManufacturer);\r
-      PRINT_BIT_FIELD (Struct, Type4, ProcessorId, 8);\r
-      PRINT_PENDING_STRING (Struct, Type4, ProcessorVersion);\r
+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);\r
+      DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option);\r
+      ShellPrintEx (-1, -1, L"Processor Manufacturer: %a\n", LibGetSmbiosString (Struct, Struct->Type4->ProcessorManufacturer));\r
+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID), gShellDebug1HiiHandle, 8);\r
+      DumpHex (0, 0, 8, &(Struct->Type4->ProcessorId));\r
+      ShellPrintEx (-1, -1, L"Processor Version: %a\n", LibGetSmbiosString (Struct, Struct->Type4->ProcessorVersion));\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
+      ShellPrintEx (-1, -1, L"External Clock: %u\n", Struct->Type4->ExternalClock);\r
+      ShellPrintEx (-1, -1, L"Max Speed: %u\n", Struct->Type4->MaxSpeed);\r
+      ShellPrintEx (-1, -1, L"Current Speed: %u\n", Struct->Type4->CurrentSpeed);\r
       DisplayProcessorStatus (Struct->Type4->Status, Option);\r
       DisplayProcessorUpgrade (Struct->Type4->ProcessorUpgrade, Option);\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
+      ShellPrintEx (-1, -1, L"L1 Cache Handle: 0x%x\n", Struct->Type4->L1CacheHandle);\r
+      ShellPrintEx (-1, -1, L"L2 Cache Handle: 0x%x\n", Struct->Type4->L2CacheHandle);\r
+      ShellPrintEx (-1, -1, L"L3 Cache Handle: 0x%x\n", Struct->Type4->L3CacheHandle);\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
+        ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString (Struct, Struct->Type4->SerialNumber));\r
+        ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (Struct, Struct->Type4->AssetTag));\r
+        ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString (Struct, Struct->Type4->PartNumber));\r
       }\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
+        ShellPrintEx (-1, -1, L"Core Count: %u\n", Struct->Type4->CoreCount);\r
+        ShellPrintEx (-1, -1, L"Core Enabled: %u\n", Struct->Type4->EnabledCoreCount);\r
+        ShellPrintEx (-1, -1, L"Thread Count: %u\n", Struct->Type4->ThreadCount);\r
         DisplayProcessorCharacteristics (Struct->Type4->ProcessorCharacteristics, Option);\r
       }\r
 \r
+      if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28)) {\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2), gShellDebug1HiiHandle);\r
+        if (Struct->Type4->ProcessorFamily2 >= 0x100) {\r
+          DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option);\r
+        } else {\r
+          DisplayProcessorFamily ((UINT8)Struct->Type4->ProcessorFamily2, Option);\r
+        }\r
+      }\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
+        ShellPrintEx (-1, -1, L"Core Count 2: %u\n", Struct->Type4->CoreCount2);\r
+        ShellPrintEx (-1, -1, L"Core Enabled 2: %u\n", Struct->Type4->EnabledCoreCount2);\r
+        ShellPrintEx (-1, -1, L"Thread Count 2: %u\n", Struct->Type4->ThreadCount2);\r
       }\r
 \r
       break;\r
@@ -829,68 +830,68 @@ SmbiosPrintStructure (
     // Memory Device (Type 17)\r
     //\r
     case 17:\r
-      PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryArrayHandle);\r
-      PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryErrorInformationHandle);\r
-      PRINT_STRUCT_VALUE_H (Struct, Type17, TotalWidth);\r
-      PRINT_STRUCT_VALUE_H (Struct, Type17, DataWidth);\r
+      ShellPrintEx (-1, -1, L"Physical Memory Array Handle: 0x%x\n", Struct->Type17->MemoryArrayHandle);\r
+      ShellPrintEx (-1, -1, L"Memory Error Information Handle: 0x%x\n", Struct->Type17->MemoryErrorInformationHandle);\r
+      ShellPrintEx (-1, -1, L"Total Width: 0x%x\n", Struct->Type17->TotalWidth);\r
+      ShellPrintEx (-1, -1, L"Data Width: 0x%x\n", Struct->Type17->DataWidth);\r
       PRINT_STRUCT_VALUE (Struct, Type17, Size);\r
       DisplayMemoryDeviceFormFactor (Struct->Type17->FormFactor, Option);\r
-      PRINT_STRUCT_VALUE_H (Struct, Type17, DeviceSet);\r
-      PRINT_PENDING_STRING (Struct, Type17, DeviceLocator);\r
-      PRINT_PENDING_STRING (Struct, Type17, BankLocator);\r
+      ShellPrintEx (-1, -1, L"Device Set: 0x%x\n", Struct->Type17->DeviceSet);\r
+      ShellPrintEx (-1, -1, L"Device Locator: %a\n", LibGetSmbiosString (Struct, Struct->Type17->DeviceLocator));\r
+      ShellPrintEx (-1, -1, L"Bank Locator: %a\n", LibGetSmbiosString (Struct, Struct->Type17->BankLocator));\r
       DisplayMemoryDeviceType (Struct->Type17->MemoryType, 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
+      ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString (Struct, Struct->Type17->SerialNumber));\r
+      ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (Struct, Struct->Type17->AssetTag));\r
+      ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString (Struct, Struct->Type17->PartNumber));\r
       if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x1B)) {\r
         PRINT_STRUCT_VALUE_H (Struct, Type17, Attributes);\r
       }\r
 \r
       if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x1C)) {\r
-        PRINT_STRUCT_VALUE (Struct, Type17, ExtendedSize);\r
-        PRINT_STRUCT_VALUE_H (Struct, Type17, ConfiguredMemoryClockSpeed);\r
+        ShellPrintEx (-1, -1, L"Extended Size: %u\n", Struct->Type17->ExtendedSize);\r
+        ShellPrintEx (-1, -1, L"Configured Memory Speed: 0x%x\n", Struct->Type17->ConfiguredMemoryClockSpeed);\r
       }\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
+        ShellPrintEx (-1, -1, L"Minimum voltage: %u\n", Struct->Type17->MinimumVoltage);\r
+        ShellPrintEx (-1, -1, L"Maximum voltage: %u\n", Struct->Type17->MaximumVoltage);\r
+        ShellPrintEx (-1, -1, L"Configured voltage: %u\n", Struct->Type17->ConfiguredVoltage);\r
       }\r
 \r
       if (AE_SMBIOS_VERSION (0x3, 0x2)) {\r
         if (Struct->Hdr->Length > 0x28) {\r
           DisplayMemoryDeviceMemoryTechnology (Struct->Type17->MemoryTechnology, Option);\r
           DisplayMemoryDeviceMemoryOperatingModeCapability (Struct->Type17->MemoryOperatingModeCapability.Uint16, Option);\r
-          PRINT_PENDING_STRING (Struct, Type17, FirmwareVersion);\r
-          PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleManufacturerID);\r
-          PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleProductID);\r
-          PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerManufacturerID);\r
-          PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerProductID);\r
+          ShellPrintEx (-1, -1, L"Firmware Version: %a\n", LibGetSmbiosString (Struct, Struct->Type17->FirmwareVersion));\r
+          ShellPrintEx (-1, -1, L"Module Manufacturer ID: 0x%x\n", Struct->Type17->ModuleManufacturerID);\r
+          ShellPrintEx (-1, -1, L"Module Product ID: 0x%x\n", Struct->Type17->ModuleProductID);\r
+          ShellPrintEx (-1, -1, L"Memory Subsystem Controller Manufacturer ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerManufacturerID);\r
+          ShellPrintEx (-1, -1, L"Memory Subsystem Controller Product ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerProductID);\r
         }\r
 \r
         if (Struct->Hdr->Length > 0x34) {\r
-          PRINT_STRUCT_VALUE_LH (Struct, Type17, NonVolatileSize);\r
+          ShellPrintEx (-1, -1, L"Non-volatile Size: 0x%lx\n", Struct->Type17->NonVolatileSize);\r
         }\r
 \r
         if (Struct->Hdr->Length > 0x3C) {\r
-          PRINT_STRUCT_VALUE_LH (Struct, Type17, VolatileSize);\r
+          ShellPrintEx (-1, -1, L"Volatile Size: 0x%lx\n", Struct->Type17->VolatileSize);\r
         }\r
 \r
         if (Struct->Hdr->Length > 0x44) {\r
-          PRINT_STRUCT_VALUE_LH (Struct, Type17, CacheSize);\r
+          ShellPrintEx (-1, -1, L"Cache Size: 0x%lx\n", Struct->Type17->CacheSize);\r
         }\r
 \r
         if (Struct->Hdr->Length > 0x4C) {\r
-          PRINT_STRUCT_VALUE_LH (Struct, Type17, LogicalSize);\r
+          ShellPrintEx (-1, -1, L"Logical Size: 0x%lx\n", Struct->Type17->LogicalSize);\r
         }\r
       }\r
 \r
       if (AE_SMBIOS_VERSION (0x3, 0x3) && (Struct->Hdr->Length > 0x54)) {\r
-        PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedSpeed);\r
-        PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedConfiguredMemorySpeed);\r
+        ShellPrintEx (-1, -1, L"Extended Speed: 0x%x\n", Struct->Type17->ExtendedSpeed);\r
+        ShellPrintEx (-1, -1, L"Extended Configured Memory Speed: 0x%x\n", Struct->Type17->ExtendedConfiguredMemorySpeed);\r
       }\r
 \r
       break;\r
@@ -1258,13 +1259,13 @@ SmbiosPrintStructure (
     // Onboard Devices Extended Information (Type 41)\r
     //\r
     case 41:\r
-      PRINT_PENDING_STRING (Struct, Type41, ReferenceDesignation);\r
+      ShellPrintEx (-1, -1, L"Reference Designation: %a\n", LibGetSmbiosString (Struct, Struct->Type41->ReferenceDesignation));\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
+      ShellPrintEx (-1, -1, L"Device Type Instance: 0x%x\n", Struct->Type41->DeviceTypeInstance);\r
+      ShellPrintEx (-1, -1, L"Segment Group Number: 0x%x\n", Struct->Type41->SegmentGroupNum);\r
+      ShellPrintEx (-1, -1, L"Bus Number: 0x%x\n", Struct->Type41->BusNum);\r
+      ShellPrintEx (-1, -1, L"Device/Function Number: 0x%x\n", Struct->Type41->DevFuncNum);\r
       break;\r
 \r
     //\r
@@ -1606,10 +1607,6 @@ DisplayProcessorFamily (
   UINT8  Option\r
   )\r
 {\r
-  //\r
-  // Print prompt message\r
-  //\r
-  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);\r
   //\r
   // Print option\r
   //\r
@@ -2411,6 +2408,10 @@ DisplayProcessorFamily (
       Print (L"i960\n");\r
       break;\r
 \r
+    case 0xFE:\r
+      Print (L"Indicator to obtain the processor family from the Processor Family 2 field\n");\r
+      break;\r
+\r
     default:\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), gShellDebug1HiiHandle);\r
   }\r
@@ -2432,11 +2433,6 @@ DisplayProcessorFamily2 (
   IN UINT8   Option\r
   )\r
 {\r
-  //\r
-  // Print prompt message\r
-  //\r
-  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);\r
-\r
   //\r
   // Print option\r
   //\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 05f7a61d9de0754249656ac47715ba60f0de5b4a..73f7b2ab19c19657d4dfdd03af43f935a438a9d7 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
@@ -88,8 +88,8 @@
 #string STR_SMBIOSVIEW_PRINTINFO_FORMATTED_AREA                 #language en-US "Formatted Area:  \r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_INTER_ACHOR                    #language en-US "Inter Anchor:         %a\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_INTER_CHECKSUM                 #language en-US "Inter Checksum:       0x%x\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN                #language en-US "Format part Len : %d\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE                  #language en-US "Structure Handle: %d\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN                #language en-US "Length: %d\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE                  #language en-US "Handle: %d\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_BOOTUP_STATE                   #language en-US "Bootup state "\r
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE             #language en-US "Power Supply State "\r
 #string STR_SMBIOSVIEW_PRINTINFO_THERMAL_STATE                  #language en-US "Thermal state "\r
@@ -168,6 +168,8 @@
 #string STR_SMBIOSVIEW_PRINTINFO_MCFG_ENABLED                   #language en-US "Manufacturing mode is enabled\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE           #language en-US " Bits %d:7 are reserved for future assignment\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY               #language en-US "Processor Family: "\r
+#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID                   #language en-US "Processor ID\r\nsize=%d:\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2              #language en-US "Processor Family 2: "\r
 #string STR_SMBIOSVIEW_PRINTINFO_OTHER                          #language en-US "Other\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_UNKNOWN                        #language en-US "Unknown\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_INTEL386_PROCESSOR             #language en-US "Intel386(TM) Processor\r\n"\r
@@ -255,7 +257,7 @@
 #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_K5               #language en-US "Reserved for specific K5 versions\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_PENTIUM          #language en-US "Reserved for specific Pentium(R) Processor versions\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY          #language en-US "Undefined processor family and type\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO                      #language en-US "Processor Information -  Voltage:\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO                      #language en-US "Voltage:\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_PROC_CURRENT_VOLTAGE           #language en-US "Processor current voltage = (%d/10)V\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_5V_SUPOPRTED                   #language en-US " 5V is supported\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_33V_SUPPORTED                  #language en-US " 3.3V is supported\r\n"\r
@@ -271,7 +273,7 @@
 #string STR_SMBIOSVIEW_PRINTINFO_BIT13_NOT_ZERO                 #language en-US "Error, reserved BIT 13 must be zero\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_BIT14_NOT_ZERO                 #language en-US "Error, reserved BIT 14 must be zero\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_BIT15_NOT_ZERO                 #language en-US "Error, reserved BIT 15 must be zero\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS                    #language en-US "Processor Status:\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS                    #language en-US "Status:\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_POPULATED           #language en-US "CPU Socket Populated\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_UNPOPULATED         #language en-US "CPU Socket Unpopulated\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_CPU_ENABLED                    #language en-US "CPU Enabled\r\n"\r
@@ -382,8 +384,8 @@
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_PRESENT       #language en-US "Power supply is not present\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE           #language en-US "Power supply is hot replaceable\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE       #language en-US "Power supply is not hot replaceable\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BiosSize:  %d KB\r\n"\r
-#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "ExtendedBiosSize:  %d %s\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BIOS ROM Size:  %d KB\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "Extended BIOS ROM Size:  %d %s\r\n"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO                       #language en-US "No Info"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET                 #language en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE            #language en-US "System Wakeup Type:"\r
@@ -419,7 +421,7 @@
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT            #language en-US "System Slot Height: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH    #language en-US "System Slot Physical Width: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PITCH             #language en-US "System Slot Pitch: %d\r\n"\r
-#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE           #language en-US "Onboard Device Type: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE           #language en-US "Device Type: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE         #language en-US "System Event Log Type: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT     #language en-US "Event Log Variable Data Format Types: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_POST_RESULTS_BITMAP           #language en-US "POST Results Bitmap - First DWORD:\r\n"\r
@@ -431,11 +433,11 @@
 #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_LOCATION       #language en-US "Physical Memory Array Location: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_USE            #language en-US "Physical Memory Array Use: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_ERROR          #language en-US "Physical Memory Array Error Correction Types: "\r
-#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR        #language en-US "Memory Device - Form Factor: "\r
-#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE               #language en-US "Memory Device - Type: "\r
-#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL        #language en-US "Memory Device - Type Detail: "\r
-#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY  #language en-US "Memory Device - Memory Technology: "\r
-#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language en-US "Memory Device - Memory Operating Mode Capability: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR        #language en-US "Form Factor: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE               #language en-US "Memory Type: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL        #language en-US "Type Detail: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY  #language en-US "Memory Technology: "\r
+#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language en-US "Memory Operating Mode Capability: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_INFO                #language en-US "32-bit Memory Error Information - Type: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_GRANULARITY         #language en-US "Memory Error - Error granularity: "\r
 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_OP                  #language en-US "Memory Error - Error Operation: "\r
@@ -454,7 +456,7 @@
 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_CHANNEL_TYPE              #language en-US "Memory Channel Type:"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE            #language en-US "BMC Interface Type:"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE        #language en-US "MC Host Interface Type:"\r
-#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE                   #language en-US "Structure Type:"\r
+#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE                   #language en-US "Type:"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE           #language en-US "Processor Architecture Type:"\r
 #string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV                  #language en-US "%s "\r
 #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERY_STRUCT_COND             #language en-US "Query Structure, conditions are:\r\n"\r