Refine all R9 call back function to return EFI_UNSUPPORTED for all unsupported call...

[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 98dc54c9399a61d4962a6c956d46e8f1268fda79..e078a722d85fe4bbba7abf361fff6d4fb3103da7 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -1,8 +1,8 @@
 /** @file\r
   File explorer related functions.\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\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
 http://opensource.org/licenses/bsd-license.php\r
@@ -137,10 +137,10 @@ UpdateFileExplorer (
       NewMenuEntry = BOpt_GetMenuEntry (&DirectoryMenu, FileOptionMask);\r
     }\r
 \r
-    CallbackData->FeDisplayContext  = FileExplorerDisplayDirectory;\r
+    NewFileContext                  = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;\r
 \r
     if (NewFileContext->IsDir ) {\r
-      NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;\r
+      CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;\r
 \r
       RemoveEntryList (&NewMenuEntry->Link);\r
       BOpt_FreeMenu (&DirectoryMenu);\r
@@ -249,66 +249,72 @@ FileExplorerCallback (
   FILE_EXPLORER_NV_DATA *NvRamMap;\r
   EFI_STATUS            Status;\r
 \r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  Status         = EFI_SUCCESS;\r
-  Private        = FE_CALLBACK_DATA_FROM_THIS (This);\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
+  if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+    if ((Value == NULL) || (ActionRequest == NULL)) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\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
+    Status         = EFI_SUCCESS;\r
+    Private        = FE_CALLBACK_DATA_FROM_THIS (This);\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\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
+    // Retrieve uncommitted data from Form Browser\r
     //\r
-    if (FileExplorerStateAddBootOption == Private->FeCurrentState) {\r
-      Status = Var_UpdateBootOption (Private, NvRamMap);\r
-      if (EFI_ERROR (Status)) {\r
-        return Status;\r
-      }\r
+    NvRamMap = &Private->FeFakeNvData;\r
+    HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);\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
+    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_GetDriverOptions (Private);\r
-      CreateMenuStringToken (Private, Private->FeHiiHandle, &DriverOptionMenu);\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
-    *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
+        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
+      }\r
     }\r
-  }\r
 \r
-  return Status;\r
+    return Status;\r
+  }\r
+  //\r
+  // All other action return unsupported.\r
+  //\r
+  return EFI_UNSUPPORTED;\r
 }\r