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
This commit is contained in:
lgao4 2009-06-12 09:09:51 +00:00
parent 20774adc0f
commit c2bd20a514
15 changed files with 17 additions and 29 deletions

View File

@ -91,7 +91,7 @@ InstallProcessorDataHub (
Status = gDataHub->LogData ( Status = gDataHub->LogData (
gDataHub, gDataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&DataRecord, &DataRecord,
sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorCoreFrequency) sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorCoreFrequency)
@ -118,7 +118,7 @@ InstallProcessorDataHub (
Status = gDataHub->LogData ( Status = gDataHub->LogData (
gDataHub, gDataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&DataRecord, &DataRecord,
sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorVersion) sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorVersion)
@ -172,7 +172,7 @@ InstallMemoryDataHub (
DataRecord.Record.ArrayStartAddress.MemoryArrayStartAddress = LShiftU64(SmbiosTable.Type19->StartingAddress, 10); DataRecord.Record.ArrayStartAddress.MemoryArrayStartAddress = LShiftU64(SmbiosTable.Type19->StartingAddress, 10);
DataRecord.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64((UINT64) SmbiosTable.Type19->EndingAddress + 1, 10) - 1; 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.Instance = 0;
DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE; DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;
DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth); DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth);
@ -180,7 +180,7 @@ InstallMemoryDataHub (
gDataHub->LogData ( gDataHub->LogData (
gDataHub, gDataHub,
&gEfiMemorySubClassGuid, &gEfiMemorySubClassGuid,
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&DataRecord, &DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.ArrayStartAddress) sizeof (DataRecord.Header) + sizeof (DataRecord.Record.ArrayStartAddress)
@ -256,7 +256,7 @@ InstallMiscDataHub (
Status = gDataHub->LogData ( Status = gDataHub->LogData (
gDataHub, gDataHub,
&gEfiMiscSubClassGuid, &gEfiMiscSubClassGuid,
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&DataRecord, &DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscBiosVendor) sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscBiosVendor)
@ -301,7 +301,7 @@ InstallMiscDataHub (
Status = gDataHub->LogData ( Status = gDataHub->LogData (
gDataHub, gDataHub,
&gEfiMiscSubClassGuid, &gEfiMiscSubClassGuid,
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&DataRecord, &DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscSystemManufacturer) sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscSystemManufacturer)
@ -346,7 +346,7 @@ DataHubGenEntrypoint (
} }
gStringHandle = HiiAddPackages ( gStringHandle = HiiAddPackages (
&gEfiMiscProducerGuid, &gEfiCallerIdGuid,
NULL, NULL,
DataHubGenDxeStrings, DataHubGenDxeStrings,
NULL NULL

View File

@ -25,7 +25,6 @@ Abstract:
#include <Guid/HobList.h> #include <Guid/HobList.h>
#include <Guid/SmBios.h> #include <Guid/SmBios.h>
#include <Guid/DataHubProducer.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>

View File

@ -54,9 +54,7 @@
gEfiProcessorSubClassGuid gEfiProcessorSubClassGuid
gEfiMiscSubClassGuid gEfiMiscSubClassGuid
gEfiSmbiosTableGuid gEfiSmbiosTableGuid
gEfiMiscProducerGuid
gEfiMemorySubClassGuid gEfiMemorySubClassGuid
gEfiMemoryProducerGuid
[Protocols] [Protocols]
gEfiHiiDatabaseProtocolGuid gEfiHiiDatabaseProtocolGuid

View File

@ -438,7 +438,7 @@ Returns:
// Initialize strings to HII database // Initialize strings to HII database
// //
HiiHandle = HiiAddPackages ( HiiHandle = HiiAddPackages (
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
NULL, NULL,
CpuStrings, CpuStrings,
NULL NULL
@ -455,7 +455,7 @@ Returns:
Status = DataHub->LogData ( Status = DataHub->LogData (
DataHub, DataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
RecordBuffer.Raw, RecordBuffer.Raw,
TotalSize TotalSize
@ -472,7 +472,7 @@ Returns:
Status = DataHub->LogData ( Status = DataHub->LogData (
DataHub, DataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
RecordBuffer.Raw, RecordBuffer.Raw,
TotalSize TotalSize

View File

@ -28,7 +28,6 @@ Abstract:
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Guid/DataHubProducer.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo.h>
#include <Protocol/WinNtIo.h> #include <Protocol/WinNtIo.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -54,7 +54,6 @@
[Guids] [Guids]
gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED
gEfiProcessorProducerGuid # SOMETIMES_CONSUMED
[Protocols] [Protocols]
gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED

View File

@ -78,7 +78,6 @@
[Guids] [Guids]
gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED
gEfiMiscSubClassGuid # SOMETIMES_CONSUMED gEfiMiscSubClassGuid # SOMETIMES_CONSUMED
gEfiMemoryProducerGuid # SOMETIMES_CONSUMED
gEfiMemorySubClassGuid # SOMETIMES_CONSUMED gEfiMemorySubClassGuid # SOMETIMES_CONSUMED
[Protocols] [Protocols]

View File

@ -25,7 +25,6 @@ Abstract:
#include <FrameworkDxe.h> #include <FrameworkDxe.h>
#include <WinNtDxe.h> #include <WinNtDxe.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Guid/DataHubProducer.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Protocol/WinNtIo.h> #include <Protocol/WinNtIo.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -314,7 +314,7 @@ Returns:
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0; MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0;
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64 (TotalMemorySize, 20) - 1; 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.Instance = 1;
MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE; MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0; MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0;
@ -325,7 +325,7 @@ Returns:
Status = DataHub->LogData ( Status = DataHub->LogData (
DataHub, DataHub,
&gEfiMemorySubClassGuid, &gEfiMemorySubClassGuid,
&gEfiMemoryProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&MemorySubClassData, &MemorySubClassData,
sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA) sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)

View File

@ -27,7 +27,6 @@ Abstract:
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Guid/DataHubProducer.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
@ -452,7 +451,7 @@ Returns:
// Initialize strings to HII database // Initialize strings to HII database
// //
HiiHandle = HiiAddPackages ( HiiHandle = HiiAddPackages (
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
NULL, NULL,
CpuStrings, CpuStrings,
NULL NULL
@ -469,7 +468,7 @@ Returns:
Status = DataHub->LogData ( Status = DataHub->LogData (
DataHub, DataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
RecordBuffer.Raw, RecordBuffer.Raw,
TotalSize TotalSize
@ -486,7 +485,7 @@ Returns:
Status = DataHub->LogData ( Status = DataHub->LogData (
DataHub, DataHub,
&gEfiProcessorSubClassGuid, &gEfiProcessorSubClassGuid,
&gEfiProcessorProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
RecordBuffer.Raw, RecordBuffer.Raw,
TotalSize TotalSize

View File

@ -59,7 +59,6 @@
[Guids] [Guids]
gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED
gEfiProcessorProducerGuid # SOMETIMES_CONSUMED
[Protocols] [Protocols]

View File

@ -28,7 +28,6 @@ Abstract:
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Protocol/CpuIo.h> #include <Protocol/CpuIo.h>
#include <Protocol/FrameworkHii.h> #include <Protocol/FrameworkHii.h>
#include <Guid/DataHubProducer.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>

View File

@ -25,7 +25,6 @@ Abstract:
#include <FrameworkDxe.h> #include <FrameworkDxe.h>
#include <UnixDxe.h> #include <UnixDxe.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
#include <Guid/DataHubProducer.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Protocol/UnixIo.h> #include <Protocol/UnixIo.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -84,7 +84,6 @@
[Guids] [Guids]
gEfiMemorySubClassGuid # SOMETIMES_CONSUMED gEfiMemorySubClassGuid # SOMETIMES_CONSUMED
gEfiMemoryProducerGuid # SOMETIMES_CONSUMED
gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED
gEfiMiscSubClassGuid # ALWAYS_CONSUMED gEfiMiscSubClassGuid # ALWAYS_CONSUMED

View File

@ -318,7 +318,7 @@ Returns:
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0; MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0;
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64 (TotalMemorySize, 20) - 1; 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.Instance = 1;
MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE; MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0; MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0;
@ -329,7 +329,7 @@ Returns:
EfiStatus = DataHub->LogData ( EfiStatus = DataHub->LogData (
DataHub, DataHub,
&gEfiMemorySubClassGuid, &gEfiMemorySubClassGuid,
&gEfiMemoryProducerGuid, &gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA, EFI_DATA_RECORD_CLASS_DATA,
&MemorySubClassData, &MemorySubClassData,
sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA) sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)