ShellPkg/setvar: Check the duplicate flag

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / SmbiosView / QueryTable.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index bb7a19b04170c7f8ec70b3786e63683875fd5c06..afea429b7aa30f97c5fb54488a2b95b71d425263 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -166,7 +166,7 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
   },\r
   {\r
     0x09,\r
-    L"  LapTop"\r
+    L"  Laptop"\r
   },\r
   {\r
     0x0A,\r
@@ -248,6 +248,34 @@ 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
+    0x21,\r
+    L"  IoT Gateway"\r
+  },\r
+  {\r
+    0x22,\r
+    L"  Embedded PC"\r
+  },\r
+  {\r
+    0x23,\r
+    L"  Mini PC"\r
+  },\r
+  {\r
+    0x24,\r
+    L"  Stick PC"\r
+  },\r
 };\r
 \r
 TABLE_ITEM  SystemEnclosureStatusTable[] = {\r
@@ -503,6 +531,54 @@ 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
+    0x31,\r
+    L"Socket AM4"\r
+  },\r
+  {\r
+    0x32,\r
+    L"Socket LGA1151"\r
+  },\r
+  {\r
+    0x33,\r
+    L"Socket BGA1356"\r
+  },\r
+  {\r
+    0x34,\r
+    L"Socket BGA1440"\r
+  },\r
+  {\r
+    0x35,\r
+    L"Socket BGA1515"\r
+  },\r
+  {\r
+    0x36,\r
+    L"Socket LGA3647-1"\r
+  },\r
+  {\r
+    0x37,\r
+    L"Socket SP3"\r
+  },\r
+  {\r
+    0x38,\r
+    L"Socket SP3r2"\r
   }\r
 };\r
 \r
@@ -1266,6 +1342,70 @@ 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
+    0x21,\r
+    L"PCI Express Mini 52-pin (CEM spec. 2.0) with bottom-side keep-outs"\r
+  },\r
+  {\r
+    0x22,\r
+    L"PCI Express Mini 52-pin (CEM spec. 2.0) without bottom-side keep-outs"\r
+  },\r
+  {\r
+    0x23,\r
+    L"PCI Express Mini 76-pin (CEM spec. 2.0) Corresponds to Display-Mini card"\r
+  },\r
   {\r
     0xA0,\r
     L"PC-98/C20 "\r
@@ -3020,6 +3160,22 @@ TABLE_ITEM  IPMIDIBMCInterfaceTypeTable[] = {
   },\r
 };\r
 \r
+TABLE_ITEM  MCHostInterfaceTypeTable[] = {\r
+  {\r
+    0x3F00,\r
+    L" MCTP Host Interface "\r
+  },\r
+  {\r
+    0x40,\r
+    L" Network Host Interface "\r
+  },\r
+  {\r
+    0xF0,\r
+    L" OEM defined "\r
+  },\r
+};\r
+\r
+\r
 TABLE_ITEM  StructureTypeInfoTable[] = {\r
   {\r
     0,\r
@@ -3293,19 +3449,24 @@ PrintBitsInfo (
 \r
   UINTN   Index;\r
   UINT32  Value;\r
-  BOOLEAN NoInfo;\r
+  BOOLEAN FirstInfo;\r
 \r
-  NoInfo  = TRUE;\r
+  FirstInfo = TRUE;\r
   Value   = Bits;\r
   //\r
   // query the table and print information\r
   //\r
   for (Index = 0; Index < Number; Index++) {\r
     if (BIT (Value, Table[Index].Key) != 0) {\r
+      if (!FirstInfo) {\r
+        //\r
+        // If it is not first info, print the separator first.\r
+        //\r
+        Print (L" | ");\r
+      }\r
       Print (Table[Index].Info);\r
-      Print (L" | ");\r
 \r
-      NoInfo = FALSE;\r
+      FirstInfo = FALSE;\r
       //\r
       // clear the bit, for reserved bits test\r
       //\r
@@ -3313,7 +3474,10 @@ PrintBitsInfo (
     }\r
   }\r
 \r
-  if (NoInfo) {\r
+  //\r
+  // There is no any info if FirstInfo is still TRUE.\r
+  //\r
+  if (FirstInfo) {\r
     ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_NO_INFO), gShellDebug1HiiHandle);\r
   }\r
 \r
@@ -4388,6 +4552,23 @@ DisplayIPMIDIBMCInterfaceType (
   PRINT_TABLE_ITEM (IPMIDIBMCInterfaceTypeTable, Key);\r
 }\r
 \r
+/**\r
+  Display Management Controller Host Interface (Type 42) information.\r
+\r
+  @param[in] Key      The key of the structure.\r
+  @param[in] Option   The optional information.\r
+**/\r
+VOID\r
+DisplayMCHostInterfaceType (\r
+  IN UINT8 Key,\r
+  IN UINT8 Option\r
+  )\r
+{\r
+  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE), gShellDebug1HiiHandle);\r
+  PRINT_INFO_OPTION (Key, Option);\r
+  PRINT_TABLE_ITEM (MCHostInterfaceTypeTable, Key);\r
+}\r
+\r
 /**\r
   Display the structure type information.\r
 \r