Update SmbiosView Shell command to display additional CPU Family

and Socket designations, and fix a couple of typos

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud elhaj@hp.com
Reviewed-By: Jaben Carsey <Jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16036 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index 9ae5a0c7419049b4a00424b51cdfa7fcc8a65f2f..7bb3998f0c169493e2631602808eff4c7f799570 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -2,6 +2,7 @@
   Module for clarifying the content of the smbios structure element information.\r
 \r
   Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<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
@@ -1532,6 +1533,10 @@ DisplayProcessorFamily (
     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
@@ -1565,13 +1570,37 @@ DisplayProcessorFamily (
     break;\r
 \r
   case 0x48:\r
-    Print (L"AMD S-Series Processor\n");\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
@@ -1909,7 +1938,7 @@ DisplayProcessorFamily (
     break;\r
 \r
   case 0xCC:\r
-    Print (L"zArchitectur\n");\r
+    Print (L"zArchitecture\n");\r
     break;\r
 \r
   case 0xCD:\r
@@ -1972,6 +2001,15 @@ DisplayProcessorFamily (
     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

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 700592d2630c64f61c46338ab6b7900d49023f74..de6df5f12b060724b2eaee8219a4bfc39217a4ba 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -469,7 +469,7 @@ TABLE_ITEM  ProcessorUpgradeTable[] = {
   },\r
   {\r
     0x24,\r
-    L"Socket BGA1155"\r
+    L"Socket LGA1155"\r
   },\r
   {\r
     0x25,\r
@@ -494,6 +494,14 @@ TABLE_ITEM  ProcessorUpgradeTable[] = {
   {\r
     0x2A,\r
     L"Socket FM2"\r
+  },\r
+  {\r
+    0x2B,\r
+    L"Socket LGA2011-3"\r
+  },\r
+  {\r
+    0x2C,\r
+    L"Socket LGA1356-3"\r
   }\r
 };\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 1d73ba3fd7448a04934be509ef809fed0511c726..f4e6a0fa1938d2b1a7aee13c85104972f21eff56 100644 (file)
Binary files a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni and b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni differ