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

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / BootMngr / BootManager.c

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
index a3d806913657fa2d87f12a93448983bafd8ffdaa..cfe4ee4d7a853e1e0a706f92375d1b3acf9eff45 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
@@ -173,7 +173,7 @@ Returns:
   // Post our VFR to the HII database\r
   //\r
   PackageList = PreparePackages (2, &BmGuid, BootManagerVfrBin, PlatformBdsStrings);\r
-  Status      = Hii->NewPack (Hii, PackageList, &gBootManagerHandle);\r
+  Status      = gHii->NewPack (gHii, PackageList, &gBootManagerHandle);\r
   FreePool (PackageList);\r
 \r
   //\r
@@ -197,7 +197,7 @@ Returns:
   ASSERT_EFI_ERROR (Status);\r
 \r
   LastToken = 0;\r
-  Hii->NewString (Hii, NULL, gBootManagerHandle, &LastToken, L" ");\r
+  gHii->NewString (gHii, NULL, gBootManagerHandle, &LastToken, L" ");\r
 \r
   //\r
   // Allocate space for creation of UpdateData Buffer\r
@@ -227,7 +227,7 @@ Returns:
             &UpdateData->Data // Buffer containing created op-code\r
             );\r
 \r
-  Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
 \r
   //\r
   // Create "Boot Option Menu" title\r
@@ -237,7 +237,7 @@ Returns:
             &UpdateData->Data                       // Buffer containing created op-code\r
             );\r
 \r
-  Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
 \r
   Token                 = LastToken;\r
   mKeyInput             = 0;\r
@@ -254,7 +254,7 @@ Returns:
     mKeyInput++;\r
     Token++;\r
 \r
-    Status = Hii->NewString (Hii, NULL, gBootManagerHandle, &Token, Option->Description);\r
+    Status = gHii->NewString (gHii, NULL, gBootManagerHandle, &Token, Option->Description);\r
 \r
     //\r
     // If we got an error it is almost certainly due to the token value being invalid.\r
@@ -262,7 +262,7 @@ Returns:
     //\r
     if (EFI_ERROR (Status)) {\r
       Token   = 0;\r
-      Status  = Hii->NewString (Hii, NULL, gBootManagerHandle, &Token, Option->Description);\r
+      Status  = gHii->NewString (gHii, NULL, gBootManagerHandle, &Token, Option->Description);\r
     }\r
 \r
     Status = CreateGotoOpCode (\r
@@ -279,7 +279,7 @@ Returns:
 \r
   }\r
 \r
-  Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0001, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0001, TRUE, UpdateData);\r
 \r
   UpdateData->DataCount = 1;\r
 \r
@@ -291,14 +291,14 @@ Returns:
             &UpdateData->Data               // Buffer containing created op-code\r
             );\r
 \r
-  Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
 \r
   Status = CreateSubTitleOpCode (\r
             LastToken,                      // Token Value for the string\r
             &UpdateData->Data               // Buffer containing created op-code\r
             );\r
 \r
-  Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
 \r
   FreePool (UpdateData);\r
 \r
@@ -321,7 +321,7 @@ Returns:
     EnableResetRequired ();\r
   }\r
 \r
-  Hii->ResetStrings (Hii, gBootManagerHandle);\r
+  gHii->ResetStrings (gHii, gBootManagerHandle);\r
 \r
   if (gOption == NULL) {\r
     return ;\r