Add missing fields of Type 4 conversion.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / PiSmbiosRecordOnDataHubSmbiosRecordThunk / ConvTable.c

diff --git a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
index 28097482ad7d57d296bc25ef1bfd767bcc10d8e6..9c29748b0eb9989d8daccc7d16a855a8b96ca872 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
+++ b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
@@ -1,8 +1,8 @@
 /** @file\r
   The conversion table that guides the generation of the Smbios struture list.\r
   \r
-Copyright (c) 2009, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2009 - 2010, 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
 http://opensource.org/licenses/bsd-license.php\r
@@ -59,7 +59,7 @@ SMBIOS_TYPE_INFO_TABLE_ENTRY  mTypeInfoTable[] = {
   //\r
   {\r
     4,\r
-    0x25,\r
+    0x2C,\r
     TRUE,\r
     FALSE\r
   },\r
@@ -396,8 +396,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorCoreFrequencyRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x16,\r
     SmbiosFldBase10ToWordWithMega\r
   },\r
@@ -409,8 +409,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorFsbFrequencyRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x12,\r
     SmbiosFldBase10ToWordWithMega\r
   },\r
@@ -422,8 +422,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorVersionRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x10,\r
     SmbiosFldString\r
   },\r
@@ -435,8 +435,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorManufacturerRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x7,\r
     SmbiosFldString\r
   },\r
@@ -448,8 +448,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorSerialNumberRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x20,\r
     SmbiosFldString\r
   },\r
@@ -461,8 +461,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorIdRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x08,\r
     SmbiosFldProcessorType6\r
   },\r
@@ -474,8 +474,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorTypeRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x05,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -487,8 +487,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorFamilyRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x06,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -500,8 +500,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorVoltageRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x11,\r
     SmbiosFldProcessorType9\r
   },\r
@@ -513,8 +513,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorStatusRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x18,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -526,8 +526,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorSocketTypeRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x19,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -539,8 +539,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorSocketNameRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x04,\r
     SmbiosFldString\r
   },\r
@@ -552,8 +552,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     CacheAssociationRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_WHOLE_DATA_RECORD,\r
+    BySubClassInstanceProducer,\r
+    ByFunctionWithWholeDataRecord,\r
     0,\r
     SmbiosFldProcessorType17\r
   },\r
@@ -565,8 +565,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorMaxCoreFrequencyRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x14,\r
     SmbiosFldBase10ToWordWithMega\r
   },\r
@@ -578,12 +578,90 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,\r
     ProcessorAssetTagRecordType,\r
     4,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x21,\r
     SmbiosFldString\r
   },\r
 \r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 25: Core Count\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorCoreCountRecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x23,\r
+    SmbiosFldTruncateToByte\r
+  },\r
+  \r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 26: Enabled Core Count\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorEnabledCoreCountRecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x24,\r
+    SmbiosFldTruncateToByte\r
+  },\r
+  \r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 27: Thread Count\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorThreadCountRecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x25,\r
+    SmbiosFldTruncateToByte\r
+  },\r
+\r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 28: Processor Characteristics\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorCharacteristicsRecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x26,\r
+    SmbiosFldTruncateToWord\r
+  },\r
+  \r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 29: Family 2\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorFamily2RecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x28,\r
+    SmbiosFldTruncateToWord\r
+  },\r
+  \r
+  {\r
+    //\r
+    // Processor Sub Class -- Record Type 30: Part Number\r
+    //\r
+    EFI_PROCESSOR_SUBCLASS_GUID,\r
+    ProcessorPartNumberRecordType,\r
+    4,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
+    0x22,\r
+    SmbiosFldString\r
+  },\r
+\r
   {\r
     //\r
     // Cache SubClass -- Record Type 1: Size\r
@@ -591,8 +669,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheSizeRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x09,\r
     SmbiosFldBase2ToWordWithKilo\r
   },\r
@@ -604,8 +682,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     MaximumSizeCacheRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x07,\r
     SmbiosFldBase2ToWordWithKilo\r
   },\r
@@ -617,8 +695,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheSpeedRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x0f,\r
     SmbiosFldBase10ToByteWithNano\r
   },\r
@@ -630,8 +708,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheSocketRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x04,\r
     SmbiosFldString\r
   },\r
@@ -643,8 +721,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheSramTypeRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x0b,\r
     SmbiosFldCacheType5  // Asynchronous and Synchronous are reversed\r
   },\r
@@ -656,8 +734,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheInstalledSramTypeRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x0d,\r
     SmbiosFldCacheType5\r
   },\r
@@ -669,8 +747,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheErrorTypeRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x10,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -682,8 +760,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheTypeRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x11,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -695,8 +773,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheAssociativityRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x12,\r
     SmbiosFldTruncateToByte\r
   },\r
@@ -708,8 +786,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,\r
     CacheConfigRecordType,\r
     7,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunctionWithOffsetSpecified,\r
     0x05,\r
     SmbiosFldCacheType10\r
   },\r
@@ -721,8 +799,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_ARRAY_LOCATION_RECORD_NUMBER,\r
     16,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType2\r
   },\r
@@ -734,8 +812,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER,\r
     6,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldSMBIOSType6\r
   },\r
@@ -747,8 +825,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER,\r
     17,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType3\r
   },\r
@@ -760,8 +838,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER,\r
     19,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType4\r
   },\r
@@ -773,8 +851,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_DEVICE_START_ADDRESS_RECORD_NUMBER,\r
     20,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType5\r
   },\r
@@ -786,8 +864,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_CHANNEL_TYPE_RECORD_NUMBER,\r
     37,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType6\r
   },\r
@@ -799,8 +877,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_CHANNEL_DEVICE_RECORD_NUMBER,\r
     37,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType7\r
   },\r
@@ -812,8 +890,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_CONTROLLER_INFORMATION_RECORD_NUMBER,\r
     5,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType8\r
   },\r
@@ -825,8 +903,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_32BIT_ERROR_INFORMATION_RECORD_NUMBER,\r
     18,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType9\r
   },\r
@@ -838,8 +916,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,\r
     EFI_MEMORY_64BIT_ERROR_INFORMATION_RECORD_NUMBER,\r
     33,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMemoryType10\r
   },\r
@@ -851,8 +929,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_BIOS_VENDOR_RECORD_NUMBER, // 0,\r
     0,                                  // smbios Type 0\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType0\r
   },\r
@@ -864,8 +942,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER, // 1,\r
     1,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType1\r
   },\r
@@ -877,8 +955,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_BASE_BOARD_MANUFACTURER_RECORD_NUMBER, // 2,\r
     2,  // SMBIOS Type 2\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType2\r
   },\r
@@ -890,8 +968,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_CHASSIS_MANUFACTURER_RECORD_NUMBER,  // 3,\r
     3,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType3\r
   },\r
@@ -903,8 +981,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_RECORD_NUMBER,  // 8,\r
     8,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType8\r
   },\r
@@ -916,8 +994,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_SLOT_DESIGNATION_RECORD_NUMBER, // 9,\r
     9,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType9\r
   },\r
@@ -929,8 +1007,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_ONBOARD_DEVICE_RECORD_NUMBER,  // 10,\r
     10,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType10\r
   },\r
@@ -942,8 +1020,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_OEM_STRING_RECORD_NUMBER,  // 11,\r
     11,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType11\r
   },\r
@@ -955,8 +1033,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_OPTION_STRING_RECORD_NUMBER,  // 12,\r
     12,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType12\r
   },\r
@@ -968,8 +1046,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_NUMBER_OF_INSTALLABLE_LANGUAGES_RECORD_NUMBER, // 13,\r
     13,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType13\r
   },\r
@@ -981,8 +1059,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_LANGUAGE_STRING_RECORD_NUMBER, // 13,\r
     13,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType14\r
   },\r
@@ -994,8 +1072,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_EVENT_LOG_RECORD_NUMBER, // 15,\r
     15,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType15\r
   },  \r
@@ -1007,8 +1085,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_POINTING_DEVICE_TYPE_RECORD_NUMBER,  // 21,\r
     21,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType21\r
   },\r
@@ -1020,8 +1098,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER, // 22,\r
     22,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType22\r
   },  \r
@@ -1033,8 +1111,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_RESET_CAPABILITIES_RECORD_NUMBER,  // 23,\r
     23,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType23\r
   },\r
@@ -1046,8 +1124,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER,  // 24,\r
     24,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType24\r
   },\r
@@ -1059,8 +1137,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SCHEDULED_POWER_ON_MONTH_RECORD_NUMBER,  // 25,\r
     25,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType25\r
   },\r
@@ -1072,8 +1150,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_RECORD_NUMBER,  // 26,\r
     26,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType26\r
   },\r
@@ -1085,8 +1163,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_COOLING_DEVICE_TEMP_LINK_RECORD_NUMBER,  // 27,\r
     27,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType27\r
   },\r
@@ -1098,8 +1176,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_RECORD_NUMBER,  // 28,\r
     28,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType28\r
   },\r
@@ -1111,8 +1189,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_RECORD_NUMBER,  // 29,\r
     29,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType29\r
   },\r
@@ -1124,8 +1202,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_RECORD_NUMBER,  // 30,\r
     30,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType30\r
   },\r
@@ -1137,8 +1215,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_BOOT_INFORMATION_STATUS_RECORD_NUMBER, // 32,\r
     32,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType32\r
   },\r
@@ -1150,8 +1228,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_RECORD_NUMBER, // 34,\r
     34,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType34\r
   },\r
@@ -1163,8 +1241,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD_RECORD_NUMBER, // 36,\r
     36,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType36\r
   },\r
@@ -1176,8 +1254,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_IPMI_INTERFACE_TYPE_RECORD_NUMBER, // 38,\r
     38,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType38\r
   },\r
@@ -1189,8 +1267,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER, // 39,\r
     39,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType39\r
   },\r
@@ -1202,8 +1280,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     EFI_MISC_SMBIOS_STRUCT_ENCAP_RECORD_NUMBER, // 0x80,\r
     0x80,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscTypeOEM\r
   },\r
@@ -1215,8 +1293,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,\r
     127,\r
     127,\r
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,\r
-    BY_FUNCTION,\r
+    BySubclassInstanceSubinstanceProducer,\r
+    ByFunction,\r
     0,\r
     SmbiosFldMiscType127\r
   },\r