ShellPkg SmbiosView: Add missing decoding of SMBIOS spec 3.0.0

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=345

When I am adding SMBIOS spec 3.1.0 support, I found the decoding
of SMBIOS spec 3.0.0 for some definitions is missing.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index d9adb1a7abb99f78da0d60c4dcf77da1f0b64e41..abbc9835b5d0a0740c17295239b55b10b3229f31 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -1,7 +1,7 @@
 /** @file\r
   Module for clarifying the content of the smbios structure element information.\r
 \r
-  Copyright (c) 2005 - 2016, 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
@@ -1580,6 +1580,10 @@ DisplayProcessorFamily (
     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 0x30:\r
     ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ALPHA_FAMILY_2), gShellDebug1HiiHandle);\r
     break;\r
@@ -1768,6 +1772,18 @@ DisplayProcessorFamily (
     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 0x70:\r
     ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle);\r
     break;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index bb7a19b04170c7f8ec70b3786e63683875fd5c06..acca00d5c37db756cebb16b9930c8665fecafa5e 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -248,6 +248,18 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
     0x1D,\r
     L"  Blade Enclosure"\r
   },\r
+  {\r
+    0x1E,\r
+    L"  Tablet"\r
+  },\r
+  {\r
+    0x1F,\r
+    L"  Convertible"\r
+  },\r
+  {\r
+    0x20,\r
+    L"  Detachable"\r
+  },\r
 };\r
 \r
 TABLE_ITEM  SystemEnclosureStatusTable[] = {\r
@@ -503,6 +515,22 @@ TABLE_ITEM  ProcessorUpgradeTable[] = {
   {\r
     0x2C,\r
     L"Socket LGA1356-3"\r
+  },\r
+  {\r
+    0x2D,\r
+    L"Socket LGA1150"\r
+  },\r
+  {\r
+    0x2E,\r
+    L"Socket BGA1168"\r
+  },\r
+  {\r
+    0x2F,\r
+    L"Socket BGA1234"\r
+  },\r
+  {\r
+    0x30,\r
+    L"Socket BGA1364"\r
   }\r
 };\r
 \r
@@ -1266,6 +1294,58 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
     0x13,\r
     L"AGP 8X"\r
   },\r
+  {\r
+    0x14,\r
+    L"M.2 Socket 1-DP (Mechanical Key A)"\r
+  },\r
+  {\r
+    0x15,\r
+    L"M.2 Socket 1-SD (Mechanical Key E)"\r
+  },\r
+  {\r
+    0x16,\r
+    L"M.2 Socket 2 (Mechanical Key B)"\r
+  },\r
+  {\r
+    0x17,\r
+    L"M.2 Socket 3 (Mechanical Key M)"\r
+  },\r
+  {\r
+    0x18,\r
+    L"MXM Type I"\r
+  },\r
+  {\r
+    0x19,\r
+    L"MXM Type II"\r
+  },\r
+  {\r
+    0x1A,\r
+    L"MXM Type III (standard connector)"\r
+  },\r
+  {\r
+    0x1B,\r
+    L"MXM Type III (HE connector)"\r
+  },\r
+  {\r
+    0x1C,\r
+    L"MXM Type IV"\r
+  },\r
+  {\r
+    0x1D,\r
+    L"MXM 3.0 Type A"\r
+  },\r
+  {\r
+    0x1E,\r
+    L"MXM 3.0 Type B"\r
+  },\r
+  {\r
+    0x1F,\r
+    L"PCI Express Gen 2 SFF-8639"\r
+  },\r
+  {\r
+    0x20,\r
+    L"PCI Express Gen 3 SFF-8639"\r
+  },\r
   {\r
     0xA0,\r
     L"PC-98/C20 "\r