1) Cleanup HiiLib, IfrSupportLib.

2) Add ExtendedHiiLib and ExtendedIfrSupportLib which implement APIs that require the OPcode and Device Path which is specific to Intel's implementation.

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

3 files changed, 12 insertions, 8 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index f18e31163f..4cdbe5fb88 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -111,7 +111,7 @@ ValidatePassword (
   Password = AllocateZeroPool (BufferSize);

   ASSERT (Password != NULL);

 

-  Status = IfrLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);

+  Status = HiiLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);

   if (EFI_ERROR (Status)) {

     gBS->FreePool (Password);

     return Status;

@@ -169,7 +169,7 @@ SetPassword (
   //

   Password = &PrivateData->Configuration.WhatIsThePassword2[0];

   ZeroMem (Password, 20 * sizeof (CHAR16));

-  Status = IfrLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);

+  Status = HiiLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -646,7 +646,7 @@ DriverSampleInit (
   //

   // Publish our HII data

   //

-  PackageList = PreparePackageList (

+  PackageList = HiiLibPreparePackageList (

                   2,

                   &mFormSetGuid,

                   DriverSampleStrings,

@@ -677,7 +677,7 @@ DriverSampleInit (
   }

   PrivateData->DriverHandle[1] = DriverHandle[1];

 

-  PackageList = PreparePackageList (

+  PackageList = HiiLibPreparePackageList (

                   2,

                   &mInventoryGuid,

                   DriverSampleStrings,

@@ -705,7 +705,7 @@ DriverSampleInit (
   //

   NewString = L"700 Mhz";

 

-  Status = IfrLibSetString (HiiHandle[0], STRING_TOKEN (STR_CPU_STRING2), NewString);

+  Status = HiiLibSetString (HiiHandle[0], STRING_TOKEN (STR_CPU_STRING2), NewString);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -732,7 +732,7 @@ DriverSampleInit (
     // based on default values stored in IFR

     //

     BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);

-    Status = ExtractDefault (Configuration, &BufferSize, 1, VfrMyIfrNVDataDefault0000);

+    Status = IfrLibExtractDefault (Configuration, &BufferSize, 1, VfrMyIfrNVDataDefault0000);

 

     if (!EFI_ERROR (Status)) {

       gRT->SetVariable(

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 9f19258a22..60fa280fee 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -39,7 +39,9 @@ Revision History
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/IfrSupportLib.h>
+#include <Library/ExtendedIfrSupportLib.h>
 #include <Library/HiiLib.h>
+#include <Library/ExtendedHiiLib.h>
 
 #include <MdeModuleHii.h>
 
@@ -53,7 +55,7 @@ extern UINT8 VfrMyIfrNVDataDefault0000[];
 
 //
 // This is the generated IFR binary data for each formset defined in VFR.
-// This data array is ready to be used as input of PreparePackageList() to
+// This data array is ready to be used as input of HiiLibPreparePackageList() to
 // create a packagelist (which contains Form packages, String packages, etc).
 //
 extern UINT8  VfrBin[];
@@ -61,7 +63,7 @@ extern UINT8  InventoryBin[];
 
 //
 // This is the generated String package data for all .UNI files.
-// This data array is ready to be used as input of PreparePackageList() to
+// This data array is ready to be used as input of HiiLibPreparePackageList() to
 // create a packagelist (which contains Form packages, String packages, etc).
 //
 extern UINT8  DriverSampleStrings[];
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index 42a331779e..c36eb066e0 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -56,6 +56,8 @@
   DebugLib

   HiiLib

   IfrSupportLib

+  ExtendedHiiLib

+  ExtendedIfrSupportLib

   BaseLib