From c2bd20a514831baff6910869597bcc031cd6ef73 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 12 Jun 2009 09:09:51 +0000
Subject: 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
---
 UnixPkg/CpuRuntimeDxe/Cpu.c                                    | 7 +++----
 UnixPkg/CpuRuntimeDxe/Cpu.inf                                  | 1 -
 UnixPkg/CpuRuntimeDxe/CpuIo.c                                  | 1 -
 UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h           | 1 -
 UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf         | 1 -
 UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c | 4 ++--
 6 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'UnixPkg')

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index f2541ee..689a50a 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -27,7 +27,6 @@ Abstract:
 #include <Guid/DataHubRecords.h>
 #include <Protocol/CpuIo.h>
 #include <Protocol/FrameworkHii.h>
-#include <Guid/DataHubProducer.h>
 
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
@@ -452,7 +451,7 @@ Returns:
   // Initialize strings to HII database
   //
   HiiHandle = HiiAddPackages (
-                &gEfiProcessorProducerGuid,
+                &gEfiCallerIdGuid,
                 NULL,
                 CpuStrings,
                 NULL
@@ -469,7 +468,7 @@ Returns:
   Status = DataHub->LogData (
                       DataHub,
                       &gEfiProcessorSubClassGuid,
-                      &gEfiProcessorProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       RecordBuffer.Raw,
                       TotalSize
@@ -486,7 +485,7 @@ Returns:
   Status = DataHub->LogData (
                       DataHub,
                       &gEfiProcessorSubClassGuid,
-                      &gEfiProcessorProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       RecordBuffer.Raw,
                       TotalSize
diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index 31e7a07..edab145 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -59,7 +59,6 @@
 
 [Guids]
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
-  gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED
 
 
 [Protocols]
diff --git a/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c
index 2360fff..5c3ebb2 100644
--- a/UnixPkg/CpuRuntimeDxe/CpuIo.c
+++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c
@@ -28,7 +28,6 @@ Abstract:
 #include <Guid/DataHubRecords.h>
 #include <Protocol/CpuIo.h>
 #include <Protocol/FrameworkHii.h>
-#include <Guid/DataHubProducer.h>
 
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
index 2b13a4a..d67c1a9 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h
@@ -25,7 +25,6 @@ Abstract:
 #include <FrameworkDxe.h>
 #include <UnixDxe.h>
 #include <Guid/DataHubRecords.h>
-#include <Guid/DataHubProducer.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/UnixIo.h>
 #include <Library/BaseLib.h>
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index 2f8c7ac..9a3e16e 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -84,7 +84,6 @@
 
 [Guids]
   gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED
-  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
   gEfiMiscSubClassGuid                          # ALWAYS_CONSUMED
 
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 5532896..8732677 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -318,7 +318,7 @@ Returns:
 
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress               = 0;
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;
-  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiMemoryProducerGuid;
+  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiCallerIdGuid;
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance      = 1;
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance   = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth             = 0;
@@ -329,7 +329,7 @@ Returns:
   EfiStatus = DataHub->LogData (
                       DataHub,
                       &gEfiMemorySubClassGuid,
-                      &gEfiMemoryProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       &MemorySubClassData,
                       sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)
-- 
cgit v1.1