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

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

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