Cleanups in PlatformBds.c. BDS will get rewritten, but his makes it easier to look...

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / String.c

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index dc4ed3b6ea89a3a5e95719f939fc5e8a03136daa..cbb35d027be0333bd05fed29494db476745cc8bf 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -30,9 +30,6 @@ Revision History
 #include "BdsString.h"\r
 #include "Language.h"\r
 \r
-EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };\r
-extern        UINT8 PlatformBdsStrings[];\r
-\r
 EFI_STATUS\r
 InitializeStringSupport (\r
   VOID\r
@@ -40,7 +37,7 @@ InitializeStringSupport (
 /*++\r
 \r
 Routine Description:\r
-\r
+ reset\r
   Initialize HII global accessor for string support\r
 \r
 Arguments:\r
@@ -59,11 +56,11 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r
-                  &Hii\r
+                  &gHii\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
-    PackageList = PreparePackages (1, &gBdsStringPackGuid, PlatformBdsStrings);\r
-    Status      = Hii->NewPack (Hii, PackageList, &gStringPackHandle);\r
+    PackageList = PreparePackages (1, &gEfiCallerIdGuid, PlatformBdsStrings);\r
+    Status      = gHii->NewPack (gHii, PackageList, &gStringPackHandle);\r
     FreePool (PackageList);\r
   }\r
 \r
@@ -110,7 +107,7 @@ Returns:
   //\r
   // Get the current string for the current Language\r
   //\r
-  Status = Hii->GetString (Hii, gStringPackHandle, Id, FALSE, NULL, &StringLength, String);\r
+  Status = gHii->GetString (gHii, gStringPackHandle, Id, FALSE, NULL, &StringLength, String);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       //\r
@@ -124,7 +121,7 @@ Returns:
       String = AllocatePool (StringLength);\r
       ASSERT (String != NULL);\r
 \r
-      Status = Hii->GetString (Hii, gStringPackHandle, Id, FALSE, NULL, &StringLength, String);\r
+      Status = gHii->GetString (gHii, gStringPackHandle, Id, FALSE, NULL, &StringLength, String);\r
       if (!EFI_ERROR (Status)) {\r
         return String;\r
       }\r