-/*++\r
+/**@file\r
\r
Copyright (c) 2006 - 2007, Intel Corporation\r
All rights reserved. This program and the accompanying materials\r
This driver parses the mMiscSubclassDataTable structure and reports\r
any generated data to the DataHub.\r
\r
---*/\r
+**/\r
\r
#include "MiscSubclassDriver.h"\r
\r
//\r
// Locate data hub protocol.\r
//\r
- Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+ Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);\r
\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "Could not locate DataHub protocol. %r\n", Status));\r
//\r
// Add our default strings to the HII database. They will be modified later.\r
//\r
- HiiLibAddPackages (1, &gEfiMiscSubClassGuid, NULL, &HiiHandle, MiscSubclassStrings);\r
-\r
- if (EFI_ERROR (Status)) {\r
+ HiiHandle = HiiAddPackages (\r
+ &gEfiMiscSubClassGuid,\r
+ NULL,\r
+ MiscSubclassStrings,\r
+ NULL\r
+ );\r
+ if (HiiHandle == NULL) {\r
DEBUG ((EFI_D_ERROR, "Could not log default strings to Hii. %r\n", Status));\r
- return Status;\r
+ return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
//\r
\r
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0;\r
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64 (TotalMemorySize, 20) - 1;\r
- MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName = gEfiMemoryProducerGuid;\r
+ MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName = gEfiCallerIdGuid;\r
MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance = 1;\r
MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0;\r
Status = DataHub->LogData (\r
DataHub,\r
&gEfiMemorySubClassGuid,\r
- &gEfiMemoryProducerGuid,\r
+ &gEfiCallerIdGuid,\r
EFI_DATA_RECORD_CLASS_DATA,\r
&MemorySubClassData,\r
sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)\r