tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IntelFrameworkModule/ThunkKb: ReadKeyStrokeEx always return key state 

Today's implementation only return key state when there is a key.
But when user doesn't press any key, the key state cannot be
returned.

The patch changes the ReadKeyStrokeEx() to always return the
key state even there is no key pressed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Ruiyu Ni 2018-01-19 15:59:38 +08:00
parent 896ae6fc24
commit 821807bcef
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
ConsoleOut Routines that speak VGA. ConsoleOut Routines that speak VGA.
Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2018, 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 are licensed and made available under the terms and conditions
@ -269,7 +269,9 @@ BiosKeyboardDriverBindingStart (
BiosKeyboardPrivate->StatusRegisterAddress = KEYBOARD_8042_STATUS_REGISTER; BiosKeyboardPrivate->StatusRegisterAddress = KEYBOARD_8042_STATUS_REGISTER;
BiosKeyboardPrivate->CommandRegisterAddress = KEYBOARD_8042_COMMAND_REGISTER; BiosKeyboardPrivate->CommandRegisterAddress = KEYBOARD_8042_COMMAND_REGISTER;
BiosKeyboardPrivate->ExtendedKeyboard = TRUE; BiosKeyboardPrivate->ExtendedKeyboard = TRUE;
BiosKeyboardPrivate->KeyState.KeyShiftState = 0;
BiosKeyboardPrivate->KeyState.KeyToggleState = 0;
BiosKeyboardPrivate->Queue.Front = 0; BiosKeyboardPrivate->Queue.Front = 0;
BiosKeyboardPrivate->Queue.Rear = 0; BiosKeyboardPrivate->Queue.Rear = 0;
BiosKeyboardPrivate->QueueForNotify.Front = 0; BiosKeyboardPrivate->QueueForNotify.Front = 0;
@ -978,6 +980,8 @@ KeyboardReadKeyStrokeWorker (
// //
Status = CheckQueue (&BiosKeyboardPrivate->Queue); Status = CheckQueue (&BiosKeyboardPrivate->Queue);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ZeroMem (&KeyData->Key, sizeof (KeyData->Key));
CopyMem (&KeyData->KeyState, &BiosKeyboardPrivate->KeyState, sizeof (EFI_KEY_STATE));
gBS->RestoreTPL (OldTpl); gBS->RestoreTPL (OldTpl);
return EFI_NOT_READY; return EFI_NOT_READY;
} }
@ -1986,6 +1990,12 @@ BiosKeyboardTimerHandler (
} }
Enqueue (&BiosKeyboardPrivate->Queue, &KeyData); Enqueue (&BiosKeyboardPrivate->Queue, &KeyData);
//
// Save the current key state
//
CopyMem (&BiosKeyboardPrivate->KeyState, &KeyData.KeyState, sizeof (EFI_KEY_STATE));
// //
// Leave critical section and return // Leave critical section and return
// //

5
IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
View File

@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2018, 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 are licensed and made available under the terms and conditions
@ -220,7 +220,8 @@ typedef struct {
UINT16 StatusRegisterAddress; UINT16 StatusRegisterAddress;
UINT16 CommandRegisterAddress; UINT16 CommandRegisterAddress;
BOOLEAN ExtendedKeyboard; BOOLEAN ExtendedKeyboard;
EFI_KEY_STATE KeyState;
// //
// Buffer storing EFI_KEY_DATA // Buffer storing EFI_KEY_DATA
// //