/** @file\r
Routines that access 8042 keyboard controller\r
\r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
return Status;\r
}\r
\r
+/**\r
+ Initialize the key state.\r
+\r
+ @param ConsoleIn The KEYBOARD_CONSOLE_IN_DEV instance.\r
+ @param KeyState A pointer to receive the key state information.\r
+**/\r
+VOID\r
+InitializeKeyState (\r
+ IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
+ OUT EFI_KEY_STATE *KeyState\r
+ )\r
+{\r
+ KeyState->KeyShiftState = EFI_SHIFT_STATE_VALID\r
+ | (ConsoleIn->LeftCtrl ? EFI_LEFT_CONTROL_PRESSED : 0)\r
+ | (ConsoleIn->RightCtrl ? EFI_RIGHT_CONTROL_PRESSED : 0)\r
+ | (ConsoleIn->LeftAlt ? EFI_LEFT_ALT_PRESSED : 0)\r
+ | (ConsoleIn->RightAlt ? EFI_RIGHT_ALT_PRESSED : 0)\r
+ | (ConsoleIn->LeftShift ? EFI_LEFT_SHIFT_PRESSED : 0)\r
+ | (ConsoleIn->RightShift ? EFI_RIGHT_SHIFT_PRESSED : 0)\r
+ | (ConsoleIn->LeftLogo ? EFI_LEFT_LOGO_PRESSED : 0)\r
+ | (ConsoleIn->RightLogo ? EFI_RIGHT_LOGO_PRESSED : 0)\r
+ | (ConsoleIn->Menu ? EFI_MENU_KEY_PRESSED : 0)\r
+ | (ConsoleIn->SysReq ? EFI_SYS_REQ_PRESSED : 0)\r
+ ;\r
+ KeyState->KeyToggleState = EFI_TOGGLE_STATE_VALID\r
+ | (ConsoleIn->CapsLock ? EFI_CAPS_LOCK_ACTIVE : 0)\r
+ | (ConsoleIn->NumLock ? EFI_NUM_LOCK_ACTIVE : 0)\r
+ | (ConsoleIn->ScrollLock ? EFI_SCROLL_LOCK_ACTIVE : 0)\r
+ | (ConsoleIn->IsSupportPartialKey ? EFI_KEY_STATE_EXPOSED : 0)\r
+ ;\r
+}\r
+\r
/**\r
Get scancode from scancode buffer and translate into EFI-scancode and unicode defined by EFI spec.\r
\r
//\r
// Save the Shift/Toggle state\r
//\r
- KeyData.KeyState.KeyShiftState = (UINT32) (EFI_SHIFT_STATE_VALID\r
- | (ConsoleIn->LeftCtrl ? EFI_LEFT_CONTROL_PRESSED : 0)\r
- | (ConsoleIn->RightCtrl ? EFI_RIGHT_CONTROL_PRESSED : 0)\r
- | (ConsoleIn->LeftAlt ? EFI_LEFT_ALT_PRESSED : 0)\r
- | (ConsoleIn->RightAlt ? EFI_RIGHT_ALT_PRESSED : 0)\r
- | (ConsoleIn->LeftShift ? EFI_LEFT_SHIFT_PRESSED : 0)\r
- | (ConsoleIn->RightShift ? EFI_RIGHT_SHIFT_PRESSED : 0)\r
- | (ConsoleIn->LeftLogo ? EFI_LEFT_LOGO_PRESSED : 0)\r
- | (ConsoleIn->RightLogo ? EFI_RIGHT_LOGO_PRESSED : 0)\r
- | (ConsoleIn->Menu ? EFI_MENU_KEY_PRESSED : 0)\r
- | (ConsoleIn->SysReq ? EFI_SYS_REQ_PRESSED : 0)\r
- );\r
- KeyData.KeyState.KeyToggleState = (EFI_KEY_TOGGLE_STATE) (EFI_TOGGLE_STATE_VALID\r
- | (ConsoleIn->CapsLock ? EFI_CAPS_LOCK_ACTIVE : 0)\r
- | (ConsoleIn->NumLock ? EFI_NUM_LOCK_ACTIVE : 0)\r
- | (ConsoleIn->ScrollLock ? EFI_SCROLL_LOCK_ACTIVE : 0)\r
- | (ConsoleIn->IsSupportPartialKey ? EFI_KEY_STATE_EXPOSED : 0)\r
- );\r
-\r
- KeyData.Key.ScanCode = SCAN_NULL;\r
- KeyData.Key.UnicodeChar = CHAR_NULL;\r
+ InitializeKeyState (ConsoleIn, &KeyData.KeyState);\r
+ KeyData.Key.ScanCode = SCAN_NULL;\r
+ KeyData.Key.UnicodeChar = CHAR_NULL;\r
\r
//\r
// Key Pad "/" shares the same scancode as that of "/" except Key Pad "/" has E0 prefix\r
}\r
\r
//\r
- // Invoke notification functions if exist\r
+ // Signal KeyNotify process event if this key pressed matches any key registered.\r
//\r
for (Link = GetFirstNode (&ConsoleIn->NotifyList); !IsNull (&ConsoleIn->NotifyList, Link); Link = GetNextNode (&ConsoleIn->NotifyList, Link)) {\r
CurrentNotify = CR (\r
KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE\r
);\r
if (IsKeyRegistered (&CurrentNotify->KeyData, &KeyData)) {\r
- CurrentNotify->KeyNotificationFn (&KeyData);\r
+ //\r
+ // The key notification function needs to run at TPL_CALLBACK\r
+ // while current TPL is TPL_NOTIFY. It will be invoked in\r
+ // KeyNotifyProcessHandler() which runs at TPL_CALLBACK.\r
+ //\r
+ PushEfikeyBufTail (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);\r
+ gBS->SignalEvent (ConsoleIn->KeyNotifyProcessEvent);\r
}\r
}\r
\r
ConsoleIn->ScancodeQueue.Tail = 0;\r
ConsoleIn->EfiKeyQueue.Head = 0;\r
ConsoleIn->EfiKeyQueue.Tail = 0;\r
+ ConsoleIn->EfiKeyQueueForNotify.Head = 0;\r
+ ConsoleIn->EfiKeyQueueForNotify.Tail = 0;\r
\r
//\r
// Reset the status indicators\r
\r
ConsoleIn->IsSupportPartialKey = FALSE;\r
//\r
- // For reseting keyboard is not mandatory before booting OS and sometimes keyboard responses very slow,\r
+ // For resetting keyboard is not mandatory before booting OS and sometimes keyboard responses very slow,\r
// and to support KB hot plug, we need to let the InitKB succeed no matter whether there is a KB device connected\r
- // to system. So we only do the real reseting for keyboard when user asks and there is a real KB connected t system,\r
+ // to system. So we only do the real resetting for keyboard when user asks and there is a real KB connected t system,\r
// and normally during booting an OS, it's skipped.\r
//\r
if (ExtendedVerification && CheckKeyboardConnect (ConsoleIn)) {\r
projects / mirror_edk2.git / blobdiff