1. Remove DataHubGen drive, which is replaced by SmbiosGen.

2. Remove the unused DataHub driver from DutePkg DSC/FDF files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10392 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2010-04-22 02:43:23 +00:00
parent 6f6e059640
commit 55111a8ce9
7 changed files with 0 additions and 568 deletions

View File

@ -1,436 +0,0 @@
/** @file
Copyright (c) 2006 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
DataHubGen.c
Abstract:
**/
#include "DataHubGen.h"
EFI_HII_DATABASE_PROTOCOL *gHiiDatabase;
extern UINT8 DataHubGenDxeStrings[];
EFI_DATA_HUB_PROTOCOL *gDataHub;
EFI_HII_HANDLE gStringHandle;
VOID *
GetSmbiosTablesFromHob (
VOID
)
{
EFI_PHYSICAL_ADDRESS *Table;
EFI_PEI_HOB_POINTERS GuidHob;
//
// Get Hob List
//
GuidHob.Raw = GetFirstGuidHob (&gEfiSmbiosTableGuid);
if (GuidHob.Raw != NULL) {
Table = GET_GUID_HOB_DATA (GuidHob.Guid);
if (Table != NULL) {
return (VOID *)(UINTN)*Table;
}
}
return NULL;
}
EFI_SUBCLASS_TYPE1_HEADER mCpuDataRecordHeader = {
EFI_PROCESSOR_SUBCLASS_VERSION, // Version
sizeof (EFI_SUBCLASS_TYPE1_HEADER), // Header Size
0, // Instance, Initialize later
EFI_SUBCLASS_INSTANCE_NON_APPLICABLE, // SubInstance
0 // RecordType, Initialize later
};
VOID
InstallProcessorDataHub (
IN VOID *Smbios
)
{
EFI_STATUS Status;
SMBIOS_STRUCTURE_POINTER SmbiosTable;
EFI_CPU_DATA_RECORD DataRecord;
CHAR8 *AString;
CHAR16 *UString;
STRING_REF Token;
//
// Processor info (TYPE 4)
//
SmbiosTable = GetSmbiosTableFromType ((SMBIOS_TABLE_ENTRY_POINT *)Smbios, 4, 0);
if (SmbiosTable.Raw == NULL) {
DEBUG ((EFI_D_ERROR, "SmbiosTable: Type 4 (Processor Info) not found!\n"));
return ;
}
//
// Record Header
//
CopyMem (&DataRecord, &mCpuDataRecordHeader, sizeof (DataRecord.DataRecordHeader));
//
// Record Type 1
//
DataRecord.DataRecordHeader.RecordType = ProcessorCoreFrequencyRecordType;
DataRecord.VariableRecord.ProcessorCoreFrequency.Value = SmbiosTable.Type4->CurrentSpeed;
DataRecord.VariableRecord.ProcessorCoreFrequency.Exponent = 6;
Status = gDataHub->LogData (
gDataHub,
&gEfiProcessorSubClassGuid,
&gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA,
&DataRecord,
sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorCoreFrequency)
);
ASSERT_EFI_ERROR (Status);
//
// Record Type 3
//
AString = GetSmbiosString (SmbiosTable, SmbiosTable.Type4->ProcessorVersion);
UString = AllocateZeroPool ((AsciiStrLen(AString) + 1) * sizeof(CHAR16));
ASSERT (UString != NULL);
AsciiStrToUnicodeStr (AString, UString);
Token = HiiSetString (gStringHandle, 0, UString, NULL);
if (Token == 0) {
gBS->FreePool (UString);
return ;
}
gBS->FreePool (UString);
DataRecord.DataRecordHeader.RecordType = ProcessorVersionRecordType;
DataRecord.VariableRecord.ProcessorVersion = Token;
Status = gDataHub->LogData (
gDataHub,
&gEfiProcessorSubClassGuid,
&gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA,
&DataRecord,
sizeof (DataRecord.DataRecordHeader) + sizeof (DataRecord.VariableRecord.ProcessorVersion)
);
ASSERT_EFI_ERROR (Status);
return ;
}
VOID
InstallCacheDataHub (
IN VOID *Smbios
)
{
return ;
}
EFI_SUBCLASS_TYPE1_HEADER mMemorySubclassDriverDataHeader = {
EFI_MEMORY_SUBCLASS_VERSION, // Version
sizeof (EFI_SUBCLASS_TYPE1_HEADER), // Header Size
0, // Instance, Initialize later
EFI_SUBCLASS_INSTANCE_NON_APPLICABLE, // SubInstance
0 // RecordType, Initialize later
};
VOID
InstallMemoryDataHub (
IN VOID *Smbios
)
{
SMBIOS_STRUCTURE_POINTER SmbiosTable;
EFI_MEMORY_SUBCLASS_DRIVER_DATA DataRecord;
//
// Generate Memory Array Mapped Address info (TYPE 19)
//
SmbiosTable = GetSmbiosTableFromType ((SMBIOS_TABLE_ENTRY_POINT *)Smbios, 19, 0);
if (SmbiosTable.Raw == NULL) {
DEBUG ((EFI_D_ERROR, "SmbiosTable: Type 19 (Memory Array Mapped Address Info) not found!\n"));
return ;
}
//
// Record Header
//
CopyMem (&DataRecord, &mMemorySubclassDriverDataHeader, sizeof (DataRecord.Header));
//
// Record Type 4
//
DataRecord.Header.RecordType = EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER;
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, &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);
gDataHub->LogData (
gDataHub,
&gEfiMemorySubClassGuid,
&gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA,
&DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.ArrayStartAddress)
);
return ;
}
EFI_SUBCLASS_TYPE1_HEADER mMiscSubclassDriverDataHeader = {
EFI_MISC_SUBCLASS_VERSION, // Version
sizeof (EFI_SUBCLASS_TYPE1_HEADER), // Header Size
0, // Instance, Initialize later
EFI_SUBCLASS_INSTANCE_NON_APPLICABLE, // SubInstance
0 // RecordType, Initialize later
};
VOID
InstallMiscDataHub (
IN VOID *Smbios
)
{
EFI_STATUS Status;
SMBIOS_STRUCTURE_POINTER SmbiosTable;
EFI_MISC_SUBCLASS_DRIVER_DATA DataRecord;
CHAR8 *AString;
CHAR16 *UString;
STRING_REF Token;
//
// BIOS information (TYPE 0)
//
SmbiosTable = GetSmbiosTableFromType ((SMBIOS_TABLE_ENTRY_POINT *)Smbios, 0, 0);
if (SmbiosTable.Raw == NULL) {
DEBUG ((EFI_D_ERROR, "SmbiosTable: Type 0 (BIOS Information) not found!\n"));
return ;
}
//
// Record Header
//
CopyMem (&DataRecord, &mMiscSubclassDriverDataHeader, sizeof (DataRecord.Header));
//
// Record Type 2
//
AString = GetSmbiosString (SmbiosTable, SmbiosTable.Type0->BiosVersion);
UString = AllocateZeroPool ((AsciiStrLen(AString) + 1) * sizeof(CHAR16) + sizeof(FIRMWARE_BIOS_VERSIONE));
ASSERT (UString != NULL);
CopyMem (UString, FIRMWARE_BIOS_VERSIONE, sizeof(FIRMWARE_BIOS_VERSIONE));
AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_BIOS_VERSIONE) / sizeof(CHAR16) - 1);
Token = HiiSetString (gStringHandle, 0, UString, NULL);
if (Token == 0) {
gBS->FreePool (UString);
return ;
}
gBS->FreePool (UString);
DataRecord.Header.RecordType = EFI_MISC_BIOS_VENDOR_RECORD_NUMBER;
DataRecord.Record.MiscBiosVendor.BiosVendor = 0;
DataRecord.Record.MiscBiosVendor.BiosVersion = Token;
DataRecord.Record.MiscBiosVendor.BiosReleaseDate = 0;
DataRecord.Record.MiscBiosVendor.BiosStartingAddress = 0;
DataRecord.Record.MiscBiosVendor.BiosPhysicalDeviceSize.Value = 0;
DataRecord.Record.MiscBiosVendor.BiosPhysicalDeviceSize.Exponent = 0;
// DataRecord.Record.MiscBiosVendor.BiosCharacteristics1 = {0};
// DataRecord.Record.MiscBiosVendor.BiosCharacteristics2 = {0};
DataRecord.Record.MiscBiosVendor.BiosMajorRelease = 0;
DataRecord.Record.MiscBiosVendor.BiosMinorRelease = 0;
DataRecord.Record.MiscBiosVendor.BiosEmbeddedFirmwareMajorRelease = 0;
DataRecord.Record.MiscBiosVendor.BiosEmbeddedFirmwareMinorRelease = 0;
Status = gDataHub->LogData (
gDataHub,
&gEfiMiscSubClassGuid,
&gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA,
&DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscBiosVendor)
);
ASSERT_EFI_ERROR (Status);
//
// System information (TYPE 1)
//
SmbiosTable = GetSmbiosTableFromType ((SMBIOS_TABLE_ENTRY_POINT *)Smbios, 1, 0);
if (SmbiosTable.Raw == NULL) {
DEBUG ((EFI_D_ERROR, "SmbiosTable: Type 1 (System Information) not found!\n"));
return ;
}
//
// Record Type 3
//
AString = GetSmbiosString (SmbiosTable, SmbiosTable.Type1->ProductName);
UString = AllocateZeroPool ((AsciiStrLen(AString) + 1) * sizeof(CHAR16) + sizeof(FIRMWARE_PRODUCT_NAME));
ASSERT (UString != NULL);
CopyMem (UString, FIRMWARE_PRODUCT_NAME, sizeof(FIRMWARE_PRODUCT_NAME));
AsciiStrToUnicodeStr (AString, UString + sizeof(FIRMWARE_PRODUCT_NAME) / sizeof(CHAR16) - 1);
Token = HiiSetString (gStringHandle, 0, UString, NULL);
if (Token == 0) {
gBS->FreePool (UString);
return ;
}
gBS->FreePool (UString);
DataRecord.Header.RecordType = EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER;
DataRecord.Record.MiscSystemManufacturer.SystemManufacturer = 0;
DataRecord.Record.MiscSystemManufacturer.SystemProductName = Token;
DataRecord.Record.MiscSystemManufacturer.SystemVersion = 0;
DataRecord.Record.MiscSystemManufacturer.SystemSerialNumber = 0;
// DataRecord.Record.MiscSystemManufacturer.SystemUuid = {0};
DataRecord.Record.MiscSystemManufacturer.SystemWakeupType = EfiSystemWakeupTypeReserved;
DataRecord.Record.MiscSystemManufacturer.SystemSKUNumber = 0;
DataRecord.Record.MiscSystemManufacturer.SystemFamily = 0;
Status = gDataHub->LogData (
gDataHub,
&gEfiMiscSubClassGuid,
&gEfiCallerIdGuid,
EFI_DATA_RECORD_CLASS_DATA,
&DataRecord,
sizeof (DataRecord.Header) + sizeof (DataRecord.Record.MiscSystemManufacturer)
);
ASSERT_EFI_ERROR (Status);
return ;
}
EFI_STATUS
EFIAPI
DataHubGenEntrypoint (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
VOID *Smbios;
Smbios = GetSmbiosTablesFromHob ();
if (Smbios == NULL) {
return EFI_NOT_FOUND;
}
Status = gBS->LocateProtocol (
&gEfiDataHubProtocolGuid,
NULL,
(VOID**)&gDataHub
);
if (EFI_ERROR (Status)) {
return Status;
}
Status = gBS->LocateProtocol (
&gEfiHiiDatabaseProtocolGuid,
NULL,
(VOID**)&gHiiDatabase
);
if (EFI_ERROR (Status)) {
return Status;
}
gStringHandle = HiiAddPackages (
&gEfiCallerIdGuid,
NULL,
DataHubGenDxeStrings,
NULL
);
ASSERT (gStringHandle != NULL);
InstallProcessorDataHub (Smbios);
InstallCacheDataHub (Smbios);
InstallMemoryDataHub (Smbios);
InstallMiscDataHub (Smbios);
return EFI_SUCCESS;
}
//
// Internal function
//
UINTN
SmbiosTableLength (
IN SMBIOS_STRUCTURE_POINTER SmbiosTable
)
{
CHAR8 *AChar;
UINTN Length;
AChar = (CHAR8 *)(SmbiosTable.Raw + SmbiosTable.Hdr->Length);
while ((*AChar != 0) || (*(AChar + 1) != 0)) {
AChar ++;
}
Length = ((UINTN)AChar - (UINTN)SmbiosTable.Raw + 2);
return Length;
}
SMBIOS_STRUCTURE_POINTER
GetSmbiosTableFromType (
IN SMBIOS_TABLE_ENTRY_POINT *Smbios,
IN UINT8 Type,
IN UINTN Index
)
{
SMBIOS_STRUCTURE_POINTER SmbiosTable;
UINTN SmbiosTypeIndex;
SmbiosTypeIndex = 0;
SmbiosTable.Raw = (UINT8 *)(UINTN)Smbios->TableAddress;
if (SmbiosTable.Raw == NULL) {
return SmbiosTable;
}
while ((SmbiosTypeIndex != Index) || (SmbiosTable.Hdr->Type != Type)) {
if (SmbiosTable.Hdr->Type == 127) {
SmbiosTable.Raw = NULL;
return SmbiosTable;
}
if (SmbiosTable.Hdr->Type == Type) {
SmbiosTypeIndex ++;
}
SmbiosTable.Raw = (UINT8 *)(SmbiosTable.Raw + SmbiosTableLength (SmbiosTable));
}
return SmbiosTable;
}
CHAR8 *
GetSmbiosString (
IN SMBIOS_STRUCTURE_POINTER SmbiosTable,
IN SMBIOS_TABLE_STRING String
)
{
CHAR8 *AString;
UINT8 Index;
Index = 1;
AString = (CHAR8 *)(SmbiosTable.Raw + SmbiosTable.Hdr->Length);
while (Index != String) {
while (*AString != 0) {
AString ++;
}
AString ++;
if (*AString == 0) {
return AString;
}
Index ++;
}
return AString;
}

View File

@ -1,66 +0,0 @@
/** @file
Copyright (c) 2006 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
DataHubGen.h
Abstract:
**/
#ifndef _DATA_HUB_GEN_H_
#define _DATA_HUB_GEN_H_
#include <FrameworkDxe.h>
#include <IndustryStandard/SmBios.h>
#include <Guid/HobList.h>
#include <Guid/SmBios.h>
#include <Guid/DataHubRecords.h>
#include <Protocol/DataHub.h>
#include <Protocol/FrameworkHii.h>
#include <Protocol/HiiDatabase.h>
#include <Library/BaseLib.h>
#include <Library/UefiLib.h>
#include <Library/HobLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/HiiLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#define PRODUCT_NAME L"DUET"
#define PRODUCT_VERSION L"Beta"
#define FIRMWARE_PRODUCT_NAME (PRODUCT_NAME L": ")
#ifdef EFI32
#define FIRMWARE_BIOS_VERSIONE (PRODUCT_NAME L"(IA32.UEFI)" PRODUCT_VERSION L": ")
#else // EFIX64
#define FIRMWARE_BIOS_VERSIONE (PRODUCT_NAME L"(X64.UEFI)" PRODUCT_VERSION L": ")
#endif
SMBIOS_STRUCTURE_POINTER
GetSmbiosTableFromType (
IN SMBIOS_TABLE_ENTRY_POINT *Smbios,
IN UINT8 Type,
IN UINTN Index
);
CHAR8 *
GetSmbiosString (
IN SMBIOS_STRUCTURE_POINTER SmbiosTable,
IN SMBIOS_TABLE_STRING String
);
#endif

View File

@ -1,63 +0,0 @@
## @file
#
# Copyright (c) 2006 - 2010, Intel Corporation
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
# Module Name:
#
# DataHubGen.inf
#
# Abstract:
#
# Component description file for DataHubGen module.
#
##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = DataHubGenDxe
FILE_GUID = 0021001C-3CE3-41f8-99C6-ECF5DA754731
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
ENTRY_POINT = DataHubGenEntrypoint
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
[LibraryClasses]
UefiLib
HobLib
UefiBootServicesTableLib
BaseMemoryLib
MemoryAllocationLib
UefiDriverEntryPoint
BaseLib
HiiLib
[Sources]
DataHubGen.c
DataHubGen.h
DataHubGenStrings.uni
[Guids]
gEfiProcessorSubClassGuid
gEfiMiscSubClassGuid
gEfiSmbiosTableGuid
gEfiMemorySubClassGuid
[Protocols]
gEfiHiiDatabaseProtocolGuid
gEfiDataHubProtocolGuid
gEfiHiiProtocolGuid
[Depex]
gEfiDataHubProtocolGuid AND gEfiHiiDatabaseProtocolGuid

View File

@ -56,7 +56,6 @@ INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

View File

@ -186,7 +186,6 @@
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

View File

@ -186,7 +186,6 @@
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf