/** @file\r
String support\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
};\r
\r
/**\r
- Initialize HII global accessor for string support\r
-\r
- @retval EFI_SUCCESS String support initialize success.\r
+ Initialize HII global accessor for string support.\r
\r
**/\r
-EFI_STATUS\r
+VOID\r
InitializeStringSupport (\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDLE DriverHandle;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
-\r
- Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
- //\r
- // Create driver handle used by HII database\r
- //\r
- Status = HiiLibCreateHiiDriverHandle (&DriverHandle);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
- PackageList = HiiLibPreparePackageList (1, &mBdsStringPackGuid, &BdsDxeStrings);\r
- ASSERT (PackageList != NULL);\r
-\r
- Status = gHiiDatabase->NewPackageList (\r
- gHiiDatabase,\r
- PackageList,\r
- DriverHandle,\r
- &gStringPackHandle\r
- );\r
-\r
- FreePool (PackageList);\r
- return Status;\r
+ gStringPackHandle = HiiAddPackages (\r
+ &mBdsStringPackGuid,\r
+ gImageHandle,\r
+ BdsDxeStrings,\r
+ NULL\r
+ );\r
+ ASSERT (gStringPackHandle != NULL);\r
}\r
\r
/**\r
IN EFI_STRING_ID Id\r
)\r
{\r
- CHAR16 *String;\r
-\r
- String = NULL;\r
- HiiLibGetStringFromHandle (gStringPackHandle, Id, &String);\r
-\r
- return String;\r
+ return HiiGetString (gStringPackHandle, Id, NULL);\r
}\r