remove EFI_ACPI_30_TABLE_GUID and gEfiAcpi30TableGuid which is not defined in any...

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

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index 8d68f4c0b3266c54ad48e0456fc862bbf72a00cd..f84b348d96acfdea06ba0df6c7fc279ae1520a56 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -21,19 +21,10 @@ Revision History
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Bds.h"\r
-#include "String.h"\r
+#include "BdsString.h"\r
 #include "Language.h"\r
 \r
-extern UINT8  BdsStrings[];\r
-\r
-EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };\r
-\r
 EFI_STATUS\r
 InitializeStringSupport (\r
   VOID\r
@@ -41,7 +32,7 @@ InitializeStringSupport (
 /*++\r
 \r
 Routine Description:\r
-\r
+ reset\r
   Initialize HII global accessor for string support\r
 \r
 Arguments:\r
@@ -60,11 +51,11 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r
-                  &Hii\r
+                  &gHii\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
-    PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);\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
@@ -111,7 +102,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
@@ -125,7 +116,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