MdeModulePkg/BMMUI: Update TerminalMenu and ConsoleMenu in callback

In current codes, When user does some change related to Console or Terminal,
when saving data, it will update the content in TerminalMenu and ConsoleMenu
in BootMaintRouteConfig function. This patch moves the update action to the
BootMaintCallback function with EFI_BROWSER_ACTION_CHANGED type.
The reason for this change is: in BootMaintRouteConfig function when
Var_UpdateConsoleXXXOption() return failure and user discard the previous
change, we should re_update the content in the TerminalMenu and ConsoleMenu.
So we move the update action to the changed callback.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>

2 files changed, 126 insertions, 67 deletions

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index a1905963af..92c44ea867 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -444,6 +444,108 @@ BmmExtractDevicePathFromHiiHandle (
 }

 

 /**

+  Update the terminal content in TerminalMenu.

+

+  @param BmmData           The BMM fake NV data.

+

+**/

+VOID

+UpdateTerminalContent (

+  IN BMM_FAKE_NV_DATA       *BmmData

+  )

+{

+  UINT16                          Index;

+  BM_TERMINAL_CONTEXT             *NewTerminalContext;

+  BM_MENU_ENTRY                   *NewMenuEntry;

+

+  for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

+    NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);

+    ASSERT (NewMenuEntry != NULL);

+    NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

+    NewTerminalContext->BaudRateIndex = BmmData->COMBaudRate[Index];

+    ASSERT (BmmData->COMBaudRate[Index] < (sizeof (BaudRateList) / sizeof (BaudRateList[0])));

+    NewTerminalContext->BaudRate      = BaudRateList[BmmData->COMBaudRate[Index]].Value;

+    NewTerminalContext->DataBitsIndex = BmmData->COMDataRate[Index];

+    ASSERT (BmmData->COMDataRate[Index] < (sizeof (DataBitsList) / sizeof (DataBitsList[0])));

+    NewTerminalContext->DataBits      = (UINT8) DataBitsList[BmmData->COMDataRate[Index]].Value;

+    NewTerminalContext->StopBitsIndex = BmmData->COMStopBits[Index];

+    ASSERT (BmmData->COMStopBits[Index] < (sizeof (StopBitsList) / sizeof (StopBitsList[0])));

+    NewTerminalContext->StopBits      = (UINT8) StopBitsList[BmmData->COMStopBits[Index]].Value;

+    NewTerminalContext->ParityIndex   = BmmData->COMParity[Index];

+    ASSERT (BmmData->COMParity[Index] < (sizeof (ParityList) / sizeof (ParityList[0])));

+    NewTerminalContext->Parity        = (UINT8) ParityList[BmmData->COMParity[Index]].Value;

+    NewTerminalContext->TerminalType  = BmmData->COMTerminalType[Index];

+    NewTerminalContext->FlowControl   = BmmData->COMFlowControl[Index];

+    ChangeTerminalDevicePath (

+      NewTerminalContext->DevicePath,

+      FALSE

+      );

+  }

+}

+

+/**

+  Update the console content in ConsoleMenu.

+

+  @param BmmData           The BMM fake NV data.

+

+**/

+VOID

+UpdateConsoleContent(

+  IN CHAR16                 *ConsoleName,

+  IN BMM_FAKE_NV_DATA       *BmmData

+  )

+{

+  UINT16                          Index;

+  BM_CONSOLE_CONTEXT              *NewConsoleContext;

+  BM_TERMINAL_CONTEXT             *NewTerminalContext;

+  BM_MENU_ENTRY                   *NewMenuEntry;

+

+  if (StrCmp (ConsoleName, L"ConIn") == 0) {

+    for (Index = 0; Index < ConsoleInpMenu.MenuNumber; Index++){

+      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleInpMenu, Index);

+      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

+      ASSERT (Index < MAX_MENU_NUMBER);

+      NewConsoleContext->IsActive = BmmData->ConsoleInCheck[Index];

+    }

+    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

+      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

+      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

+      ASSERT (Index + ConsoleInpMenu.MenuNumber < MAX_MENU_NUMBER);

+      NewTerminalContext->IsConIn = BmmData->ConsoleInCheck[Index + ConsoleInpMenu.MenuNumber];

+    }

+  }

+

+  if (StrCmp (ConsoleName, L"ConOut") == 0) {

+    for (Index = 0; Index < ConsoleOutMenu.MenuNumber; Index++){

+      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleOutMenu, Index);

+      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

+      ASSERT (Index < MAX_MENU_NUMBER);

+      NewConsoleContext->IsActive = BmmData->ConsoleOutCheck[Index];

+    }

+    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

+      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

+      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

+      ASSERT (Index + ConsoleOutMenu.MenuNumber < MAX_MENU_NUMBER);

+      NewTerminalContext->IsConOut = BmmData->ConsoleOutCheck[Index + ConsoleOutMenu.MenuNumber];

+    }

+  }

+  if (StrCmp (ConsoleName, L"ErrOut") == 0) {

+    for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++){

+      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleErrMenu, Index);

+      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

+      ASSERT (Index < MAX_MENU_NUMBER);

+      NewConsoleContext->IsActive = BmmData->ConsoleErrCheck[Index];

+    }

+    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

+      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

+      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

+      ASSERT (Index + ConsoleErrMenu.MenuNumber < MAX_MENU_NUMBER);

+      NewTerminalContext->IsStdErr = BmmData->ConsoleErrCheck[Index + ConsoleErrMenu.MenuNumber];

+    }

+  }

+}

+

+/**

   This function allows a caller to extract the current configuration for one

   or more named elements from the target driver.

 

@@ -589,8 +691,6 @@ BootMaintRouteConfig (
   EFI_HII_CONFIG_ROUTING_PROTOCOL *ConfigRouting;

   BMM_FAKE_NV_DATA                *NewBmmData;

   BMM_FAKE_NV_DATA                *OldBmmData;

-  BM_CONSOLE_CONTEXT              *NewConsoleContext;

-  BM_TERMINAL_CONTEXT             *NewTerminalContext;

   BM_MENU_ENTRY                   *NewMenuEntry;

   BM_LOAD_CONTEXT                 *NewLoadContext;

   UINT16                          Index;

@@ -735,27 +835,6 @@ BootMaintRouteConfig (
       continue;

     }

 

-    NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);

-    ASSERT (NewMenuEntry != NULL);

-    NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

-    NewTerminalContext->BaudRateIndex = NewBmmData->COMBaudRate[Index];

-    ASSERT (NewBmmData->COMBaudRate[Index] < (sizeof (BaudRateList) / sizeof (BaudRateList[0])));

-    NewTerminalContext->BaudRate      = BaudRateList[NewBmmData->COMBaudRate[Index]].Value;

-    NewTerminalContext->DataBitsIndex = NewBmmData->COMDataRate[Index];

-    ASSERT (NewBmmData->COMDataRate[Index] < (sizeof (DataBitsList) / sizeof (DataBitsList[0])));

-    NewTerminalContext->DataBits      = (UINT8) DataBitsList[NewBmmData->COMDataRate[Index]].Value;

-    NewTerminalContext->StopBitsIndex = NewBmmData->COMStopBits[Index];

-    ASSERT (NewBmmData->COMStopBits[Index] < (sizeof (StopBitsList) / sizeof (StopBitsList[0])));

-    NewTerminalContext->StopBits      = (UINT8) StopBitsList[NewBmmData->COMStopBits[Index]].Value;

-    NewTerminalContext->ParityIndex   = NewBmmData->COMParity[Index];

-    ASSERT (NewBmmData->COMParity[Index] < (sizeof (ParityList) / sizeof (ParityList[0])));

-    NewTerminalContext->Parity        = (UINT8) ParityList[NewBmmData->COMParity[Index]].Value;

-    NewTerminalContext->TerminalType  = NewBmmData->COMTerminalType[Index];

-    NewTerminalContext->FlowControl   = NewBmmData->COMFlowControl[Index];

-    ChangeTerminalDevicePath (

-      NewTerminalContext->DevicePath,

-      FALSE

-      );

     TerminalAttChange = TRUE;

   }

   if (TerminalAttChange) {

@@ -767,50 +846,14 @@ BootMaintRouteConfig (
   // Check data which located in Console Options Menu and save the settings if need

   //

   if (CompareMem (NewBmmData->ConsoleInCheck, OldBmmData->ConsoleInCheck, sizeof (NewBmmData->ConsoleInCheck)) != 0){

-    for (Index = 0; Index < ConsoleInpMenu.MenuNumber; Index++){

-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleInpMenu, Index);

-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

-      ASSERT (Index < MAX_MENU_NUMBER);

-      NewConsoleContext->IsActive = NewBmmData->ConsoleInCheck[Index];

-    }

-    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

-      ASSERT (Index + ConsoleInpMenu.MenuNumber < MAX_MENU_NUMBER);

-      NewTerminalContext->IsConIn = NewBmmData->ConsoleInCheck[Index + ConsoleInpMenu.MenuNumber];

-    }

     Var_UpdateConsoleInpOption();

   }

 

   if (CompareMem (NewBmmData->ConsoleOutCheck, OldBmmData->ConsoleOutCheck, sizeof (NewBmmData->ConsoleOutCheck)) != 0){

-    for (Index = 0; Index < ConsoleOutMenu.MenuNumber; Index++){

-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleOutMenu, Index);

-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

-      ASSERT (Index < MAX_MENU_NUMBER);

-      NewConsoleContext->IsActive = NewBmmData->ConsoleOutCheck[Index];

-    }

-    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

-      ASSERT (Index + ConsoleOutMenu.MenuNumber < MAX_MENU_NUMBER);

-      NewTerminalContext->IsConOut = NewBmmData->ConsoleOutCheck[Index + ConsoleOutMenu.MenuNumber];

-    }

     Var_UpdateConsoleOutOption();

   }

 

   if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0){

-    for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++){

-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleErrMenu, Index);

-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;

-      ASSERT (Index < MAX_MENU_NUMBER);

-      NewConsoleContext->IsActive = NewBmmData->ConsoleErrCheck[Index];

-    }

-    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);

-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

-      ASSERT (Index + ConsoleErrMenu.MenuNumber < MAX_MENU_NUMBER);

-      NewTerminalContext->IsStdErr = NewBmmData->ConsoleErrCheck[Index + ConsoleErrMenu.MenuNumber];

-    }

     Var_UpdateErrorOutOption();

   }

 

@@ -1076,6 +1119,22 @@ BootMaintCallback (
         break;

       }

     }

+    //

+    // Update the content in Terminal menu and Console menu here.

+    //

+    if (QuestionId == COM_BAUD_RATE_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_DATA_RATE_QUESTION_ID + Private->CurrentTerminal ||

+      QuestionId == COM_PARITY_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_STOP_BITS_QUESTION_ID + Private->CurrentTerminal ||

+      QuestionId == COM_TERMINAL_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_FLOWCONTROL_QUESTION_ID + Private->CurrentTerminal

+    ) {

+      UpdateTerminalContent(CurrentFakeNVMap);

+    }

+    if ((QuestionId >= CON_IN_DEVICE_QUESTION_ID) && (QuestionId < CON_IN_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {

+      UpdateConsoleContent (L"ConIn",CurrentFakeNVMap);

+    } else if ((QuestionId >= CON_OUT_DEVICE_QUESTION_ID) && (QuestionId < CON_OUT_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {

+      UpdateConsoleContent (L"ConOut", CurrentFakeNVMap);

+    } else if ((QuestionId >= CON_ERR_DEVICE_QUESTION_ID) && (QuestionId < CON_ERR_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {

+      UpdateConsoleContent (L"ConErr", CurrentFakeNVMap);

+    }

   }

 

   //

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
index 9e79826a6a..ee8ff5da3a 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
@@ -519,7 +519,7 @@ UpdateConsolePage (
       (UINT16) (VariableOffsetBase + Index),

       NewMenuEntry->DisplayStringToken,

       NewMenuEntry->HelpStringToken,

-      0,

+      EFI_IFR_FLAG_CALLBACK,

       CheckFlags,

       NULL

       );

@@ -548,7 +548,7 @@ UpdateConsolePage (
       (UINT16) (VariableOffsetBase + Index),

       NewMenuEntry->DisplayStringToken,

       NewMenuEntry->HelpStringToken,

-      0,

+      EFI_IFR_FLAG_CALLBACK,

       CheckFlags,

       NULL

       );

@@ -831,7 +831,7 @@ UpdateTerminalPage (
     (UINT16) (COM_BAUD_RATE_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_BAUD_RATE),

     STRING_TOKEN (STR_COM_BAUD_RATE),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL

@@ -864,7 +864,7 @@ UpdateTerminalPage (
     (UINT16) (COM_DATA_RATE_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_DATA_BITS),

     STRING_TOKEN (STR_COM_DATA_BITS),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL

@@ -896,7 +896,7 @@ UpdateTerminalPage (
     (UINT16) (COM_PARITY_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_PARITY),

     STRING_TOKEN (STR_COM_PARITY),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL

@@ -928,7 +928,7 @@ UpdateTerminalPage (
     (UINT16) (COM_STOP_BITS_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_STOP_BITS),

     STRING_TOKEN (STR_COM_STOP_BITS),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL

@@ -960,7 +960,7 @@ UpdateTerminalPage (
     (UINT16) (COM_TERMINAL_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_TERMI_TYPE),

     STRING_TOKEN (STR_COM_TERMI_TYPE),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL

@@ -991,7 +991,7 @@ UpdateTerminalPage (
     (UINT16) (COM_FLOWCONTROL_VAR_OFFSET + CurrentTerminal),

     STRING_TOKEN (STR_COM_FLOW_CONTROL),

     STRING_TOKEN (STR_COM_FLOW_CONTROL),

-    0,

+    EFI_IFR_FLAG_CALLBACK,

     EFI_IFR_NUMERIC_SIZE_1,

     OptionsOpCodeHandle,

     NULL