\r
**/\r
\r
-\r
#include "Ps2Keyboard.h"\r
\r
/**\r
**/\r
BOOLEAN\r
IsEfikeyBufEmpty (\r
- IN EFI_KEY_QUEUE *Queue\r
+ IN EFI_KEY_QUEUE *Queue\r
)\r
{\r
- return (BOOLEAN) (Queue->Head == Queue->Tail);\r
+ return (BOOLEAN)(Queue->Head == Queue->Tail);\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
PopEfikeyBufHead (\r
- IN EFI_KEY_QUEUE *Queue,\r
- OUT EFI_KEY_DATA *KeyData OPTIONAL\r
+ IN EFI_KEY_QUEUE *Queue,\r
+ OUT EFI_KEY_DATA *KeyData OPTIONAL\r
)\r
{\r
if (IsEfikeyBufEmpty (Queue)) {\r
return EFI_NOT_READY;\r
}\r
+\r
//\r
// Retrieve and remove the values\r
//\r
if (KeyData != NULL) {\r
CopyMem (KeyData, &Queue->Buffer[Queue->Head], sizeof (EFI_KEY_DATA));\r
}\r
+\r
Queue->Head = (Queue->Head + 1) % KEYBOARD_EFI_KEY_MAX_COUNT;\r
return EFI_SUCCESS;\r
}\r
**/\r
VOID\r
PushEfikeyBufTail (\r
- IN EFI_KEY_QUEUE *Queue,\r
- IN EFI_KEY_DATA *KeyData\r
+ IN EFI_KEY_QUEUE *Queue,\r
+ IN EFI_KEY_DATA *KeyData\r
)\r
{\r
if ((Queue->Tail + 1) % KEYBOARD_EFI_KEY_MAX_COUNT == Queue->Head) {\r
//\r
PopEfikeyBufHead (Queue, NULL);\r
}\r
+\r
CopyMem (&Queue->Buffer[Queue->Tail], KeyData, sizeof (EFI_KEY_DATA));\r
Queue->Tail = (Queue->Tail + 1) % KEYBOARD_EFI_KEY_MAX_COUNT;\r
}\r
ASSERT (RegsiteredData != NULL && InputData != NULL);\r
\r
if ((RegsiteredData->Key.ScanCode != InputData->Key.ScanCode) ||\r
- (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar)) {\r
+ (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))\r
+ {\r
return FALSE;\r
}\r
\r
//\r
// Assume KeyShiftState/KeyToggleState = 0 in Registered key data means these state could be ignored.\r
//\r
- if (RegsiteredData->KeyState.KeyShiftState != 0 &&\r
- RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState) {\r
+ if ((RegsiteredData->KeyState.KeyShiftState != 0) &&\r
+ (RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState))\r
+ {\r
return FALSE;\r
}\r
- if (RegsiteredData->KeyState.KeyToggleState != 0 &&\r
- RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState) {\r
+\r
+ if ((RegsiteredData->KeyState.KeyToggleState != 0) &&\r
+ (RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState))\r
+ {\r
return FALSE;\r
}\r
\r
return TRUE;\r
-\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
KeyboardReadKeyStrokeWorker (\r
- IN KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev,\r
- OUT EFI_KEY_DATA *KeyData\r
+ IN KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev,\r
+ OUT EFI_KEY_DATA *KeyData\r
)\r
\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
\r
if (KeyData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
IN BOOLEAN ExtendedVerification\r
)\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
+ EFI_TPL OldTpl;\r
\r
ConsoleIn = KEYBOARD_CONSOLE_IN_DEV_FROM_THIS (This);\r
if (ConsoleIn->KeyboardErr) {\r
ConsoleIn->DevicePath\r
);\r
}\r
+\r
//\r
// Report the status If keyboard is locked\r
//\r
OUT EFI_INPUT_KEY *Key\r
)\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
- EFI_KEY_DATA KeyData;\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
+ EFI_KEY_DATA KeyData;\r
\r
ConsoleIn = KEYBOARD_CONSOLE_IN_DEV_FROM_THIS (This);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
//\r
// If it is partial keystroke, skip it.\r
//\r
- if (KeyData.Key.ScanCode == SCAN_NULL && KeyData.Key.UnicodeChar == CHAR_NULL) {\r
+ if ((KeyData.Key.ScanCode == SCAN_NULL) && (KeyData.Key.UnicodeChar == CHAR_NULL)) {\r
continue;\r
}\r
+\r
//\r
// Translate the CTRL-Alpha characters to their corresponding control value\r
// (ctrl-a = 0x0001 through ctrl-Z = 0x001A)\r
//\r
if ((KeyData.KeyState.KeyShiftState & (EFI_LEFT_CONTROL_PRESSED | EFI_RIGHT_CONTROL_PRESSED)) != 0) {\r
- if (KeyData.Key.UnicodeChar >= L'a' && KeyData.Key.UnicodeChar <= L'z') {\r
- KeyData.Key.UnicodeChar = (CHAR16) (KeyData.Key.UnicodeChar - L'a' + 1);\r
- } else if (KeyData.Key.UnicodeChar >= L'A' && KeyData.Key.UnicodeChar <= L'Z') {\r
- KeyData.Key.UnicodeChar = (CHAR16) (KeyData.Key.UnicodeChar - L'A' + 1);\r
+ if ((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) {\r
+ KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'a' + 1);\r
+ } else if ((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z')) {\r
+ KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'A' + 1);\r
}\r
}\r
\r
VOID\r
EFIAPI\r
KeyboardWaitForKey (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EFI_TPL OldTpl;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
- EFI_KEY_DATA KeyData;\r
+ EFI_TPL OldTpl;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
+ EFI_KEY_DATA KeyData;\r
\r
- ConsoleIn = (KEYBOARD_CONSOLE_IN_DEV *) Context;\r
+ ConsoleIn = (KEYBOARD_CONSOLE_IN_DEV *)Context;\r
\r
//\r
// Enter critical section\r
&(ConsoleIn->EfiKeyQueue.Buffer[ConsoleIn->EfiKeyQueue.Head]),\r
sizeof (EFI_KEY_DATA)\r
);\r
- if (KeyData.Key.ScanCode == SCAN_NULL && KeyData.Key.UnicodeChar == CHAR_NULL) {\r
+ if ((KeyData.Key.ScanCode == SCAN_NULL) && (KeyData.Key.UnicodeChar == CHAR_NULL)) {\r
PopEfikeyBufHead (&ConsoleIn->EfiKeyQueue, &KeyData);\r
continue;\r
}\r
+\r
//\r
// if there is pending value key, signal the event.\r
//\r
break;\r
}\r
}\r
+\r
//\r
// Leave critical section and return\r
//\r
VOID\r
EFIAPI\r
KeyboardWaitForKeyEx (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
\r
{\r
)\r
\r
{\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
\r
ConsoleInDev = TEXT_INPUT_EX_KEYBOARD_CONSOLE_IN_DEV_FROM_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
KeyboardReadKeyStrokeEx (\r
- IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
- OUT EFI_KEY_DATA *KeyData\r
+ IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+ OUT EFI_KEY_DATA *KeyData\r
)\r
\r
{\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
\r
if (KeyData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
)\r
\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
+ EFI_TPL OldTpl;\r
\r
if (KeyToggleState == NULL) {\r
return EFI_INVALID_PARAMETER;\r
if ((*KeyToggleState & EFI_SCROLL_LOCK_ACTIVE) == EFI_SCROLL_LOCK_ACTIVE) {\r
ConsoleInDev->ScrollLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_NUM_LOCK_ACTIVE) == EFI_NUM_LOCK_ACTIVE) {\r
ConsoleInDev->NumLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_CAPS_LOCK_ACTIVE) == EFI_CAPS_LOCK_ACTIVE) {\r
ConsoleInDev->CapsLock = TRUE;\r
}\r
+\r
if ((*KeyToggleState & EFI_KEY_STATE_EXPOSED) == EFI_KEY_STATE_EXPOSED) {\r
ConsoleInDev->IsSupportPartialKey = TRUE;\r
}\r
gBS->RestoreTPL (OldTpl);\r
\r
return Status;\r
-\r
}\r
\r
/**\r
OUT VOID **NotifyHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
- EFI_TPL OldTpl;\r
- LIST_ENTRY *Link;\r
- KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
- KEYBOARD_CONSOLE_IN_EX_NOTIFY *NewNotify;\r
-\r
- if (KeyData == NULL || NotifyHandle == NULL || KeyNotificationFunction == NULL) {\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
+ EFI_TPL OldTpl;\r
+ LIST_ENTRY *Link;\r
+ KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
+ KEYBOARD_CONSOLE_IN_EX_NOTIFY *NewNotify;\r
+\r
+ if ((KeyData == NULL) || (NotifyHandle == NULL) || (KeyNotificationFunction == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (IsKeyRegistered (&CurrentNotify->KeyData, KeyData)) {\r
if (CurrentNotify->KeyNotificationFn == KeyNotificationFunction) {\r
*NotifyHandle = CurrentNotify;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
goto Exit;\r
}\r
}\r
//\r
// Allocate resource to save the notification function\r
//\r
- NewNotify = (KEYBOARD_CONSOLE_IN_EX_NOTIFY *) AllocateZeroPool (sizeof (KEYBOARD_CONSOLE_IN_EX_NOTIFY));\r
+ NewNotify = (KEYBOARD_CONSOLE_IN_EX_NOTIFY *)AllocateZeroPool (sizeof (KEYBOARD_CONSOLE_IN_EX_NOTIFY));\r
if (NewNotify == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
CopyMem (&NewNotify->KeyData, KeyData, sizeof (EFI_KEY_DATA));\r
InsertTailList (&ConsoleInDev->NotifyList, &NewNotify->NotifyEntry);\r
\r
- *NotifyHandle = NewNotify;\r
- Status = EFI_SUCCESS;\r
+ *NotifyHandle = NewNotify;\r
+ Status = EFI_SUCCESS;\r
\r
Exit:\r
//\r
//\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
-\r
}\r
\r
/**\r
IN VOID *NotificationHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
- EFI_TPL OldTpl;\r
- LIST_ENTRY *Link;\r
- KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleInDev;\r
+ EFI_TPL OldTpl;\r
+ LIST_ENTRY *Link;\r
+ KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
\r
if (NotificationHandle == NULL) {\r
return EFI_INVALID_PARAMETER;\r
VOID\r
EFIAPI\r
KeyNotifyProcessHandler (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EFI_STATUS Status;\r
- KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
- EFI_KEY_DATA KeyData;\r
- LIST_ENTRY *Link;\r
- LIST_ENTRY *NotifyList;\r
- KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
- EFI_TPL OldTpl;\r
+ EFI_STATUS Status;\r
+ KEYBOARD_CONSOLE_IN_DEV *ConsoleIn;\r
+ EFI_KEY_DATA KeyData;\r
+ LIST_ENTRY *Link;\r
+ LIST_ENTRY *NotifyList;\r
+ KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;\r
+ EFI_TPL OldTpl;\r
\r
- ConsoleIn = (KEYBOARD_CONSOLE_IN_DEV *) Context;\r
+ ConsoleIn = (KEYBOARD_CONSOLE_IN_DEV *)Context;\r
\r
//\r
// Invoke notification functions.\r
if (EFI_ERROR (Status)) {\r
break;\r
}\r
+\r
for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {\r
CurrentNotify = CR (Link, KEYBOARD_CONSOLE_IN_EX_NOTIFY, NotifyEntry, KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE);\r
if (IsKeyRegistered (&CurrentNotify->KeyData, &KeyData)) {\r
}\r
}\r
}\r
-\r