HII Library Class interface refine.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Setup.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index e617f2f367b12c39cc3ca2132b7b2a2ad7bb2de3..f5963ce2fe23f39b9b3019a9597314eb6240d2d9 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -525,7 +525,6 @@ InitializeSetup (
   )\r
 {\r
   EFI_STATUS                  Status;\r
-  EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
 \r
   //\r
   // Locate required Hii relative protocols\r
@@ -554,15 +553,13 @@ InitializeSetup (
   //\r
   // Publish our HII data\r
   //\r
-  PackageList = HiiLibPreparePackageList (1, &gSetupBrowserGuid, SetupBrowserStrings);\r
-  ASSERT (PackageList != NULL);\r
-  Status = mHiiDatabase->NewPackageList (\r
-                           mHiiDatabase,\r
-                           PackageList,\r
-                           ImageHandle,\r
-                           &gHiiHandle\r
-                           );\r
-  ASSERT_EFI_ERROR (Status);\r
+  gHiiHandle = HiiAddPackages (\r
+                 &gSetupBrowserGuid,\r
+                 ImageHandle,\r
+                 SetupBrowserStrings,\r
+                 NULL\r
+                 );\r
+  ASSERT (gHiiHandle != NULL);\r
 \r
   //\r
   // Initialize Driver private data\r
@@ -603,11 +600,9 @@ NewString (
   )\r
 {\r
   EFI_STRING_ID  StringId;\r
-  EFI_STATUS     Status;\r
 \r
-  StringId = 0;\r
-  Status = HiiLibNewString (HiiHandle, &StringId, String);\r
-  ASSERT_EFI_ERROR (Status);\r
+  StringId = HiiSetString (HiiHandle, 0, String, NULL);\r
+  ASSERT (StringId != 0);\r
 \r
   return StringId;\r
 }\r
@@ -631,7 +626,8 @@ DeleteString (
   CHAR16  NullChar;\r
 \r
   NullChar = CHAR_NULL;\r
-  return HiiLibSetString (HiiHandle, StringId, &NullChar);\r
+  HiiSetString (HiiHandle, StringId, &NullChar, NULL);\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 \r
@@ -651,29 +647,11 @@ GetToken (
   IN  EFI_HII_HANDLE               HiiHandle\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  CHAR16      *String;\r
-  UINTN       BufferLength;\r
+  EFI_STRING  String;\r
 \r
-  //\r
-  // Set default string size assumption at no more than 256 bytes\r
-  //\r
-  BufferLength = 0x100;\r
-  String = AllocateZeroPool (BufferLength);\r
+  String = HiiGetString (HiiHandle, Token, NULL);\r
   ASSERT (String != NULL);\r
-\r
-  Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
-\r
-  if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    FreePool (String);\r
-    String = AllocateZeroPool (BufferLength);\r
-    ASSERT (String != NULL);\r
-\r
-    Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
-  }\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  return String;\r
+  return (CHAR16 *) String;\r
 }\r
 \r
 \r
@@ -1179,7 +1157,7 @@ GetQuestionValue (
             if ((Index & 1) == 0) {\r
               Dst [Index/2] = DigitUint8;\r
             } else {\r
-              Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);\r
+              Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);\r
             }\r
           }\r
         }\r
@@ -1288,7 +1266,7 @@ GetQuestionValue (
           if ((Index & 1) == 0) {\r
             Dst [Index/2] = DigitUint8;\r
           } else {\r
-            Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);\r
+            Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);\r
           }\r
         }\r
       }\r