git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5151
6f19259b-4bc3-4df7-8a09-
765794883524
**/\r
\r
#include "DataHubGen.h"\r
**/\r
\r
#include "DataHubGen.h"\r
+EFI_HII_DATABASE_PROTOCOL *gHiiDatabase;\r
-EFI_HII_PROTOCOL *gHii;\r
extern UINT8 DataHubGenDxeStrings[];\r
\r
EFI_DATA_HUB_PROTOCOL *gDataHub;\r
extern UINT8 DataHubGenDxeStrings[];\r
\r
EFI_DATA_HUB_PROTOCOL *gDataHub;\r
- EFI_STATUS Status;\r
- EFI_HOB_HANDOFF_INFO_TABLE *HobList;\r
EFI_PHYSICAL_ADDRESS *Table;\r
EFI_PHYSICAL_ADDRESS *Table;\r
+ EFI_PEI_HOB_POINTERS GuidHob;\r
//\r
// Get Hob List\r
//\r
//\r
// Get Hob List\r
//\r
- \r
- Status = EfiGetSystemConfigurationTable (&gEfiHobListGuid, (VOID *) &HobList);\r
- if (EFI_ERROR (Status)) {\r
- return NULL;\r
- }\r
-\r
- //\r
- // If there is a SMBIOS table in the HOB add it to the EFI System table\r
- //\r
- Table = GetNextGuidHob (&gEfiSmbiosTableGuid, &HobList);\r
-\r
- if (!EFI_ERROR (Status)) {\r
- return (VOID *)(UINTN)*Table;\r
+ GuidHob.Raw = GetHobList ();\r
+ GuidHob.Raw = GetNextGuidHob (&gEfiSmbiosTableGuid, GuidHob.Raw);\r
+ if (GuidHob.Raw != NULL) {\r
+ Table = GET_GUID_HOB_DATA (GuidHob.Guid);\r
+ if (Table != NULL) {\r
+ return (VOID *)(UINTN)*Table;\r
+ }\r
-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
Status = gBS->LocateProtocol (\r
&gEfiHiiDatabaseProtocolGuid,\r
NULL,\r
&gHiiDatabase\r
);\r
Status = gBS->LocateProtocol (\r
&gEfiHiiDatabaseProtocolGuid,\r
NULL,\r
&gHiiDatabase\r
);\r
-#else\r
- Status = gBS->LocateProtocol (\r
- &gEfiHiiProtocolGuid,\r
- NULL,\r
- (VOID**)&gHii\r
- );\r
-#endif\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
#include <Protocol/Datahub.h>\r
#include <Protocol/FrameworkHii.h>\r
\r
#include <Protocol/Datahub.h>\r
#include <Protocol/FrameworkHii.h>\r
+#include <Protocol/HiiDatabase.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/UefiLib.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/UefiLib.h>\r
gEfiMemoryProducerGuid\r
gEfiHiiProtocolGuid\r
\r
gEfiMemoryProducerGuid\r
gEfiHiiProtocolGuid\r
\r
+[Protocols]\r
+ gEfiHiiDatabaseProtocolGuid\r
+\r
- gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid
\ No newline at end of file
+ gEfiDataHubProtocolGuid AND gEfiHiiDatabaseProtocolGuid
\ No newline at end of file