Retire gEfiProcessorProducerGuid,gEfiMemoryProducerGuid,

gEfiMiscProducerGuid, which are not consumed by any module.
They can be replaced by gEfiCallerIdGuid.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8540 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 5e723fb1aa45557f8b0fc93b6705bd18e38e31ca..89169c2b2437d45db958f4b8f23cb943ba96ddaf 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -91,7 +91,7 @@ InstallProcessorDataHub (
   Status = gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiProcessorSubClassGuid,\r
-                       &gEfiMiscProducerGuid,\r
+                       &gEfiCallerIdGuid,\r
                        EFI_DATA_RECORD_CLASS_DATA,\r
                        &DataRecord,\r
                        sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorCoreFrequency)\r
@@ -118,7 +118,7 @@ InstallProcessorDataHub (
   Status = gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiProcessorSubClassGuid,\r
-                       &gEfiMiscProducerGuid,\r
+                       &gEfiCallerIdGuid,\r
                        EFI_DATA_RECORD_CLASS_DATA,\r
                        &DataRecord,\r
                        sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorVersion)\r
@@ -172,7 +172,7 @@ InstallMemoryDataHub (
   DataRecord.Record.ArrayStartAddress.MemoryArrayStartAddress = LShiftU64(SmbiosTable.Type19->StartingAddress, 10);\r
   DataRecord.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64((UINT64) SmbiosTable.Type19->EndingAddress + 1, 10) - 1;\r
   \r
-  CopyGuid (&DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiMemoryProducerGuid);\r
+  CopyGuid (&DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiCallerIdGuid);\r
   DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance = 0;\r
   DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth); \r
@@ -180,7 +180,7 @@ InstallMemoryDataHub (
   gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiMemorySubClassGuid,\r
-                       &gEfiMiscProducerGuid,\r
+                       &gEfiCallerIdGuid,\r
                        EFI_DATA_RECORD_CLASS_DATA,\r
                        &DataRecord,\r
                        sizeof (DataRecord.Header) + sizeof (DataRecord.Record.ArrayStartAddress)\r
@@ -256,7 +256,7 @@ InstallMiscDataHub (
   Status = gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiMiscSubClassGuid,\r
-                       &gEfiMiscProducerGuid,\r
+                       &gEfiCallerIdGuid,\r
                        EFI_DATA_RECORD_CLASS_DATA,\r
                        &DataRecord,\r
                        sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscBiosVendor)\r
@@ -301,7 +301,7 @@ InstallMiscDataHub (
   Status = gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiMiscSubClassGuid,\r
-                       &gEfiMiscProducerGuid,\r
+                       &gEfiCallerIdGuid,\r
                        EFI_DATA_RECORD_CLASS_DATA,\r
                        &DataRecord,\r
                        sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscSystemManufacturer)\r
@@ -346,7 +346,7 @@ DataHubGenEntrypoint (
   }\r
   \r
   gStringHandle = HiiAddPackages (\r
-                    &gEfiMiscProducerGuid,\r
+                    &gEfiCallerIdGuid,\r
                     NULL,\r
                     DataHubGenDxeStrings,\r
                     NULL\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h
index 487d3e4aa258332a114af09b356a55492b63b210..9cf4e4b00cfad1c4c4c4cf1178a15e3d358ffdb9 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.h
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.h
@@ -25,7 +25,6 @@ Abstract:
 \r
 #include <Guid/HobList.h>\r
 #include <Guid/SmBios.h>\r
-#include <Guid/DataHubProducer.h>\r
 #include <Guid/DataHubRecords.h>\r
 \r
 #include <Protocol/DataHub.h>\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.inf b/DuetPkg/DataHubGenDxe/DataHubGen.inf
index d77202ca0c2987f75cab3c7217479ded880da15b..92cb41a1c88404aa9a97adeaaf5599a1b91ecbeb 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.inf
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.inf
@@ -54,9 +54,7 @@
   gEfiProcessorSubClassGuid\r
   gEfiMiscSubClassGuid\r
   gEfiSmbiosTableGuid\r
-  gEfiMiscProducerGuid\r
   gEfiMemorySubClassGuid\r
-  gEfiMemoryProducerGuid\r
 \r
 [Protocols]\r
   gEfiHiiDatabaseProtocolGuid\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index d8d63d3da9408f7d813d7f16e96f2437e4f32a4f..f0a138d96d9824d7c2e25ed3e05386b18182f23b 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -438,7 +438,7 @@ Returns:
   // Initialize strings to HII database\r
   //\r
   HiiHandle = HiiAddPackages (\r
-                &gEfiProcessorProducerGuid,\r
+                &gEfiCallerIdGuid,\r
                 NULL,\r
                 CpuStrings,\r
                 NULL\r
@@ -455,7 +455,7 @@ Returns:
   Status = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiProcessorSubClassGuid,\r
-                      &gEfiProcessorProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       RecordBuffer.Raw,\r
                       TotalSize\r
@@ -472,7 +472,7 @@ Returns:
   Status = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiProcessorSubClassGuid,\r
-                      &gEfiProcessorProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       RecordBuffer.Raw,\r
                       TotalSize\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 6e443bd7d320b1d01a3030d9db99e00002304ab7..f7fdea9a9252457ead0828ed5b2da14c8f718261 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -28,7 +28,6 @@ Abstract:
 #include <Protocol/DataHub.h>\r
 #include <Protocol/FrameworkHii.h>\r
 #include <Guid/DataHubRecords.h>\r
-#include <Guid/DataHubProducer.h>\r
 #include <Protocol/CpuIo.h>\r
 #include <Protocol/WinNtIo.h>\r
 #include <Library/BaseLib.h>\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 3c2d33e4cd22c18a12c055a722289befa94f1356..ded73b3661f13f74b34a1831a7f37e5d9258a45a 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -54,7 +54,6 @@
   \r
 [Guids]\r
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
-  gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED\r
 \r
 [Protocols]\r
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index 91f72bd483d737b26e05496bf657845e861a03e3..19f19d578ad52a6e4aef530dd3c3db24788d9075 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -78,7 +78,6 @@
 [Guids]\r
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
   gEfiMiscSubClassGuid                          # SOMETIMES_CONSUMED\r
-  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED\r
   gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED\r
 \r
 [Protocols]\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index 3d86f16a9341f899fbe8d6335f0877023867e12d..df3ca8b9864fd9046160a501fb4cbef4d975c48e 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -25,7 +25,6 @@ Abstract:
 #include <FrameworkDxe.h>\r
 #include <WinNtDxe.h>\r
 #include <Guid/DataHubRecords.h>\r
-#include <Guid/DataHubProducer.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/WinNtIo.h>\r
 #include <Library/BaseLib.h>\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 8c2bcc19ea0c2436efdef66035ea38f50526b6b6..515ccbbc5b0db28cf3b729880d9260c45418d17c 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -314,7 +314,7 @@ Returns:
 \r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress               = 0;\r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;\r
-  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiMemoryProducerGuid;\r
+  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiCallerIdGuid;\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance      = 1;\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance   = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth             = 0;\r
@@ -325,7 +325,7 @@ Returns:
   Status = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiMemorySubClassGuid,\r
-                      &gEfiMemoryProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       &MemorySubClassData,\r
                       sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)\r

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index f2541ee9940de08896aa8bd4af026177eb7dc541..689a50a704fb403b7d7a22c75d967480f42c4a69 100644 (file)
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -27,7 +27,6 @@ Abstract:
 #include <Guid/DataHubRecords.h>\r
 #include <Protocol/CpuIo.h>\r
 #include <Protocol/FrameworkHii.h>\r
-#include <Guid/DataHubProducer.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -452,7 +451,7 @@ Returns:
   // Initialize strings to HII database\r
   //\r
   HiiHandle = HiiAddPackages (\r
-                &gEfiProcessorProducerGuid,\r
+                &gEfiCallerIdGuid,\r
                 NULL,\r
                 CpuStrings,\r
                 NULL\r
@@ -469,7 +468,7 @@ Returns:
   Status = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiProcessorSubClassGuid,\r
-                      &gEfiProcessorProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       RecordBuffer.Raw,\r
                       TotalSize\r
@@ -486,7 +485,7 @@ Returns:
   Status = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiProcessorSubClassGuid,\r
-                      &gEfiProcessorProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       RecordBuffer.Raw,\r
                       TotalSize\r

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index 31e7a0791a6423ced1a40b9da41dff6b263ff435..edab145b61535b51ad8311df8dedebe9cb5704a0 100644 (file)
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -59,7 +59,6 @@
 \r
 [Guids]\r
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
-  gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED\r
 \r
 \r
 [Protocols]\r

diff --git a/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c
index 2360fff5fcb4ab23d0d3fdc6442778deadbc6d45..5c3ebb2f38c2d5dee65e350fc11c0104eb05588f 100644 (file)
--- a/UnixPkg/CpuRuntimeDxe/CpuIo.c
+++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c
@@ -28,7 +28,6 @@ Abstract:
 #include <Guid/DataHubRecords.h>\r
 #include <Protocol/CpuIo.h>\r
 #include <Protocol/FrameworkHii.h>\r
-#include <Guid/DataHubProducer.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
index 2b13a4a40bb7ec05c2acfef5cf3fddabd9c48f14..d67c1a9762d2fe4d494d2da7d8784fed6ff3bc01 100644 (file)
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
@@ -25,7 +25,6 @@ Abstract:
 #include <FrameworkDxe.h>\r
 #include <UnixDxe.h>\r
 #include <Guid/DataHubRecords.h>\r
-#include <Guid/DataHubProducer.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/UnixIo.h>\r
 #include <Library/BaseLib.h>\r

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index 2f8c7ac6bf31a179be2df1036c3257277af00f17..9a3e16e7926c5c54b6a7c195e37085e504649ee9 100644 (file)
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -84,7 +84,6 @@
 \r
 [Guids]\r
   gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED\r
-  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED\r
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
   gEfiMiscSubClassGuid                          # ALWAYS_CONSUMED\r
 \r

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 553289668f82305fdea5946b97373bb4102c0c12..8732677c95259e1bcbbe1a20b997a0b44e275fde 100644 (file)
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -318,7 +318,7 @@ Returns:
 \r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress               = 0;\r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;\r
-  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiMemoryProducerGuid;\r
+  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiCallerIdGuid;\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance      = 1;\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance   = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth             = 0;\r
@@ -329,7 +329,7 @@ Returns:
   EfiStatus = DataHub->LogData (\r
                       DataHub,\r
                       &gEfiMemorySubClassGuid,\r
-                      &gEfiMemoryProducerGuid,\r
+                      &gEfiCallerIdGuid,\r
                       EFI_DATA_RECORD_CLASS_DATA,\r
                       &MemorySubClassData,\r
                       sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)\r