Update for IntelFrameworkModulePkg.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / FileExplorer.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 34b9f956bafbefd3073610c8410706300e0b4207..733632b9f47fb184d3fd558bfb1b50052129c134 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -1,7 +1,7 @@
 /** @file\r
   File explorer related functions.\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -82,7 +82,7 @@ UpdateFileExplorePage (
 \r
   HiiUpdateForm (\r
     CallbackData->FeHiiHandle,\r
-    &mFileExplorerGuid,\r
+    &gFileExploreFormSetGuid,\r
     FORM_FILE_EXPLORER_ID,\r
     mStartOpCodeHandle, // Label FORM_FILE_EXPLORER_ID\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -161,6 +161,10 @@ UpdateFileExplorer (
         // Here boot from file\r
         //\r
         BootThisFile (NewFileContext);\r
+        //\r
+        // Set proper video resolution and text mode for setup.\r
+        //\r
+        ChangeModeForSetup ();\r
         ExitFileExplorer = TRUE;\r
         break;\r
 \r
@@ -191,7 +195,7 @@ UpdateFileExplorer (
 \r
         HiiUpdateForm (\r
           CallbackData->FeHiiHandle,\r
-          &mFileExplorerGuid,\r
+          &gFileExploreFormSetGuid,\r
           FormId,\r
           mStartOpCodeHandle, // Label FormId\r
           mEndOpCodeHandle    // LABEL_END\r
@@ -249,71 +253,76 @@ FileExplorerCallback (
   FILE_EXPLORER_NV_DATA *NvRamMap;\r
   EFI_STATUS            Status;\r
 \r
-  if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
+  if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {\r
     //\r
-    // Do nothing for UEFI OPEN/CLOSE Action\r
+    // All other action return unsupported.\r
     //\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
+    return EFI_UNSUPPORTED;\r
   }\r
-\r
+  \r
   Status         = EFI_SUCCESS;\r
   Private        = FE_CALLBACK_DATA_FROM_THIS (This);\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
 \r
   //\r
   // Retrieve uncommitted data from Form Browser\r
   //\r
   NvRamMap = &Private->FeFakeNvData;\r
-  HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);\r
+  HiiGetBrowserData (&gFileExploreFormSetGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);\r
 \r
-  if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {\r
-    //\r
-    // Apply changes and exit formset\r
-    //\r
-    if (FileExplorerStateAddBootOption == Private->FeCurrentState) {\r
-      Status = Var_UpdateBootOption (Private, NvRamMap);\r
-      if (EFI_ERROR (Status)) {\r
-        return Status;\r
-      }\r
+  if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
+    if ((Value == NULL) || (ActionRequest == NULL)) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+    \r
+    if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {\r
+      //\r
+      // Apply changes and exit formset\r
+      //\r
+      if (FileExplorerStateAddBootOption == Private->FeCurrentState) {\r
+        Status = Var_UpdateBootOption (Private, NvRamMap);\r
+        if (EFI_ERROR (Status)) {\r
+          return Status;\r
+        }\r
 \r
-      BOpt_GetBootOptions (Private);\r
-      CreateMenuStringToken (Private, Private->FeHiiHandle, &BootOptionMenu);\r
-    } else if (FileExplorerStateAddDriverOptionState == Private->FeCurrentState) {\r
-      Status = Var_UpdateDriverOption (\r
-                Private,\r
-                Private->FeHiiHandle,\r
-                NvRamMap->DescriptionData,\r
-                NvRamMap->OptionalData,\r
-                NvRamMap->ForceReconnect\r
-                );\r
-      if (EFI_ERROR (Status)) {\r
-        return Status;\r
-      }\r
+        BOpt_GetBootOptions (Private);\r
+        CreateMenuStringToken (Private, Private->FeHiiHandle, &BootOptionMenu);\r
+      } else if (FileExplorerStateAddDriverOptionState == Private->FeCurrentState) {\r
+        Status = Var_UpdateDriverOption (\r
+                  Private,\r
+                  Private->FeHiiHandle,\r
+                  NvRamMap->DescriptionData,\r
+                  NvRamMap->OptionalData,\r
+                  NvRamMap->ForceReconnect\r
+                  );\r
+        if (EFI_ERROR (Status)) {\r
+          return Status;\r
+        }\r
 \r
-      BOpt_GetDriverOptions (Private);\r
-      CreateMenuStringToken (Private, Private->FeHiiHandle, &DriverOptionMenu);\r
-    }\r
+        BOpt_GetDriverOptions (Private);\r
+        CreateMenuStringToken (Private, Private->FeHiiHandle, &DriverOptionMenu);\r
+      }\r
 \r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-  } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER) {\r
-    //\r
-    // Discard changes and exit formset\r
-    //\r
-    NvRamMap->OptionalData[0]     = 0x0000;\r
-    NvRamMap->DescriptionData[0]  = 0x0000;\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-  } else if (QuestionId < FILE_OPTION_OFFSET) {\r
-    //\r
-    // Exit File Explorer formset\r
-    //\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-  } else {\r
-    if (UpdateFileExplorer (Private, QuestionId)) {\r
       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+    } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER) {\r
+      //\r
+      // Discard changes and exit formset\r
+      //\r
+      NvRamMap->OptionalData[0]     = 0x0000;\r
+      NvRamMap->DescriptionData[0]  = 0x0000;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+    } else if (QuestionId < FILE_OPTION_OFFSET) {\r
+      //\r
+      // Exit File Explorer formset\r
+      //\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+    }\r
+  } else if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+    if (Value == NULL) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+    \r
+    if (QuestionId >= FILE_OPTION_OFFSET) {\r
+      UpdateFileExplorer (Private, QuestionId);\r
     }\r
   }\r
 \r