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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3187 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
index b475c37a30977302f12abe8c1d28d381f46c2f0d..1e8066537c47e739f9a6e68bf5e789080da8e593 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
@@ -33,7 +33,7 @@ Revision History
   }\r
 \r
 EFI_HII_HANDLE    gStringPackHandle;\r
-EFI_HII_PROTOCOL  *Hii;\r
+EFI_HII_PROTOCOL  *gHii;\r
 \r
 CHAR16            *\r
 GetStringById (\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
index f75cc44ca6c9b353868c2377df7f6231927e2058..9054f134d612b6730afc7e23cc31beb49868f056 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
@@ -33,7 +33,6 @@ Abstract:
 //\r
 extern UINT8    bmBin[];\r
 extern UINT8    FEBin[];\r
-extern EFI_GUID gBdsStringPackGuid;\r
 extern BOOLEAN  gConnectAllHappened;\r
 \r
 EFI_GUID        EfiLegacyDevOrderGuid = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;\r
@@ -851,13 +850,13 @@ Returns:
   //\r
   // Post our VFR to the HII database.\r
   //\r
-  PackageList = PreparePackages (1, &gBdsStringPackGuid, bmBin);\r
+  PackageList = PreparePackages (1, &gEfiCallerIdGuid, bmBin);\r
   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
   FreePool (PackageList);\r
 \r
   BmmCallbackInfo->BmmHiiHandle = HiiHandle;\r
 \r
-  PackageList                   = PreparePackages (1, &gBdsStringPackGuid, FEBin);\r
+  PackageList                   = PreparePackages (1, &gEfiCallerIdGuid, FEBin);\r
   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
   FreePool (PackageList);\r
 \r

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

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

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
index 804b3790516f710affea4abb7b24a2253d78cb6e..9b8a805e462d8835d430b6d7559eebf7a05b3bdc 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
@@ -42,7 +42,6 @@ UINTN                       gCallbackKey;
 BOOLEAN                     gConnectAllHappened = FALSE;\r
 \r
 extern EFI_HII_HANDLE       gFrontPageHandle;\r
-extern EFI_GUID             gBdsStringPackGuid;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -106,7 +105,7 @@ Returns:
     //\r
     // Collect the languages from what our current Language support is based on our VFR\r
     //\r
-    Hii->GetPrimaryLanguages (Hii, gFrontPageHandle, &LanguageString);\r
+    gHii->GetPrimaryLanguages (gHii, gFrontPageHandle, &LanguageString);\r
 \r
     //\r
     // Based on the DataArray->Data->Data value, we can determine\r
@@ -255,9 +254,9 @@ Returns:
 \r
   gCallbackKey  = 0;\r
 \r
-  PackageList   = PreparePackages (1, &gBdsStringPackGuid, FrontPageVfrBin);\r
+  PackageList   = PreparePackages (1, &gEfiCallerIdGuid, FrontPageVfrBin);\r
 \r
-  Status        = Hii->NewPack (Hii, PackageList, &gFrontPageHandle);\r
+  Status        = gHii->NewPack (gHii, PackageList, &gFrontPageHandle);\r
 \r
   FreePool (PackageList);\r
 \r
@@ -335,7 +334,7 @@ ReInitStrings:
   //\r
   // Collect the languages from what our current Language support is based on our VFR\r
   //\r
-  Hii->GetPrimaryLanguages (Hii, gFrontPageHandle, &LanguageString);\r
+  gHii->GetPrimaryLanguages (gHii, gFrontPageHandle, &LanguageString);\r
 \r
   OptionCount = 0;\r
 \r
@@ -359,8 +358,8 @@ ReInitStrings:
       mLastSelection = (UINT16) OptionCount;\r
     }\r
 \r
-    Status = Hii->GetString (Hii, gStringPackHandle, 1, TRUE, Lang, &BufferSize, StringBuffer);\r
-    Hii->NewString (Hii, NULL, gStringPackHandle, &Token, StringBuffer);\r
+    Status = gHii->GetString (gHii, gStringPackHandle, 1, TRUE, Lang, &BufferSize, StringBuffer);\r
+    gHii->NewString (gHii, NULL, gStringPackHandle, &Token, StringBuffer);\r
     CopyMem (&OptionList[OptionCount].StringToken, &Token, sizeof (UINT16));\r
     CopyMem (&OptionList[OptionCount].Value, &OptionCount, sizeof (UINT16));\r
     Key = 0x1234;\r
@@ -392,7 +391,7 @@ ReInitStrings:
   //\r
   UpdateData->DataCount = (UINT8) (OptionCount + 2);\r
 \r
-  Hii->UpdateForm (Hii, gFrontPageHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gFrontPageHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);\r
 \r
   FreePool (UpdateData);\r
   //\r
@@ -452,7 +451,7 @@ Returns:
     EnableResetRequired ();\r
   }\r
 \r
-  Hii->ResetStrings (Hii, gFrontPageHandle);\r
+  gHii->ResetStrings (gHii, gFrontPageHandle);\r
 \r
   return Status;\r
 }\r
@@ -499,11 +498,11 @@ Returns:
   //\r
   // Get all the Hii handles\r
   //\r
-  Status = BdsLibGetHiiHandles (Hii, &HandleBufferLength, &HiiHandleBuffer);\r
+  Status = BdsLibGetHiiHandles (gHii, &HandleBufferLength, &HiiHandleBuffer);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
-  // Get the Hii Handle that matches the StructureNode->ProducerName\r
+  // Get the gHii Handle that matches the StructureNode->ProducerName\r
   //\r
   NumberOfHiiHandles = HandleBufferLength / sizeof (EFI_HII_HANDLE);\r
   for (Index = 0; Index < NumberOfHiiHandles; Index++) {\r
@@ -523,8 +522,8 @@ Returns:
   //\r
   StringBufferLength  = 0x100;\r
   *String             = AllocateZeroPool (0x100);\r
-  Status = Hii->GetString (\r
-                  Hii,\r
+  Status = gHii->GetString (\r
+                  gHii,\r
                   HiiHandleBuffer[Index],\r
                   Token,\r
                   FALSE,\r
@@ -693,7 +692,7 @@ Returns:
         BiosVendor = (EFI_MISC_BIOS_VENDOR_DATA *) (DataHeader + 1);\r
         GetStringFromToken (&Record->ProducerName, BiosVendor->BiosVersion, &NewString);\r
         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_BIOS_VERSION;\r
-        Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
+        gHii->NewString (gHii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
         FreePool (NewString);\r
         Find[0] = TRUE;\r
       }\r
@@ -704,7 +703,7 @@ Returns:
         SystemManufacturer = (EFI_MISC_SYSTEM_MANUFACTURER_DATA *) (DataHeader + 1);\r
         GetStringFromToken (&Record->ProducerName, SystemManufacturer->SystemProductName, &NewString);\r
         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_COMPUTER_MODEL;\r
-        Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
+        gHii->NewString (gHii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
         FreePool (NewString);\r
         Find[1] = TRUE;\r
       }\r
@@ -715,7 +714,7 @@ Returns:
         ProcessorVersion = (EFI_PROCESSOR_VERSION_DATA *) (DataHeader + 1);\r
         GetStringFromToken (&Record->ProducerName, *ProcessorVersion, &NewString);\r
         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_CPU_MODEL;\r
-        Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
+        gHii->NewString (gHii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
         FreePool (NewString);\r
         Find[2] = TRUE;\r
       }\r
@@ -726,7 +725,7 @@ Returns:
         ProcessorFrequency = (EFI_PROCESSOR_CORE_FREQUENCY_DATA *) (DataHeader + 1);\r
         ConvertProcessorToString (ProcessorFrequency, &NewString);\r
         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_CPU_SPEED;\r
-        Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
+        gHii->NewString (gHii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
         FreePool (NewString);\r
         Find[3] = TRUE;\r
       }\r
@@ -739,7 +738,7 @@ Returns:
                                   MemoryArray->MemoryArrayStartAddress + 1), 20)),\r
                                   &NewString);\r
         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_MEMORY_SIZE;\r
-        Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
+        gHii->NewString (gHii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);\r
         FreePool (NewString);\r
         Find[4] = TRUE;\r
       }\r
@@ -797,7 +796,7 @@ Returns:
   //\r
   // Remove Banner Op-code if any at this label\r
   //\r
-  Hii->UpdateForm (Hii, gFrontPageHandle, (EFI_FORM_LABEL) 0xFFFF, FALSE, UpdateData);\r
+  gHii->UpdateForm (gHii, gFrontPageHandle, (EFI_FORM_LABEL) 0xFFFF, FALSE, UpdateData);\r
 \r
   //\r
   // Create Banner Op-code which reflects correct timeout value\r
@@ -812,7 +811,7 @@ Returns:
   //\r
   // Add Banner Op-code at this label\r
   //\r
-  Hii->UpdateForm (Hii, gFrontPageHandle, (EFI_FORM_LABEL) 0xFFFF, TRUE, UpdateData);\r
+  gHii->UpdateForm (gHii, gFrontPageHandle, (EFI_FORM_LABEL) 0xFFFF, TRUE, UpdateData);\r
 \r
   do {\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
index 01277d7cf49b87572deb15edb13c03d2b5e7b704..60b92f0c7eaf3445bf920f9a0e797cba65ef221b 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
@@ -29,310 +29,11 @@ Revision History
 #include "BdsString.h"\r
 #include "Language.h"\r
 \r
-#define NARROW_GLYPH_NUMBER 8\r
-#define WIDE_GLYPH_NUMBER   75\r
-\r
 //\r
 // Default language code, currently is English\r
 //\r
 CHAR8 *mDefaultLangCode = "eng";\r
 \r
-typedef struct {\r
-  EFI_HII_FONT_PACK FixedLength;\r
-  EFI_NARROW_GLYPH  NarrowArray[NARROW_GLYPH_NUMBER];\r
-  EFI_WIDE_GLYPH    WideArray[WIDE_GLYPH_NUMBER];\r
-} FONT_PACK;\r
-\r
-FONT_PACK mFontPack = {\r
-  sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),\r
-  EFI_HII_FONT,\r
-  NARROW_GLYPH_NUMBER,\r
-  WIDE_GLYPH_NUMBER,\r
-  {     // Narrow Glyphs\r
-    {\r
-      0x05d0,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x4E,\r
-        0x6E,\r
-        0x62,\r
-        0x32,\r
-        0x32,\r
-        0x3C,\r
-        0x68,\r
-        0x4C,\r
-        0x4C,\r
-        0x46,\r
-        0x76,\r
-        0x72,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d1,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x78,\r
-        0x7C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x7E,\r
-        0x7E,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d2,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x78,\r
-        0x7C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x1C,\r
-        0x3E,\r
-        0x66,\r
-        0x66,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d3,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x7E,\r
-        0x7E,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d4,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x7C,\r
-        0x7E,\r
-        0x06,\r
-        0x06,\r
-        0x06,\r
-        0x06,\r
-        0x66,\r
-        0x66,\r
-        0x66,\r
-        0x66,\r
-        0x66,\r
-        0x66,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d5,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x3C,\r
-        0x3C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x0C,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x05d6,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x38,\r
-        0x38,\r
-        0x1E,\r
-        0x1E,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x18,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },\r
-    {\r
-      0x0000,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    }\r
-  },\r
-  {     // Wide Glyphs\r
-    {\r
-      0x0020,\r
-      0x00,\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      },\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      },\r
-      {\r
-        0x00,\r
-        0x00,\r
-        0x00\r
-      }\r
-    },  //\r
-  }\r
-};\r
-\r
-VOID\r
-ExportFonts (\r
-  VOID\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-  Routine to export glyphs to the HII database.  This is in addition to whatever is defined in the Graphics Console driver.\r
-\r
-Arguments:\r
-  None\r
-\r
-Returns:\r
-\r
---*/\r
-{\r
-  EFI_HII_HANDLE    HiiHandle;\r
-  EFI_HII_PACKAGES  *PackageList;\r
-\r
-  PackageList = PreparePackages (1, NULL, &mFontPack);\r
-  //\r
-  // Register our Fonts into the global database\r
-  //\r
-  HiiHandle = 0;\r
-  Hii->NewPack (Hii, PackageList, &HiiHandle);\r
-\r
-  FreePool (PackageList);\r
-}\r
 \r
 VOID\r
 InitializeLanguage (\r
@@ -361,12 +62,10 @@ Returns:
   LanguageString  = NULL;\r
   LangCodes       = NULL;\r
 \r
-  ExportFonts ();\r
-\r
   //\r
   // Collect the languages from what our current Language support is based on our VFR\r
   //\r
-  Hii->GetPrimaryLanguages (Hii, gStringPackHandle, &LanguageString);\r
+  gHii->GetPrimaryLanguages (gHii, gStringPackHandle, &LanguageString);\r
 \r
   LangCodes = AllocatePool (StrLen (LanguageString));\r
   ASSERT (LangCodes);\r

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

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
index 9ea3d4dde7c8d47b154b137058142e981c7d60ae..7e2442365b5820d1400f7212a350990030afa60b 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
@@ -173,4 +173,5 @@
   gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [depex]\r
-  gEfiHiiProtocolGuid
\ No newline at end of file
+  gEfiHiiProtocolGuid\r
+  
\ No newline at end of file