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

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / DeviceMngr / DeviceManager.c

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
index ef72e79309da104e454e16c31cdaab5bf60588ed..9cfb82db11374566310701e3c6841e074337e781 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
@@ -28,7 +28,6 @@ STATIC UINT16                     mTokenCount;
 EFI_FRONTPAGE_CALLBACK_INFO       FPCallbackInfo;\r
 extern UINTN                      gCallbackKey;\r
 extern EFI_FORM_BROWSER_PROTOCOL  *gBrowser;\r
-extern EFI_GUID                   gBdsStringPackGuid;\r
 extern BOOLEAN                    gConnectAllHappened;\r
 \r
 STRING_REF                        gStringTokenTable[] = {\r
@@ -122,8 +121,8 @@ Returns:
   UpdateData = AllocateZeroPool (0x1000);\r
   ASSERT (UpdateData != NULL);\r
 \r
-  PackageList = PreparePackages (1, &gBdsStringPackGuid, DeviceManagerVfrBin);\r
-  Status      = Hii->NewPack (Hii, PackageList, &FPCallbackInfo.DevMgrHiiHandle);\r
+  PackageList = PreparePackages (1, &gEfiCallerIdGuid, DeviceManagerVfrBin);\r
+  Status      = gHii->NewPack (gHii, PackageList, &FPCallbackInfo.DevMgrHiiHandle);\r
   FreePool (PackageList);\r
 \r
   //\r
@@ -159,7 +158,7 @@ Returns:
   //\r
   // Simply registering the callback handle\r
   //\r
-  Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);\r
 \r
   FreePool (UpdateData);\r
   return Status;\r
@@ -226,7 +225,7 @@ Returns:
   FormSetData   = NULL;\r
   gCallbackKey  = 0;\r
   if (mTokenCount == 0) {\r
-    Hii->NewString (Hii, NULL, FPCallbackInfo.DevMgrHiiHandle, &mTokenCount, L" ");\r
+    gHii->NewString (gHii, NULL, FPCallbackInfo.DevMgrHiiHandle, &mTokenCount, L" ");\r
   }\r
 \r
   Token     = mTokenCount;\r
@@ -244,7 +243,7 @@ Returns:
     //\r
     // Erase entries on this label\r
     //\r
-    Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, FALSE, UpdateData);\r
+    gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, FALSE, UpdateData);\r
 \r
     //\r
     // Did we reach the end of the Token Table?\r
@@ -262,21 +261,21 @@ Returns:
     //\r
     // Add default title for this label\r
     //\r
-    Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
+    gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
   }\r
   //\r
   // Add a space and an exit string.  Remember since we add things at the label and push other things beyond the\r
   // label down, we add this in reverse order\r
   //\r
   CreateSubTitleOpCode (STRING_TOKEN (STR_EXIT_STRING), &UpdateData->Data);\r
-  Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
   CreateSubTitleOpCode (STR_EMPTY_STRING, &UpdateData->Data);\r
-  Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
 \r
   //\r
-  // Get all the Hii handles\r
+  // Get all the gHii handles\r
   //\r
-  Status = BdsLibGetHiiHandles (Hii, &HandleBufferLength, &HiiHandles);\r
+  Status = BdsLibGetHiiHandles (gHii, &HandleBufferLength, &HiiHandles);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   for (Index = 1, BufferSize = 0; Index < HandleBufferLength; Index++) {\r
@@ -284,7 +283,7 @@ Returns:
     // Am not initializing Buffer since the first thing checked is the size\r
     // this way I can get the real buffersize in the smallest code size\r
     //\r
-    Status = Hii->GetForms (Hii, Index, 0, &BufferSize, Buffer);\r
+    Status = gHii->GetForms (gHii, Index, 0, &BufferSize, Buffer);\r
 \r
     if (Status != EFI_NOT_FOUND) {\r
       //\r
@@ -297,7 +296,7 @@ Returns:
       // Am not initializing Buffer since the first thing checked is the size\r
       // this way I can get the real buffersize in the smallest code size\r
       //\r
-      Status = Hii->GetForms (Hii, Index, 0, &BufferSize, Buffer);\r
+      Status = gHii->GetForms (gHii, Index, 0, &BufferSize, Buffer);\r
 \r
       //\r
       // Skip EFI_HII_PACK_HEADER, advance to EFI_IFR_FORM_SET data.\r
@@ -313,8 +312,8 @@ Returns:
         String        = AllocateZeroPool (StringLength);\r
         ASSERT (String != NULL);\r
 \r
-        Status  = Hii->GetString (Hii, Index, FormSetData->FormSetTitle, TRUE, NULL, &StringLength, String);\r
-        Status  = Hii->NewString (Hii, NULL, FPCallbackInfo.DevMgrHiiHandle, &Token, String);\r
+        Status  = gHii->GetString (gHii, Index, FormSetData->FormSetTitle, TRUE, NULL, &StringLength, String);\r
+        Status  = gHii->NewString (gHii, NULL, FPCallbackInfo.DevMgrHiiHandle, &Token, String);\r
 \r
         //\r
         // If token value exceeded real token value - we need to add a new token values\r
@@ -322,21 +321,21 @@ Returns:
         if (Status == EFI_INVALID_PARAMETER) {\r
           Token     = 0;\r
           TokenHelp = 0;\r
-          Status    = Hii->NewString (Hii, NULL, FPCallbackInfo.DevMgrHiiHandle, &Token, String);\r
+          Status    = gHii->NewString (gHii, NULL, FPCallbackInfo.DevMgrHiiHandle, &Token, String);\r
         }\r
 \r
         StringLength = 0x1000;\r
         if (FormSetData->Help == 0) {\r
           TokenHelp = 0;\r
         } else {\r
-          Status = Hii->GetString (Hii, Index, FormSetData->Help, TRUE, NULL, &StringLength, String);\r
+          Status = gHii->GetString (gHii, Index, FormSetData->Help, TRUE, NULL, &StringLength, String);\r
           if (StringLength == 0x02) {\r
             TokenHelp = 0;\r
           } else {\r
-            Status = Hii->NewString (Hii, NULL, FPCallbackInfo.DevMgrHiiHandle, &TokenHelp, String);\r
+            Status = gHii->NewString (gHii, NULL, FPCallbackInfo.DevMgrHiiHandle, &TokenHelp, String);\r
             if (Status == EFI_INVALID_PARAMETER) {\r
               TokenHelp = 0;\r
-              Status    = Hii->NewString (Hii, NULL, FPCallbackInfo.DevMgrHiiHandle, &TokenHelp, String);\r
+              Status    = gHii->NewString (gHii, NULL, FPCallbackInfo.DevMgrHiiHandle, &TokenHelp, String);\r
             }\r
           }\r
         }\r
@@ -380,8 +379,8 @@ Returns:
           // This is an active bit, so update the form\r
           //\r
           if (FormSetData->Class & Count) {\r
-            Hii->UpdateForm (\r
-                  Hii,\r
+            gHii->UpdateForm (\r
+                  gHii,\r
                   FPCallbackInfo.DevMgrHiiHandle,\r
                   (EFI_FORM_LABEL) (FormSetData->Class & Count),\r
                   TRUE,\r
@@ -440,7 +439,7 @@ Returns:
       );\r
 \r
     UpdateData->DataCount = 4;\r
-    Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) EFI_VBIOS_CLASS, TRUE, UpdateData);\r
+    gHii->UpdateForm (gHii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) EFI_VBIOS_CLASS, TRUE, UpdateData);\r
     FreePool (IfrOptionList);\r
   }\r
 \r
@@ -461,7 +460,7 @@ Returns:
     EnableResetRequired ();\r
   }\r
 \r
-  Hii->ResetStrings (Hii, FPCallbackInfo.DevMgrHiiHandle);\r
+  gHii->ResetStrings (gHii, FPCallbackInfo.DevMgrHiiHandle);\r
 \r
   //\r
   // We will have returned from processing a callback - user either hit ESC to exit, or selected\r