MdeModulePkg/SdMmcPciHcDxe: Execute card detect only for RemovableSlot

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / SetupBrowser.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index 43d1b9c0f40f67f3c417fe4ec7b4c469a06e18dd..1a8219ac46a311fa8b1e7b5f4cc1e3290610dde2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
@@ -1,9 +1,9 @@
-/**@file\r
+/** @file\r
 Framework to UEFI 2.1 Setup Browser Thunk. The file consume EFI_FORM_BROWSER2_PROTOCOL\r
 to produce a EFI_FORM_BROWSER_PROTOCOL.\r
 \r
-Copyright (c) 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2008 - 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
@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "HiiDatabase.h"\r
 #include "SetupBrowser.h"\r
 \r
-EFI_GUID gFrameworkBdsFrontPageFormsetGuid = FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID;\r
 EFI_HII_HANDLE gStringPackHandle = NULL;\r
 BOOLEAN mFrontPageDisplayed = FALSE;\r
 //\r
@@ -102,7 +101,7 @@ PlatformBdsShowProgress (
                     (VOID **) &UgaDraw\r
                     );\r
   }\r
-  if (EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status) || (GraphicsOutput == NULL && UgaDraw == NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -399,12 +398,17 @@ GetTimeout (
                         current settings and the caller needs to provide to the browser the\r
                         current settings for the the "fake" NV variable. If used, no saving of\r
                         an NV variable is possbile. This parameter is also ignored if Handle is NULL.\r
+  @param ScreenDimensions \r
+                        Allows the browser to be called so that it occupies a portion of the physical \r
+                        screen instead of dynamically determining the screen dimensions.\r
+  @param ResetRequired  This BOOLEAN value denotes whether a reset is required based on the data that \r
+                        might have been changed. The ResetRequired parameter is primarily applicable \r
+                        for configuration applications, and is an optional parameter.\r
 \r
   @retval EFI_SUCCESS             If the Formset is displayed correctly.\r
   @retval EFI_UNSUPPORTED         If UseDatabase is FALSE or HandleCount is not 1.\r
   @retval EFI_INVALID_PARAMETER   If the *Handle passed in is not found in the database.\r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI \r
 ThunkSendForm (\r
@@ -412,7 +416,7 @@ ThunkSendForm (
   IN  BOOLEAN                           UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE          *Handle,\r
   IN  UINTN                             HandleCount,\r
-  IN  FRAMEWORK_EFI_IFR_PACKET          *Packet, OPTIONAL\r
+  IN  EFI_IFR_PACKET                    *Packet, OPTIONAL\r
   IN  EFI_HANDLE                        CallbackHandle, OPTIONAL\r
   IN  UINT8                             *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR   *ScreenDimensions, OPTIONAL\r