UefiCpuPkg/Cpuid.h: Remove duplicated struct definition for leaf 1FH

[mirror_edk2.git] / UefiCpuPkg / Application / Cpuid / Cpuid.c

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 67cacf27141a57625b61fd4646d17f08e55aab85..d229ac8e7b1d4f6ac0727acaac08769cd81b840e 100644 (file)
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Application to display CPUID leaf information.\r
 \r
-  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<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
@@ -1394,26 +1394,26 @@ CpuidV2ExtendedTopologyEnumeration (
   VOID\r
   )\r
 {\r
-  CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EAX  Eax;\r
-  CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EBX  Ebx;\r
-  CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_ECX  Ecx;\r
-  UINT32                                      Edx;\r
+  CPUID_EXTENDED_TOPOLOGY_EAX  Eax;\r
+  CPUID_EXTENDED_TOPOLOGY_EBX  Ebx;\r
+  CPUID_EXTENDED_TOPOLOGY_ECX  Ecx;\r
+  UINT32                       Edx;\r
 \r
-  if (CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION > gMaximumBasicFunction) {\r
+  if (CPUID_V2_EXTENDED_TOPOLOGY > gMaximumBasicFunction) {\r
     return;\r
   }\r
 \r
   AsmCpuidEx (\r
-    CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION,\r
-    CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_MAIN_LEAF,\r
+    CPUID_V2_EXTENDED_TOPOLOGY,\r
+    0,\r
     &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx\r
     );\r
-  Print (L"CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION (Leaf %08x, Sub-Leaf %08x)\n", CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION, CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_MAIN_LEAF);\r
+  Print (L"CPUID_V2_EXTENDED_TOPOLOGY (Leaf %08x, Sub-Leaf %08x)\n", CPUID_V2_EXTENDED_TOPOLOGY, 0);\r
   Print (L"  EAX:%08x  EBX:%08x  ECX:%08x  EDX:%08x\n", Eax.Uint32, Ebx.Uint32, Ecx.Uint32, Edx);\r
 \r
-  PRINT_BIT_FIELD (Eax, BitsNum);\r
-  PRINT_BIT_FIELD (Ebx, ProcessorsNum);\r
-  PRINT_BIT_FIELD (Ecx, LevelNum);\r
+  PRINT_BIT_FIELD (Eax, ApicIdShift);\r
+  PRINT_BIT_FIELD (Ebx, LogicalProcessors);\r
+  PRINT_BIT_FIELD (Ecx, LevelNumber);\r
   PRINT_BIT_FIELD (Ecx, LevelType);\r
   PRINT_VALUE     (Edx, x2APICID);\r
 }\r