1 files changed, 129 insertions, 129 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
index 28097482ad..a325807a9c 100644
--- a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
+++ b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvTable.c
@@ -1,7 +1,7 @@
 /** @file
   The conversion table that guides the generation of the Smbios struture list.
   
-Copyright (c) 2009, Intel Corporation
+Copyright (c) 2009 - 2010, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -396,8 +396,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorCoreFrequencyRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x16,
     SmbiosFldBase10ToWordWithMega
   },
@@ -409,8 +409,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorFsbFrequencyRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x12,
     SmbiosFldBase10ToWordWithMega
   },
@@ -422,8 +422,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorVersionRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x10,
     SmbiosFldString
   },
@@ -435,8 +435,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorManufacturerRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x7,
     SmbiosFldString
   },
@@ -448,8 +448,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorSerialNumberRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x20,
     SmbiosFldString
   },
@@ -461,8 +461,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorIdRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x08,
     SmbiosFldProcessorType6
   },
@@ -474,8 +474,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorTypeRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x05,
     SmbiosFldTruncateToByte
   },
@@ -487,8 +487,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorFamilyRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x06,
     SmbiosFldTruncateToByte
   },
@@ -500,8 +500,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorVoltageRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x11,
     SmbiosFldProcessorType9
   },
@@ -513,8 +513,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorStatusRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x18,
     SmbiosFldTruncateToByte
   },
@@ -526,8 +526,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorSocketTypeRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x19,
     SmbiosFldTruncateToByte
   },
@@ -539,8 +539,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorSocketNameRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x04,
     SmbiosFldString
   },
@@ -552,8 +552,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     CacheAssociationRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_WHOLE_DATA_RECORD,
+    BySubClassInstanceProducer,
+    ByFunctionWithWholeDataRecord,
     0,
     SmbiosFldProcessorType17
   },
@@ -565,8 +565,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorMaxCoreFrequencyRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x14,
     SmbiosFldBase10ToWordWithMega
   },
@@ -578,8 +578,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_PROCESSOR_SUBCLASS_GUID,
     ProcessorAssetTagRecordType,
     4,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x21,
     SmbiosFldString
   },
@@ -591,8 +591,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheSizeRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x09,
     SmbiosFldBase2ToWordWithKilo
   },
@@ -604,8 +604,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     MaximumSizeCacheRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x07,
     SmbiosFldBase2ToWordWithKilo
   },
@@ -617,8 +617,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheSpeedRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x0f,
     SmbiosFldBase10ToByteWithNano
   },
@@ -630,8 +630,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheSocketRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x04,
     SmbiosFldString
   },
@@ -643,8 +643,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheSramTypeRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x0b,
     SmbiosFldCacheType5  // Asynchronous and Synchronous are reversed
   },
@@ -656,8 +656,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheInstalledSramTypeRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x0d,
     SmbiosFldCacheType5
   },
@@ -669,8 +669,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheErrorTypeRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x10,
     SmbiosFldTruncateToByte
   },
@@ -682,8 +682,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheTypeRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x11,
     SmbiosFldTruncateToByte
   },
@@ -695,8 +695,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheAssociativityRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x12,
     SmbiosFldTruncateToByte
   },
@@ -708,8 +708,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_CACHE_SUBCLASS_GUID,
     CacheConfigRecordType,
     7,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION_WITH_OFFSET_SPECIFIED,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunctionWithOffsetSpecified,
     0x05,
     SmbiosFldCacheType10
   },
@@ -721,8 +721,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_ARRAY_LOCATION_RECORD_NUMBER,
     16,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType2
   },
@@ -734,8 +734,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER,
     6,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldSMBIOSType6
   },
@@ -747,8 +747,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER,
     17,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType3
   },
@@ -760,8 +760,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER,
     19,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType4
   },
@@ -773,8 +773,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_DEVICE_START_ADDRESS_RECORD_NUMBER,
     20,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType5
   },
@@ -786,8 +786,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_CHANNEL_TYPE_RECORD_NUMBER,
     37,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType6
   },
@@ -799,8 +799,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_CHANNEL_DEVICE_RECORD_NUMBER,
     37,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType7
   },
@@ -812,8 +812,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_CONTROLLER_INFORMATION_RECORD_NUMBER,
     5,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType8
   },
@@ -825,8 +825,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_32BIT_ERROR_INFORMATION_RECORD_NUMBER,
     18,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType9
   },
@@ -838,8 +838,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MEMORY_SUBCLASS_GUID,
     EFI_MEMORY_64BIT_ERROR_INFORMATION_RECORD_NUMBER,
     33,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMemoryType10
   },
@@ -851,8 +851,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_BIOS_VENDOR_RECORD_NUMBER, // 0,
     0,                                  // smbios Type 0
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType0
   },
@@ -864,8 +864,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER, // 1,
     1,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType1
   },
@@ -877,8 +877,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_BASE_BOARD_MANUFACTURER_RECORD_NUMBER, // 2,
     2,  // SMBIOS Type 2
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType2
   },
@@ -890,8 +890,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_CHASSIS_MANUFACTURER_RECORD_NUMBER,  // 3,
     3,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType3
   },
@@ -903,8 +903,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_RECORD_NUMBER,  // 8,
     8,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType8
   },
@@ -916,8 +916,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_SLOT_DESIGNATION_RECORD_NUMBER, // 9,
     9,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType9
   },
@@ -929,8 +929,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_ONBOARD_DEVICE_RECORD_NUMBER,  // 10,
     10,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType10
   },
@@ -942,8 +942,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_OEM_STRING_RECORD_NUMBER,  // 11,
     11,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType11
   },
@@ -955,8 +955,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_OPTION_STRING_RECORD_NUMBER,  // 12,
     12,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType12
   },
@@ -968,8 +968,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_NUMBER_OF_INSTALLABLE_LANGUAGES_RECORD_NUMBER, // 13,
     13,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType13
   },
@@ -981,8 +981,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_LANGUAGE_STRING_RECORD_NUMBER, // 13,
     13,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType14
   },
@@ -994,8 +994,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_EVENT_LOG_RECORD_NUMBER, // 15,
     15,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType15
   },  
@@ -1007,8 +1007,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_POINTING_DEVICE_TYPE_RECORD_NUMBER,  // 21,
     21,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType21
   },
@@ -1020,8 +1020,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER, // 22,
     22,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType22
   },  
@@ -1033,8 +1033,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_RESET_CAPABILITIES_RECORD_NUMBER,  // 23,
     23,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType23
   },
@@ -1046,8 +1046,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER,  // 24,
     24,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType24
   },
@@ -1059,8 +1059,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SCHEDULED_POWER_ON_MONTH_RECORD_NUMBER,  // 25,
     25,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType25
   },
@@ -1072,8 +1072,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_RECORD_NUMBER,  // 26,
     26,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType26
   },
@@ -1085,8 +1085,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_COOLING_DEVICE_TEMP_LINK_RECORD_NUMBER,  // 27,
     27,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType27
   },
@@ -1098,8 +1098,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_RECORD_NUMBER,  // 28,
     28,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType28
   },
@@ -1111,8 +1111,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_RECORD_NUMBER,  // 29,
     29,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType29
   },
@@ -1124,8 +1124,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_RECORD_NUMBER,  // 30,
     30,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType30
   },
@@ -1137,8 +1137,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_BOOT_INFORMATION_STATUS_RECORD_NUMBER, // 32,
     32,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType32
   },
@@ -1150,8 +1150,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_RECORD_NUMBER, // 34,
     34,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType34
   },
@@ -1163,8 +1163,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD_RECORD_NUMBER, // 36,
     36,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType36
   },
@@ -1176,8 +1176,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_IPMI_INTERFACE_TYPE_RECORD_NUMBER, // 38,
     38,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType38
   },
@@ -1189,8 +1189,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER, // 39,
     39,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType39
   },
@@ -1202,8 +1202,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     EFI_MISC_SMBIOS_STRUCT_ENCAP_RECORD_NUMBER, // 0x80,
     0x80,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscTypeOEM
   },
@@ -1215,8 +1215,8 @@ SMBIOS_CONVERSION_TABLE_ENTRY mConversionTable[] = {
     EFI_MISC_SUBCLASS_GUID,
     127,
     127,
-    BY_SUBCLASS_INSTANCE_SUBINSTANCE_PRODUCER,
-    BY_FUNCTION,
+    BySubclassInstanceSubinstanceProducer,
+    ByFunction,
     0,
     SmbiosFldMiscType127
   },