sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance CreatePopup to call ReadKeyStroke() before calling WaitForEvent(). This can handle the case when in lazy ConIn mode.

Browse Source 
Signed-off-by: Ruiyu Ni<ruiyu.ni@intel.com>
Reviewed-by: Eric Dong<eric.dong@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13946 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu
2012-11-15 06:31:43 +00:00
parent f04544be83
commit abe4c4590b
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This module provide help function for displaying unicode string. This module provide help function for displaying unicode string.
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -314,6 +314,7 @@ CreatePopUp (
... ...
) )
{ {
EFI_STATUS Status;
VA_LIST Args; VA_LIST Args;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut;
EFI_SIMPLE_TEXT_OUTPUT_MODE SavedConsoleMode; EFI_SIMPLE_TEXT_OUTPUT_MODE SavedConsoleMode;
@ -457,7 +458,19 @@ CreatePopUp (
// Wait for a keystroke // Wait for a keystroke
// //
if (Key != NULL) { if (Key != NULL) {
gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &EventIndex); while (TRUE) {
gST->ConIn->ReadKeyStroke (gST->ConIn, Key); Status = gST->ConIn->ReadKeyStroke (gST->ConIn, Key);
if (!EFI_ERROR (Status)) {
break;
}
//
// If we encounter error, continue to read another key in.
//
if (Status != EFI_NOT_READY) {
continue;
}
gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &EventIndex);
}
} }
} }