Update UefiHiiLib to support new defined IFR related HII APIs.

Apply new defined IFR related HII APIs in PlatOverMngr, DriverSample, IScsiDxe and Setup drivers.

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

13 files changed, 318 insertions, 258 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 8351a32..9ef7c3b 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "DriverSample.h"

 

-#define DISPLAY_ONLY_MY_ITEM  0x0000

+#define DISPLAY_ONLY_MY_ITEM  0x0002

 

 EFI_GUID   mFormSetGuid = FORMSET_GUID;

 EFI_GUID   mInventoryGuid = INVENTORY_GUID;

@@ -218,10 +218,10 @@ SetPassword (
   )

 {

   EFI_STATUS                      Status;

-  UINTN                           BufferSize;

   CHAR16                          *Password;

   UINTN                           PasswordSize;

   DRIVER_SAMPLE_CONFIGURATION     *Configuration;

+  UINTN                           BufferSize;

 

   //

   // Get Buffer Storage data from EFI variable

@@ -253,11 +253,8 @@ SetPassword (
   //

   // Retrive uncommitted data from Browser

   //

-  BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);

-  Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_PRIVATE_DATA));

-  ASSERT (Configuration != NULL);

-  Status = GetBrowserData (&mFormSetGuid, VariableName, &BufferSize, (UINT8 *) Configuration);

-  if (!EFI_ERROR (Status)) {

+  Configuration = (DRIVER_SAMPLE_CONFIGURATION *) HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION));

+  if (Configuration != NULL) {

     //

     // Update password's clear text in the screen

     //

@@ -266,16 +263,17 @@ SetPassword (
     //

     // Update uncommitted data of Browser

     //

-    BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);

-    Status = SetBrowserData (

-               &mFormSetGuid,

-               VariableName,

-               BufferSize,

-               (UINT8 *) Configuration,

-               NULL

-               );

+    HiiSetBrowserData (

+       &mFormSetGuid,

+       VariableName,

+       sizeof (DRIVER_SAMPLE_CONFIGURATION),

+       (UINT8 *) Configuration,

+       NULL

+       );

+    

+    FreePool (Configuration);

   }

-  FreePool (Configuration);

+

 

   //

   // Set password

@@ -355,31 +353,36 @@ ExtractConfig (
     //

     // Request is set to NULL, return all configurable elements together with ALTCFG

     //

-    Status = ConstructConfigAltResp (

-               NULL,

-               NULL,

-               Results,

-               &mFormSetGuid,

-               VariableName,

-               PrivateData->DriverHandle[0],

-               &PrivateData->Configuration,

-               BufferSize,

-               VfrMyIfrNVDataBlockName,

-               2,

-               STRING_TOKEN (STR_STANDARD_DEFAULT_PROMPT),

-               VfrMyIfrNVDataDefault0000,

-               STRING_TOKEN (STR_MANUFACTURE_DEFAULT_PROMPT),

-               VfrMyIfrNVDataDefault0001

+    *Results = HiiConstructConfigAltResp (

+                 &mFormSetGuid,

+                 VariableName,

+                 PrivateData->DriverHandle[0],

+                 &PrivateData->Configuration,

+                 BufferSize,

+                 VfrMyIfrNVDataBlockName,

+                 STRING_TOKEN (STR_STANDARD_DEFAULT_PROMPT),

+                 VfrMyIfrNVDataDefault0000,

+                 STRING_TOKEN (STR_MANUFACTURE_DEFAULT_PROMPT),

+                 VfrMyIfrNVDataDefault0001,

+                 0,

+                 NULL

                );

+    

+    //

+    // No matched storage is found.

+    //

+    if (*Results == NULL) {

+      return EFI_NOT_FOUND;

+    }

 

-    return Status;

+    return EFI_SUCCESS;

   }

 

   //

   // Check routing data in <ConfigHdr>.

   // Note: if only one Storage is used, then this checking could be skipped.

   //

-  if (!IsConfigHdrMatch (Request, &mFormSetGuid, VariableName)) {

+  if (!HiiIsConfigHdrMatch (Request, &mFormSetGuid, VariableName)) {

     *Progress = Request;

     return EFI_NOT_FOUND;

   }

@@ -440,7 +443,7 @@ RouteConfig (
   // Check routing data in <ConfigHdr>.

   // Note: if only one Storage is used, then this checking could be skipped.

   //

-  if (!IsConfigHdrMatch (Configuration, &mFormSetGuid, VariableName)) {

+  if (!HiiIsConfigHdrMatch (Configuration, &mFormSetGuid, VariableName)) {

     *Progress = Configuration;

     return EFI_NOT_FOUND;

   }

@@ -525,9 +528,12 @@ DriverCallback (
 {

   DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData;

   EFI_STATUS                      Status;

-  EFI_HII_UPDATE_DATA             UpdateData;

-  IFR_OPTION                      *IfrOptionList;

   UINT8                           MyVar;

+  VOID                            *StartOpCodeHandle;

+  VOID                            *OptionsOpCodeHandle;

+  EFI_IFR_GUID_LABEL              *StartLabel;

+  VOID                            *EndOpCodeHandle;

+  EFI_IFR_GUID_LABEL              *EndLabel;

 

   if ((Value == NULL) || (ActionRequest == NULL)) {

     return EFI_INVALID_PARAMETER;

@@ -541,139 +547,179 @@ DriverCallback (
     //

     // Initialize the container for dynamic opcodes

     //

-    IfrLibInitUpdateData (&UpdateData, 0x1000);

-

-    IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));

-    ASSERT (IfrOptionList != NULL);

-

-    IfrOptionList[0].Flags        = 0;

-    IfrOptionList[0].StringToken  = STRING_TOKEN (STR_BOOT_OPTION1);

-    IfrOptionList[0].Value.u8     = 1;

-    IfrOptionList[1].Flags        = EFI_IFR_OPTION_DEFAULT;

-    IfrOptionList[1].StringToken  = STRING_TOKEN (STR_BOOT_OPTION2);

-    IfrOptionList[1].Value.u8     = 2;

-

-      CreateActionOpCode (

-        0x1237,                           // Question ID

-        STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text

-        STRING_TOKEN(STR_EXIT_TEXT),      // Help text

-        EFI_IFR_FLAG_CALLBACK,            // Question flag

-        0,                                // Action String ID

-        &UpdateData                       // Container for dynamic created opcodes

-        );

-    

-      //

-      // Prepare initial value for the dynamic created oneof Question

-      //

-      PrivateData->Configuration.DynamicOneof = 2;

-      Status = gRT->SetVariable(

-                      VariableName,

-                      &mFormSetGuid,

-                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                      sizeof (DRIVER_SAMPLE_CONFIGURATION),

-                      &PrivateData->Configuration

-                      );

-      CreateOneOfOpCode (

-        0x8001,                                    // Question ID (or call it "key")

-        CONFIGURATION_VARSTORE_ID,                 // VarStore ID

-        (UINT16) DYNAMIC_ONE_OF_VAR_OFFSET,        // Offset in Buffer Storage

-        STRING_TOKEN (STR_ONE_OF_PROMPT),          // Question prompt text

-        STRING_TOKEN (STR_ONE_OF_HELP),            // Question help text

-        EFI_IFR_FLAG_CALLBACK,                     // Question flag

-        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question Value

-        IfrOptionList,                             // Option list

-        2,                                         // Number of options in Option list

-        &UpdateData                                // Container for dynamic created opcodes

-        );

-    

-      CreateOrderedListOpCode (

-        0x8002,                                    // Question ID

-        CONFIGURATION_VARSTORE_ID,                 // VarStore ID

-        (UINT16) DYNAMIC_ORDERED_LIST_VAR_OFFSET,  // Offset in Buffer Storage

-        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question prompt text

-        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question help text

-        EFI_IFR_FLAG_RESET_REQUIRED,               // Question flag

-        0,                                         // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET

-        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question value

-        5,                                         // Maximum container

-        IfrOptionList,                             // Option list

-        2,                                         // Number of options in Option list

-        &UpdateData                                // Container for dynamic created opcodes

-        );

-    

-      CreateGotoOpCode (

-        1,                                // Target Form ID

-        STRING_TOKEN (STR_GOTO_FORM1),    // Prompt text

-        STRING_TOKEN (STR_GOTO_HELP),     // Help text

-        0,                                // Question flag

-        0x8003,                           // Question ID

-        &UpdateData                       // Container for dynamic created opcodes

-        );

-    

-      Status = IfrLibUpdateForm (

-                 PrivateData->HiiHandle[0],  // HII handle

-                 &mFormSetGuid,              // Formset GUID

-                 0x1234,                     // Form ID

-                 0x1234,                     // Label for where to insert opcodes

-                 TRUE,                       // Append or replace

-                 &UpdateData                 // Dynamic created opcodes

-                 );

-      FreePool (IfrOptionList);

-      IfrLibFreeUpdateData (&UpdateData);

-      break;

-    

-    case 0x5678:

-      //

-      // We will reach here once the Question is refreshed

-      //

-      IfrLibInitUpdateData (&UpdateData, 0x1000);

-    

-      IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));

-      ASSERT (IfrOptionList != NULL);

-    

-      CreateActionOpCode (

-        0x1237,                           // Question ID

-        STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text

-        STRING_TOKEN(STR_EXIT_TEXT),      // Help text

-        EFI_IFR_FLAG_CALLBACK,            // Question flag

-        0,                                // Action String ID

-        &UpdateData                       // Container for dynamic created opcodes

-        );

-    

-      Status = IfrLibUpdateForm (

-                 PrivateData->HiiHandle[0],  // HII handle

-                 &mFormSetGuid,              // Formset GUID

-                 3,                          // Form ID

-                 0x2234,                     // Label for where to insert opcodes

-                 TRUE,                       // Append or replace

-                 &UpdateData                 // Dynamic created opcodes

-                 );

-      IfrLibFreeUpdateData (&UpdateData);

+    StartOpCodeHandle = HiiAllocateOpCodeHandle ();

+    ASSERT (StartOpCodeHandle != NULL);

+

+    EndOpCodeHandle = HiiAllocateOpCodeHandle ();

+    ASSERT (EndOpCodeHandle != NULL);

+

+    //

+    // Create Hii Extend Label OpCode as the start opcode

+    //

+    StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+    StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

+    StartLabel->Number       = LABEL_UPDATE1;

+

+    //

+    // Create Hii Extend Label OpCode as the end opcode

+    //

+    EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+    EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

+    EndLabel->Number       = LABEL_END;

+

+    HiiCreateActionOpCode (

+      StartOpCodeHandle,                // Container for dynamic created opcodes

+      0x1237,                           // Question ID

+      STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text

+      STRING_TOKEN(STR_EXIT_TEXT),      // Help text

+      EFI_IFR_FLAG_CALLBACK,            // Question flag

+      0                                 // Action String ID

+    );

+

+    //

+    // Create Option OpCode

+    //

+    OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();

+    ASSERT (OptionsOpCodeHandle != NULL);

+

+    HiiCreateOneOfOptionOpCode (

+      OptionsOpCodeHandle,

+      STRING_TOKEN (STR_BOOT_OPTION1),

+      0,

+      EFI_IFR_NUMERIC_SIZE_1,

+      1

+      );

+

+    HiiCreateOneOfOptionOpCode (

+      OptionsOpCodeHandle,

+      STRING_TOKEN (STR_BOOT_OPTION2),

+      0,

+      EFI_IFR_NUMERIC_SIZE_1,

+      2

+      );

+

+    //

+    // Prepare initial value for the dynamic created oneof Question

+    //

+    PrivateData->Configuration.DynamicOneof = 2;

+    Status = gRT->SetVariable(

+                    VariableName,

+                    &mFormSetGuid,

+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                    sizeof (DRIVER_SAMPLE_CONFIGURATION),

+                    &PrivateData->Configuration

+                    );

+

+    HiiCreateOneOfOpCode (

+      StartOpCodeHandle,                         // Container for dynamic created opcodes

+      0x8001,                                    // Question ID (or call it "key")

+      CONFIGURATION_VARSTORE_ID,                 // VarStore ID

+      (UINT16) DYNAMIC_ONE_OF_VAR_OFFSET,        // Offset in Buffer Storage

+      STRING_TOKEN (STR_ONE_OF_PROMPT),          // Question prompt text

+      STRING_TOKEN (STR_ONE_OF_HELP),            // Question help text

+      EFI_IFR_FLAG_CALLBACK,                     // Question flag

+      EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question Value

+      OptionsOpCodeHandle,                       // Option Opcode list

+      NULL                                       // Default Opcode is NULl

+      );

+

+    HiiCreateOrderedListOpCode (

+      StartOpCodeHandle,                         // Container for dynamic created opcodes

+      0x8002,                                    // Question ID

+      CONFIGURATION_VARSTORE_ID,                 // VarStore ID

+      (UINT16) DYNAMIC_ORDERED_LIST_VAR_OFFSET,  // Offset in Buffer Storage

+      STRING_TOKEN (STR_BOOT_OPTIONS),           // Question prompt text

+      STRING_TOKEN (STR_BOOT_OPTIONS),           // Question help text

+      EFI_IFR_FLAG_RESET_REQUIRED,               // Question flag

+      0,                                         // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET

+      EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question value

+      5,                                         // Maximum container

+      OptionsOpCodeHandle,                       // Option Opcode list

+      NULL                                       // Default Opcode is NULl

+      );

+

+    HiiCreateGotoOpCode (

+      StartOpCodeHandle,                // Container for dynamic created opcodes

+      1,                                // Target Form ID

+      STRING_TOKEN (STR_GOTO_FORM1),    // Prompt text

+      STRING_TOKEN (STR_GOTO_HELP),     // Help text

+      0,                                // Question flag

+      0x8003                            // Question ID

+      );

+

+    HiiUpdateForm (

+      PrivateData->HiiHandle[0],  // HII handle

+      &mFormSetGuid,              // Formset GUID

+      0x1234,                     // Form ID

+      StartOpCodeHandle,          // Label for where to insert opcodes

+      EndOpCodeHandle             // Replace data

+      );

+

+    HiiFreeOpCodeHandle (StartOpCodeHandle);

+    HiiFreeOpCodeHandle (OptionsOpCodeHandle);

+    break;

     

-      //

-      // Refresh the Question value

-      //

-      PrivateData->Configuration.DynamicRefresh++;

-      Status = gRT->SetVariable(

-                      VariableName,

-                      &mFormSetGuid,

-                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                      sizeof (DRIVER_SAMPLE_CONFIGURATION),

-                      &PrivateData->Configuration

-                      );

+  case 0x5678:

+    //

+    // We will reach here once the Question is refreshed

+    //

+

+    //

+    // Initialize the container for dynamic opcodes

+    //

+    StartOpCodeHandle = HiiAllocateOpCodeHandle ();

+    ASSERT (StartOpCodeHandle != NULL);

+

+    //

+    // Create Hii Extend Label OpCode as the start opcode

+    //

+    StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+    StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

+    StartLabel->Number       = LABEL_UPDATE2;

+

+    HiiCreateActionOpCode (

+      StartOpCodeHandle,                // Container for dynamic created opcodes

+      0x1237,                           // Question ID

+      STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text

+      STRING_TOKEN(STR_EXIT_TEXT),      // Help text

+      EFI_IFR_FLAG_CALLBACK,            // Question flag

+      0                                 // Action String ID

+    );

     

-      //

-      // Change an EFI Variable storage (MyEfiVar) asynchronous, this will cause

-      // the first statement in Form 3 be suppressed

-      //

-      MyVar = 111;

-      Status = gRT->SetVariable(

-                      L"MyVar",

-                      &mFormSetGuid,

-                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                      1,

-                      &MyVar

-                      );

+    HiiUpdateForm (

+      PrivateData->HiiHandle[0],  // HII handle

+      &mFormSetGuid,              // Formset GUID

+      0x3,                        // Form ID

+      StartOpCodeHandle,          // Label for where to insert opcodes

+      NULL                        // Insert data

+      );

+

+    HiiFreeOpCodeHandle (StartOpCodeHandle); 

+  

+    //

+    // Refresh the Question value

+    //

+    PrivateData->Configuration.DynamicRefresh++;

+    Status = gRT->SetVariable(

+                    VariableName,

+                    &mFormSetGuid,

+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                    sizeof (DRIVER_SAMPLE_CONFIGURATION),

+                    &PrivateData->Configuration

+                    );

+  

+    //

+    // Change an EFI Variable storage (MyEfiVar) asynchronous, this will cause

+    // the first statement in Form 3 be suppressed

+    //

+    MyVar = 111;

+    Status = gRT->SetVariable(

+                    L"MyVar",

+                    &mFormSetGuid,

+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                    1,

+                    &MyVar

+                    );

     break;

 

   case 0x1237:

@@ -934,32 +980,43 @@ DriverSampleInit (
              );

     }

   }

+  

+  SavedStatus = EFI_SUCCESS;

 

   //

-  // Example of how to display only the item we sent to HII

+  // Default this driver is built into Flash device image, 

+  // the following code doesn't run.

   //

+

   //

-  // Have the browser pull out our copy of the data, and only display our data

+  // Example of how to display only the item we sent to HII

+  // When this driver is not built into Flash device image, 

+  // it need to call SendForm to show front page by itself.

   //

-  Status = FormBrowser2->SendForm (

-                           FormBrowser2,

-                           &(HiiHandle[DISPLAY_ONLY_MY_ITEM]),

-                           1,

-                           NULL,

-                           0,

-                           NULL,

-                           NULL

-                           );

-  SavedStatus = Status;

-

-  Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);

-  if (EFI_ERROR (Status)) {

-    return Status;

+  if (DISPLAY_ONLY_MY_ITEM <= 1) {

+    //

+    // Have the browser pull out our copy of the data, and only display our data

+    //

+    Status = FormBrowser2->SendForm (

+                             FormBrowser2,

+                             &(HiiHandle[DISPLAY_ONLY_MY_ITEM]),

+                             1,

+                             NULL,

+                             0,

+                             NULL,

+                             NULL

+                             );

+    SavedStatus = Status;

+  

+    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);

+    if (EFI_ERROR (Status)) {

+      return Status;

+    }

+  

+    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);

+    if (EFI_ERROR (Status)) {

+      return Status;

+    }

   }

 

   return SavedStatus;

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index cdecddb..3317e4f 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -39,8 +39,6 @@ Revision History
 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/IfrSupportLib.h>

-#include <Library/ExtendedIfrSupportLib.h>

 #include <Library/HiiLib.h>

 #include <Library/DevicePathLib.h>

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index 9e5ff99..3ed56e9 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -53,8 +53,9 @@
   BaseMemoryLib

   DebugLib

   HiiLib

-  IfrSupportLib

-  ExtendedIfrSupportLib

+

+[Guids]

+  gEfiIfrTianoGuid                              ## CONSUMES ## Guid

 

 [Protocols]

   gEfiHiiStringProtocolGuid                     ## CONSUMES

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 4fbd6a5..162c5ec 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -71,6 +71,12 @@ typedef struct {
   UINT8         OrderedList[3];

 } MY_DATA2;

 

+//

+// Labels definition

+//

+#define LABEL_UPDATE1               0x1234

+#define LABEL_UPDATE2               0x2234

+#define LABEL_END                   0x2223

 

 #pragma pack()

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 01c7634..fc6b5da 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -49,7 +49,6 @@
 #define LABEL_1_VALUE               0x01

 #define LABEL_2_VALUE               0x1000

 #define LABEL_UPDATE_BBS            0x2222

-#define LABEL_END                   0x2223

 

 formset

   guid     = FORMSET_GUID,

@@ -519,7 +518,7 @@ formset
             refresh interval = 3             // Refresh interval in seconds

     endnumeric;

 

-    label 0x2234;

+    label LABEL_UPDATE2;

     label LABEL_END;

 

   endform;

@@ -531,7 +530,7 @@ formset
   form formid = 0x1234,            // Dynamically created page,

        title = STRING_TOKEN(STR_DYNAMIC_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code

 

-    label 0x1234;

+    label LABEL_UPDATE1;

     //

     // This is where we will insert dynamic created opcodes

     //

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 34942f7..76068e5 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiImpl.h"

 

 EFI_GUID        mVendorGuid              = ISCSI_CONFIG_GUID;

+CHAR16          mVendorStorageName[]     = L"ISCSI_CONFIG_IFR_NVDATA";

 BOOLEAN         mIScsiDeviceListUpdated  = FALSE;

 UINTN           mNumberOfIScsiDevices    = 0;

 ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo = NULL;

@@ -504,14 +505,12 @@ IScsiFormCallback (
   //

   // Retrive uncommitted data from Browser

   //

-  BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);

-  IfrNvData = AllocateZeroPool (BufferSize);

-  ASSERT (IfrNvData != NULL);

-  Status = GetBrowserData (NULL, NULL, &BufferSize, (UINT8 *) IfrNvData);

-  if (EFI_ERROR (Status)) {

-    gBS->FreePool (IfrNvData);

-    return Status;

+  IfrNvData = (ISCSI_CONFIG_IFR_NVDATA *) HiiGetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA));

+  if (IfrNvData == NULL) {

+    return EFI_NOT_FOUND;

   }

+  

+  Status = EFI_SUCCESS;

 

   switch (QuestionId) {

   case KEY_INITIATOR_NAME:

@@ -730,11 +729,10 @@ IScsiFormCallback (
     //

     // Pass changed uncommitted data back to Form Browser

     //

-    BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);

-    Status = SetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);

+    HiiSetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);

   }

 

-  gBS->FreePool (IfrNvData);

+  FreePool (IfrNvData);

   return Status;

 }

 

@@ -761,12 +759,14 @@ IScsiConfigUpdateForm (
   ISCSI_CONFIG_FORM_ENTRY     *ConfigFormEntry;

   BOOLEAN                     EntryExisted;

   EFI_STATUS                  Status;

-  EFI_HII_UPDATE_DATA         UpdateData;

   EFI_SIMPLE_NETWORK_PROTOCOL *Snp;

   CHAR16                      PortString[128];

   UINT16                      FormIndex;

   UINTN                       BufferSize;

-

+  VOID                        *StartOpCodeHandle;

+  VOID                        *EndOpCodeHandle;

+  EFI_IFR_GUID_LABEL          *StartLabel;

+  EFI_IFR_GUID_LABEL          *EndLabel;

 

   ConfigFormEntry = NULL;

   EntryExisted    = FALSE;

@@ -861,36 +861,56 @@ IScsiConfigUpdateForm (
   //

   // Allocate space for creation of Buffer

   //

-  UpdateData.BufferSize = 0x1000;

-  UpdateData.Data = AllocateZeroPool (0x1000);

-  UpdateData.Offset = 0;

+

+  //

+  // Init OpCode Handle

+  //

+  StartOpCodeHandle = HiiAllocateOpCodeHandle ();

+  ASSERT (StartOpCodeHandle != NULL);

+

+  EndOpCodeHandle = HiiAllocateOpCodeHandle ();

+  ASSERT (EndOpCodeHandle != NULL);

+

+  //

+  // Create Hii Extend Label OpCode as the start opcode

+  //

+  StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+  StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

+  StartLabel->Number       = DEVICE_ENTRY_LABEL;

+

+  //

+  // Create Hii Extend Label OpCode as the end opcode

+  //

+  EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+  EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

+  EndLabel->Number       = LABEL_END;

 

   FormIndex = 0;

   NET_LIST_FOR_EACH (Entry, &mIScsiConfigFormList) {

     ConfigFormEntry = NET_LIST_USER_STRUCT (Entry, ISCSI_CONFIG_FORM_ENTRY, Link);

 

-    CreateGotoOpCode (

-      FORMID_DEVICE_FORM,

-      ConfigFormEntry->PortTitleToken,

-      ConfigFormEntry->PortTitleHelpToken,

-      EFI_IFR_FLAG_CALLBACK,

-      (UINT16)(KEY_DEVICE_ENTRY_BASE + FormIndex),

-      &UpdateData

+    HiiCreateGotoOpCode (

+      StartOpCodeHandle,                            // Container for dynamic created opcodes

+      FORMID_DEVICE_FORM,                           // Target Form ID

+      ConfigFormEntry->PortTitleToken,              // Prompt text

+      ConfigFormEntry->PortTitleHelpToken,          // Help text

+      EFI_IFR_FLAG_CALLBACK,                        // Question flag

+      (UINT16)(KEY_DEVICE_ENTRY_BASE + FormIndex)   // Question ID

       );

 

     FormIndex++;

   }

 

-  IfrLibUpdateForm (

+  HiiUpdateForm (

     mCallbackInfo->RegisteredHandle,

     &mVendorGuid,

     FORMID_MAIN_FORM,

-    DEVICE_ENTRY_LABEL,

-    FALSE,

-    &UpdateData

+    StartOpCodeHandle, // Label DEVICE_ENTRY_LABEL

+    EndOpCodeHandle    // LABEL_END

     );

 

-  gBS->FreePool (UpdateData.Data);

+  HiiFreeOpCodeHandle (StartOpCodeHandle);

+  HiiFreeOpCodeHandle (EndOpCodeHandle);

 

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index fd6a2c4..b0a748a 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -15,11 +15,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_CONFIG_H_

 #define _ISCSI_CONFIG_H_

 

+#include <Guid/MdeModuleHii.h>

 #include <Protocol/HiiConfigRouting.h>

 #include <Library/HiiLib.h>

 #include <Library/DevicePathLib.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/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 10f1c4e..666fa04 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiConfigNVDataStruc.h"

 #define EFI_NETWORK_DEVICE_CLASS  0x04

 

-#define LABEL_END                 0xffff

-

 formset 

   guid     = ISCSI_CONFIG_GUID,

   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index eb9e7dc..7b77a19 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -47,6 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TARGET_PORT_MAX_NUM       65535

 

 #define DEVICE_ENTRY_LABEL        0x1234

+#define LABEL_END                 0xffff

 

 #define KEY_INITIATOR_NAME        0x101

 #define KEY_DHCP_ENABLE           0x102

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 2950991..3587c30 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -78,8 +78,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   DebugLib

   PrintLib

   HiiLib

-  IfrSupportLib

-  ExtendedIfrSupportLib

   NetLib

 

 [Protocols]

@@ -97,3 +95,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 [Guids]

   gEfiEventExitBootServicesGuid

+  gEfiIfrTianoGuid                              ## CONSUMES ## Guid

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 90ab529..e612d4f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -323,40 +323,25 @@ InitializeConfigHdr (
   IN OUT FORMSET_STORAGE   *Storage

   )

 {

-  EFI_STATUS  Status;

-  UINTN       StrBufferLen;

   CHAR16      *Name;

-

+  

   if (Storage->Type == EFI_HII_VARSTORE_BUFFER) {

     Name = Storage->Name;

   } else {

     Name = NULL;

   }

-

-  StrBufferLen = 0;

-  Status = ConstructConfigHdr (

-             Storage->ConfigHdr,

-             &StrBufferLen,

-             &Storage->Guid,

-             Name,

-             FormSet->DriverHandle

-             );

-  if (Status == EFI_BUFFER_TOO_SMALL) {

-    Storage->ConfigHdr = AllocateZeroPool (StrBufferLen);

-    Status = ConstructConfigHdr (

-               Storage->ConfigHdr,

-               &StrBufferLen,

-               &Storage->Guid,

-               Name,

-               FormSet->DriverHandle

-               );

-  }

-

-  if (EFI_ERROR (Status)) {

-    return Status;

+  

+  Storage->ConfigHdr = HiiConstructConfigHdr (

+                         &Storage->Guid,

+                         Name,

+                         FormSet->DriverHandle

+                         );

+  

+  if (Storage->ConfigHdr == NULL) {

+    return EFI_NOT_FOUND;

   }

 

-  Storage->ConfigRequest = AllocateCopyPool (StrBufferLen, Storage->ConfigHdr);

+  Storage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigHdr), Storage->ConfigHdr);

   Storage->SpareStrLen = 0;

 

   return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 699b2c4..b19d1ba 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -39,7 +39,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/BaseLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/IfrSupportLib.h>

 #include <Library/HiiLib.h>

 #include <Library/PcdLib.h>

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index d531d7b..bd4ba10 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -49,7 +49,6 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

 

-

 [LibraryClasses]

   MemoryAllocationLib

   BaseLib

@@ -59,9 +58,8 @@
   BaseMemoryLib

   DebugLib

   PrintLib

-  IfrSupportLib

   HiiLib

-

+  

 [Guids]

   gEfiIfrTianoGuid                              ## CONSUMES  ## GUID

   gEfiIfrFrameworkGuid                          ## CONSUMES  ## GUID