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, 9 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 14e42e3..9f3c4fe 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -700,7 +700,7 @@ IScsiFormCallback (
 

       UnicodeSPrint (PortString, (UINTN) 128, L"Port %s", ConfigFormEntry->MacString);

       DeviceFormTitleToken = (STRING_REF) STR_ISCSI_DEVICE_FORM_TITLE;

-      IfrLibSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString);

+      HiiLibSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString);

 

       IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData);

 

@@ -832,13 +832,13 @@ Returns:
       // Compose the Port string and create a new STRING_REF.

       //

       UnicodeSPrint (PortString, 128, L"Port %s", ConfigFormEntry->MacString);

-      IfrLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleToken, PortString);

+      HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleToken, PortString);

 

       //

       // Compose the help string of this port and create a new STRING_REF.

       //

       UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);

-      IfrLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);

+      HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);

 

       NetListInsertTail (&mIScsiConfigFormList, &ConfigFormEntry->Link);

       mNumberOfIScsiDevices++;

@@ -958,7 +958,7 @@ Returns:
   //

   // Publish our HII data

   //

-  PackageList = PreparePackageList (2, &mVendorGuid, IScsiDxeStrings, IScsiConfigDxeBin);

+  PackageList = HiiLibPreparePackageList (2, &mVendorGuid, IScsiDxeStrings, IScsiConfigDxeBin);

   ASSERT (PackageList != NULL);

   

   Status = HiiDatabase->NewPackageList (

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index 7fb98a7..e9311b6 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -22,7 +22,9 @@ Abstract:
 #define _ISCSI_CONFIG_H_

 

 #include <Library/HiiLib.h>

+#include <Library/ExtendedHiiLib.h>

 #include <Library/IfrSupportLib.h>

+#include <Library/ExtendedIfrSupportLib.h>

 #include <Library/DebugLib.h>

 #include <Library/BaseLib.h>

 #include <Library/NetLib.h>

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 95aa242..0dc07d8 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -79,6 +79,8 @@
   PrintLib

   HiiLib

   IfrSupportLib

+  ExtendedHiiLib

+  ExtendedIfrSupportLib

   NetLib

 

 [Protocols]

@@ -93,4 +95,4 @@
   gEfiPciIoProtocolGuid

   gEfiAcpiSupportProtocolGuid

   gEfiDhcp4ProtocolGuid

-  gEfiDhcp4ServiceBindingProtocolGuid
\ No newline at end of file
+  gEfiDhcp4ServiceBindingProtocolGuid