diff options
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/BdsDxe/Bds.h | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c | 4 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 19 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 2 |
6 files changed, 18 insertions, 11 deletions
diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/BdsDxe/Bds.h index aacffc461e..b02dfc0c8e 100644 --- a/MdeModulePkg/Universal/BdsDxe/Bds.h +++ b/MdeModulePkg/Universal/BdsDxe/Bds.h @@ -54,7 +54,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/BaseMemoryLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
-#include <Library/GraphicsLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/PerformanceLib.h>
#include <Library/ReportStatusCodeLib.h>
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf index bc1311c2be..ac6cee13d7 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -95,7 +95,6 @@ ReportStatusCodeLib
PerformanceLib
MemoryAllocationLib
- GraphicsLib
UefiLib
UefiBootServicesTableLib
BaseMemoryLib
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c index 5402e04041..b4b078cb57 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c @@ -145,7 +145,7 @@ PlInitializeDebugSupportDriver ( VOID
)
{
- SetMem (IvtEntryTable, sizeof (IvtEntryTable), 0);
+ ZeroMem (IvtEntryTable, sizeof (IvtEntryTable));
ExternalInterruptCount = 0;
return EFI_SUCCESS;
}
@@ -307,7 +307,7 @@ ManageIvtEntryTable ( //
// re-init IvtEntryTable
//
- SetMem (&IvtEntryTable[ExceptionType], sizeof (IVT_ENTRY), 0);
+ ZeroMem (&IvtEntryTable[ExceptionType], sizeof (IVT_ENTRY));
}
} else {
//
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index ba391143e6..c1a79ab951 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -217,10 +217,11 @@ SendForm ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OPTIONAL
)
{
- EFI_STATUS Status;
- UI_MENU_SELECTION *Selection;
- UINTN Index;
- FORM_BROWSER_FORMSET *FormSet;
+ EFI_STATUS Status;
+ UI_MENU_SELECTION *Selection;
+ UINTN Index;
+ FORM_BROWSER_FORMSET *FormSet;
+ EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl;
Status = EFI_SUCCESS;
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));
@@ -282,7 +283,15 @@ SendForm ( // Ensure we are in Text mode
//
gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));
- DisableQuietBoot ();
+
+ Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ //
+ // Set console control to text mode.
+ //
+ ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);
for (Index = 0; Index < HandleCount; Index++) {
Selection = AllocateZeroPool (sizeof (UI_MENU_SELECTION));
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index 73669735c0..ac419d1465 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -30,10 +30,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/HiiConfigRouting.h>
#include <Protocol/HiiDatabase.h>
#include <Protocol/HiiString.h>
+#include <Protocol/ConsoleControl.h>
#include <MdeModuleHii.h>
-#include <Library/GraphicsLib.h>
#include <Library/PrintLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 190b80c1e9..2b6f72aa4e 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -62,7 +62,6 @@ BaseMemoryLib
DebugLib
PrintLib
- GraphicsLib
IfrSupportLib
HiiLib
ExtendedHiiLib
@@ -76,6 +75,7 @@ gEfiHiiConfigRoutingProtocolGuid
gEfiHiiDatabaseProtocolGuid
gEfiUnicodeCollation2ProtocolGuid
+ gEfiConsoleControlProtocolGuid
[FeaturePcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport
|