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
---
 Nt32Pkg/CpuRuntimeDxe/Cpu.c                                    | 6 +++---
 Nt32Pkg/CpuRuntimeDxe/CpuDriver.h                              | 1 -
 Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf                        | 1 -
 Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf    | 1 -
 Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h           | 1 -
 Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c | 4 ++--
 6 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'Nt32Pkg')

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index d8d63d3..f0a138d 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -438,7 +438,7 @@ Returns:
   // Initialize strings to HII database
   //
   HiiHandle = HiiAddPackages (
-                &gEfiProcessorProducerGuid,
+                &gEfiCallerIdGuid,
                 NULL,
                 CpuStrings,
                 NULL
@@ -455,7 +455,7 @@ Returns:
   Status = DataHub->LogData (
                       DataHub,
                       &gEfiProcessorSubClassGuid,
-                      &gEfiProcessorProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       RecordBuffer.Raw,
                       TotalSize
@@ -472,7 +472,7 @@ Returns:
   Status = DataHub->LogData (
                       DataHub,
                       &gEfiProcessorSubClassGuid,
-                      &gEfiProcessorProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       RecordBuffer.Raw,
                       TotalSize
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 6e443bd..f7fdea9 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -28,7 +28,6 @@ Abstract:
 #include <Protocol/DataHub.h>
 #include <Protocol/FrameworkHii.h>
 #include <Guid/DataHubRecords.h>
-#include <Guid/DataHubProducer.h>
 #include <Protocol/CpuIo.h>
 #include <Protocol/WinNtIo.h>
 #include <Library/BaseLib.h>
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 3c2d33e..ded73b3 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -54,7 +54,6 @@
   
 [Guids]
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
-  gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED
 
 [Protocols]
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index 91f72bd..19f19d5 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -78,7 +78,6 @@
 [Guids]
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
   gEfiMiscSubClassGuid                          # SOMETIMES_CONSUMED
-  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED
   gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED
 
 [Protocols]
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index 3d86f16..df3ca8b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -25,7 +25,6 @@ Abstract:
 #include <FrameworkDxe.h>
 #include <WinNtDxe.h>
 #include <Guid/DataHubRecords.h>
-#include <Guid/DataHubProducer.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/WinNtIo.h>
 #include <Library/BaseLib.h>
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 8c2bcc1..515ccbb 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -314,7 +314,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;
@@ -325,7 +325,7 @@ Returns:
   Status = 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