From c2bd20a514831baff6910869597bcc031cd6ef73 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Fri, 12 Jun 2009 09:09:51 +0000 Subject: [PATCH] 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 --- DuetPkg/DataHubGenDxe/DataHubGen.c | 14 +++++++------- DuetPkg/DataHubGenDxe/DataHubGen.h | 1 - DuetPkg/DataHubGenDxe/DataHubGen.inf | 2 -- Nt32Pkg/CpuRuntimeDxe/Cpu.c | 6 +++--- Nt32Pkg/CpuRuntimeDxe/CpuDriver.h | 1 - Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf | 1 - .../MiscSubClassPlatformDxe.inf | 1 - .../MiscSubClassPlatformDxe/MiscSubclassDriver.h | 1 - .../MiscSubclassDriverEntryPoint.c | 4 ++-- UnixPkg/CpuRuntimeDxe/Cpu.c | 7 +++---- UnixPkg/CpuRuntimeDxe/Cpu.inf | 1 - UnixPkg/CpuRuntimeDxe/CpuIo.c | 1 - .../MiscSubClassPlatformDxe/MiscSubClassDriver.h | 1 - .../MiscSubClassPlatformDxe/MiscSubClassDriver.inf | 1 - .../MiscSubclassDriverEntryPoint.c | 4 ++-- 15 files changed, 17 insertions(+), 29 deletions(-) diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c index 5e723fb1aa..89169c2b24 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.c +++ b/DuetPkg/DataHubGenDxe/DataHubGen.c @@ -91,7 +91,7 @@ InstallProcessorDataHub ( Status = gDataHub->LogData ( gDataHub, &gEfiProcessorSubClassGuid, - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, EFI_DATA_RECORD_CLASS_DATA, &DataRecord, sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorCoreFrequency) @@ -118,7 +118,7 @@ InstallProcessorDataHub ( Status = gDataHub->LogData ( gDataHub, &gEfiProcessorSubClassGuid, - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, EFI_DATA_RECORD_CLASS_DATA, &DataRecord, sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorVersion) @@ -172,7 +172,7 @@ InstallMemoryDataHub ( DataRecord.Record.ArrayStartAddress.MemoryArrayStartAddress = LShiftU64(SmbiosTable.Type19->StartingAddress, 10); DataRecord.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64((UINT64) SmbiosTable.Type19->EndingAddress + 1, 10) - 1; - CopyGuid (&DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiMemoryProducerGuid); + CopyGuid (&DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiCallerIdGuid); DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance = 0; DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE; DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth); @@ -180,7 +180,7 @@ InstallMemoryDataHub ( gDataHub->LogData ( gDataHub, &gEfiMemorySubClassGuid, - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, EFI_DATA_RECORD_CLASS_DATA, &DataRecord, sizeof (DataRecord.Header) + sizeof (DataRecord.Record.ArrayStartAddress) @@ -256,7 +256,7 @@ InstallMiscDataHub ( Status = gDataHub->LogData ( gDataHub, &gEfiMiscSubClassGuid, - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, EFI_DATA_RECORD_CLASS_DATA, &DataRecord, sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscBiosVendor) @@ -301,7 +301,7 @@ InstallMiscDataHub ( Status = gDataHub->LogData ( gDataHub, &gEfiMiscSubClassGuid, - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, EFI_DATA_RECORD_CLASS_DATA, &DataRecord, sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscSystemManufacturer) @@ -346,7 +346,7 @@ DataHubGenEntrypoint ( } gStringHandle = HiiAddPackages ( - &gEfiMiscProducerGuid, + &gEfiCallerIdGuid, NULL, DataHubGenDxeStrings, NULL diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h index 487d3e4aa2..9cf4e4b00c 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.h +++ b/DuetPkg/DataHubGenDxe/DataHubGen.h @@ -25,7 +25,6 @@ Abstract: #include #include -#include #include #include diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.inf b/DuetPkg/DataHubGenDxe/DataHubGen.inf index d77202ca0c..92cb41a1c8 100644 --- a/DuetPkg/DataHubGenDxe/DataHubGen.inf +++ b/DuetPkg/DataHubGenDxe/DataHubGen.inf @@ -54,9 +54,7 @@ gEfiProcessorSubClassGuid gEfiMiscSubClassGuid gEfiSmbiosTableGuid - gEfiMiscProducerGuid gEfiMemorySubClassGuid - gEfiMemoryProducerGuid [Protocols] gEfiHiiDatabaseProtocolGuid diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c index d8d63d3da9..f0a138d96d 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 6e443bd7d3..f7fdea9a92 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h +++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h @@ -28,7 +28,6 @@ Abstract: #include #include #include -#include #include #include #include diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf index 3c2d33e4cd..ded73b3661 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 91f72bd483..19f19d578a 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 3d86f16a93..df3ca8b986 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h @@ -25,7 +25,6 @@ Abstract: #include #include #include -#include #include #include #include diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c index 8c2bcc19ea..515ccbbc5b 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) diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c index f2541ee994..689a50a704 100644 --- a/UnixPkg/CpuRuntimeDxe/Cpu.c +++ b/UnixPkg/CpuRuntimeDxe/Cpu.c @@ -27,7 +27,6 @@ Abstract: #include #include #include -#include #include #include @@ -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 31e7a0791a..edab145b61 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 2360fff5fc..5c3ebb2f38 100644 --- a/UnixPkg/CpuRuntimeDxe/CpuIo.c +++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c @@ -28,7 +28,6 @@ Abstract: #include #include #include -#include #include #include diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h index 2b13a4a40b..d67c1a9762 100644 --- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h +++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.h @@ -25,7 +25,6 @@ Abstract: #include #include #include -#include #include #include #include diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf index 2f8c7ac6bf..9a3e16e792 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 553289668f..8732677c95 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) -- 2.39.2