archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcMiscLib/DebugHelp: Manually poll event instead of waiting (EFI_UNSUPPORTED on Insyde)

Browse Source
This commit is contained in:
Download-Fritz 2019-06-14 19:49:07 +02:00
parent e4ccb06cb6
commit 6c8ea98d03
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Library/OcMiscLib/DebugHelp.c
View File

@ -71,9 +71,7 @@ WaitForKeyIndex (
EFI_STATUS Status;
EFI_INPUT_KEY Key;
INTN Index;
UINTN EventIndex;
EFI_EVENT TimerEvent;
EFI_EVENT WaitList[2];
//
// Skip previously pressed characters.
@ -100,27 +98,36 @@ WaitForKeyIndex (
//
// Wait for the keystroke event or the timer
//
WaitList[0] = gST->ConIn->WaitForKey;
WaitList[1] = TimerEvent;
Status = gBS->WaitForEvent (TimerEvent != NULL ? 2 : 1, WaitList, &EventIndex);
if (TimerEvent != NULL) {
do {
//
// Read our key otherwise.
//
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
if (!EFI_ERROR (Status)) {
break;
}
Status = gBS->CheckEvent (TimerEvent);
//
// Check for the timer expiration
//
if (!EFI_ERROR (Status)) {
gBS->CloseEvent (TimerEvent);
return OC_INPUT_TIMEOUT;
}
} while (Status == EFI_NOT_READY);
gBS->CloseEvent (TimerEvent);
} else {
//
// Read our key otherwise.
//
do {
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
} while (EFI_ERROR (Status));
}
//
// Check for the timer expiration
//
if (!EFI_ERROR (Status) && EventIndex == 1) {
return OC_INPUT_TIMEOUT;
}
//
// Read our key otherwise.
//
do {
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
} while (EFI_ERROR (Status));
if (Key.ScanCode == SCAN_ESC || Key.UnicodeChar == '0') {
return OC_INPUT_ABORTED;
}