]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm
[mirror_edk2.git] / MdeModulePkg / Universal / Console / TerminalDxe / TerminalConIn.c
index 4aa8c73f061b68673bac71084e1bf4c527148284..2286264b29e5833f1db346c7efa20406408ae2c9 100644 (file)
@@ -1,20 +1,15 @@
 /** @file\r
   Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include "Terminal.h"\r
 \r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existence of a keystroke via WaitForEvent () call.\r
@@ -26,62 +21,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @retval EFI_SUCCESS              The keystroke information was returned.\r
   @retval EFI_NOT_READY            There was no keystroke data available.\r
-  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due\r
-                                   to hardware errors.\r
   @retval EFI_INVALID_PARAMETER    KeyData is NULL.\r
 \r
 **/\r
 EFI_STATUS\r
 ReadKeyStrokeWorker (\r
-  IN  TERMINAL_DEV *TerminalDevice,\r
-  OUT EFI_KEY_DATA *KeyData\r
+  IN  TERMINAL_DEV  *TerminalDevice,\r
+  OUT EFI_KEY_DATA  *KeyData\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  LIST_ENTRY                      *Link;\r
-  LIST_ENTRY                      *NotifyList;\r
-  TERMINAL_CONSOLE_IN_EX_NOTIFY   *CurrentNotify;\r
-\r
   if (KeyData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Initialize *Key to nonsense value.\r
-  //\r
-  KeyData->Key.ScanCode    = SCAN_NULL;\r
-  KeyData->Key.UnicodeChar = 0;\r
-\r
-  Status = TerminalConInCheckForKey (&TerminalDevice->SimpleInput);\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_NOT_READY;\r
-  }\r
-\r
-  if (!EfiKeyFiFoRemoveOneKey (TerminalDevice, &KeyData->Key)) {\r
-    return EFI_NOT_READY;\r
-  }\r
-\r
   KeyData->KeyState.KeyShiftState  = 0;\r
   KeyData->KeyState.KeyToggleState = 0;\r
 \r
-  //\r
-  // Invoke notification functions if exist\r
-  //\r
-  NotifyList = &TerminalDevice->NotifyList;\r
-  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList,Link); Link = GetNextNode (NotifyList,Link)) {\r
-    CurrentNotify = CR (\r
-                      Link,\r
-                      TERMINAL_CONSOLE_IN_EX_NOTIFY,\r
-                      NotifyEntry,\r
-                      TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE\r
-                      );\r
-    if (IsKeyRegistered (&CurrentNotify->KeyData, KeyData)) {\r
-      CurrentNotify->KeyNotificationFn (KeyData);\r
-    }\r
+  if (!EfiKeyFiFoRemoveOneKey (TerminalDevice, &KeyData->Key)) {\r
+    return EFI_NOT_READY;\r
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -113,7 +73,7 @@ TerminalConInReset (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),\r
+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET),\r
     TerminalDevice->DevicePath\r
     );\r
 \r
@@ -122,14 +82,15 @@ TerminalConInReset (
   //\r
   // Make all the internal buffer empty for keys\r
   //\r
-  TerminalDevice->RawFiFo->Head     = TerminalDevice->RawFiFo->Tail;\r
-  TerminalDevice->UnicodeFiFo->Head = TerminalDevice->UnicodeFiFo->Tail;\r
-  TerminalDevice->EfiKeyFiFo->Head  = TerminalDevice->EfiKeyFiFo->Tail;\r
+  TerminalDevice->RawFiFo->Head             = TerminalDevice->RawFiFo->Tail;\r
+  TerminalDevice->UnicodeFiFo->Head         = TerminalDevice->UnicodeFiFo->Tail;\r
+  TerminalDevice->EfiKeyFiFo->Head          = TerminalDevice->EfiKeyFiFo->Tail;\r
+  TerminalDevice->EfiKeyFiFoForNotify->Head = TerminalDevice->EfiKeyFiFoForNotify->Tail;\r
 \r
   if (EFI_ERROR (Status)) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
+      (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),\r
       TerminalDevice->DevicePath\r
       );\r
   }\r
@@ -164,7 +125,7 @@ TerminalConInReadKeyStroke (
   //\r
   //  get TERMINAL_DEV from "This" parameter.\r
   //\r
-  TerminalDevice  = TERMINAL_CON_IN_DEV_FROM_THIS (This);\r
+  TerminalDevice = TERMINAL_CON_IN_DEV_FROM_THIS (This);\r
 \r
   Status = ReadKeyStrokeWorker (TerminalDevice, &KeyData);\r
   if (EFI_ERROR (Status)) {\r
@@ -174,7 +135,6 @@ TerminalConInReadKeyStroke (
   CopyMem (Key, &KeyData.Key, sizeof (EFI_INPUT_KEY));\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -190,7 +150,7 @@ TerminalConInReadKeyStroke (
                                    pressed.\r
 \r
   @retval TRUE                     Key be pressed matches a registered key.\r
-  @retval FLASE                    Match failed.\r
+  @retval FALSE                    Match failed.\r
 \r
 **/\r
 BOOLEAN\r
@@ -202,15 +162,14 @@ IsKeyRegistered (
   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
   return TRUE;\r
 }\r
 \r
-\r
-\r
 /**\r
   Event notification function for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r
   Signal the event if there is key available\r
@@ -222,16 +181,11 @@ IsKeyRegistered (
 VOID\r
 EFIAPI\r
 TerminalConInWaitForKeyEx (\r
-  IN  EFI_EVENT       Event,\r
-  IN  VOID            *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  TERMINAL_DEV            *TerminalDevice;\r
-\r
-  TerminalDevice  = TERMINAL_CON_IN_EX_DEV_FROM_THIS (Context);\r
-\r
-  TerminalConInWaitForKey (Event, &TerminalDevice->SimpleInput);\r
-\r
+  TerminalConInWaitForKey (Event, Context);\r
 }\r
 \r
 //\r
@@ -256,8 +210,8 @@ TerminalConInResetEx (
   IN BOOLEAN                            ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  TERMINAL_DEV            *TerminalDevice;\r
+  EFI_STATUS    Status;\r
+  TERMINAL_DEV  *TerminalDevice;\r
 \r
   TerminalDevice = TERMINAL_CON_IN_EX_DEV_FROM_THIS (This);\r
 \r
@@ -267,10 +221,8 @@ TerminalConInResetEx (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existence of a keystroke via WaitForEvent () call.\r
@@ -290,11 +242,11 @@ TerminalConInResetEx (
 EFI_STATUS\r
 EFIAPI\r
 TerminalConInReadKeyStrokeEx (\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
-  TERMINAL_DEV                    *TerminalDevice;\r
+  TERMINAL_DEV  *TerminalDevice;\r
 \r
   if (KeyData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -303,10 +255,8 @@ TerminalConInReadKeyStrokeEx (
   TerminalDevice = TERMINAL_CON_IN_EX_DEV_FROM_THIS (This);\r
 \r
   return ReadKeyStrokeWorker (TerminalDevice, KeyData);\r
-\r
 }\r
 \r
-\r
 /**\r
   Set certain state for the input device.\r
 \r
@@ -333,19 +283,25 @@ TerminalConInSetState (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
+  if ((*KeyToggleState & EFI_TOGGLE_STATE_VALID) != EFI_TOGGLE_STATE_VALID) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r
 \r
   @param  This                     Protocol instance pointer.\r
-  @param  KeyData                  A pointer to a buffer that is filled in with the\r
-                                   keystroke information data for the key that was\r
-                                   pressed.\r
+  @param  KeyData                  A pointer to a buffer that is filled in with\r
+                                   the keystroke information for the key that was\r
+                                   pressed. If KeyData.Key, KeyData.KeyState.KeyToggleState\r
+                                   and KeyData.KeyState.KeyShiftState are 0, then any incomplete\r
+                                   keystroke will trigger a notification of the KeyNotificationFunction.\r
   @param  KeyNotificationFunction  Points to the function to be called when the key\r
-                                   sequence is typed specified by KeyData.\r
+                                   sequence is typed specified by KeyData. This notification function\r
+                                   should be called at <=TPL_CALLBACK.\r
   @param  NotifyHandle             Points to the unique handle assigned to the\r
                                    registered notification.\r
 \r
@@ -362,17 +318,16 @@ TerminalConInRegisterKeyNotify (
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
-  OUT EFI_HANDLE                        *NotifyHandle\r
+  OUT VOID                              **NotifyHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  TERMINAL_DEV                    *TerminalDevice;\r
-  TERMINAL_CONSOLE_IN_EX_NOTIFY   *NewNotify;\r
-  LIST_ENTRY                      *Link;\r
-  LIST_ENTRY                      *NotifyList;\r
-  TERMINAL_CONSOLE_IN_EX_NOTIFY   *CurrentNotify;\r
-\r
-  if (KeyData == NULL || NotifyHandle == NULL || KeyNotificationFunction == NULL) {\r
+  TERMINAL_DEV                   *TerminalDevice;\r
+  TERMINAL_CONSOLE_IN_EX_NOTIFY  *NewNotify;\r
+  LIST_ENTRY                     *Link;\r
+  LIST_ENTRY                     *NotifyList;\r
+  TERMINAL_CONSOLE_IN_EX_NOTIFY  *CurrentNotify;\r
+\r
+  if ((KeyData == NULL) || (NotifyHandle == NULL) || (KeyNotificationFunction == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -382,7 +337,7 @@ TerminalConInRegisterKeyNotify (
   // Return EFI_SUCCESS if the (KeyData, NotificationFunction) is already registered.\r
   //\r
   NotifyList = &TerminalDevice->NotifyList;\r
-  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList,Link); Link = GetNextNode (NotifyList,Link)) {\r
+  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {\r
     CurrentNotify = CR (\r
                       Link,\r
                       TERMINAL_CONSOLE_IN_EX_NOTIFY,\r
@@ -391,7 +346,7 @@ TerminalConInRegisterKeyNotify (
                       );\r
     if (IsKeyRegistered (&CurrentNotify->KeyData, KeyData)) {\r
       if (CurrentNotify->KeyNotificationFn == KeyNotificationFunction) {\r
-        *NotifyHandle = CurrentNotify->NotifyHandle;\r
+        *NotifyHandle = CurrentNotify;\r
         return EFI_SUCCESS;\r
       }\r
     }\r
@@ -400,31 +355,21 @@ TerminalConInRegisterKeyNotify (
   //\r
   // Allocate resource to save the notification function\r
   //\r
-  NewNotify = (TERMINAL_CONSOLE_IN_EX_NOTIFY *) AllocateZeroPool (sizeof (TERMINAL_CONSOLE_IN_EX_NOTIFY));\r
+  NewNotify = (TERMINAL_CONSOLE_IN_EX_NOTIFY *)AllocateZeroPool (sizeof (TERMINAL_CONSOLE_IN_EX_NOTIFY));\r
   if (NewNotify == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   NewNotify->Signature         = TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE;\r
   NewNotify->KeyNotificationFn = KeyNotificationFunction;\r
-  CopyMem (&NewNotify->KeyData, KeyData, sizeof (KeyData));\r
+  CopyMem (&NewNotify->KeyData, KeyData, sizeof (EFI_KEY_DATA));\r
   InsertTailList (&TerminalDevice->NotifyList, &NewNotify->NotifyEntry);\r
-  //\r
-  // Use gSimpleTextInExNotifyGuid to get a valid EFI_HANDLE\r
-  //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &NewNotify->NotifyHandle,\r
-                  &gSimpleTextInExNotifyGuid,\r
-                  NULL,\r
-                  NULL\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-  *NotifyHandle                = NewNotify->NotifyHandle;\r
+\r
+  *NotifyHandle = NewNotify;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove a registered notification function from a particular keystroke.\r
 \r
@@ -435,66 +380,49 @@ TerminalConInRegisterKeyNotify (
   @retval EFI_SUCCESS              The notification function was unregistered\r
                                    successfully.\r
   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid.\r
-  @retval EFI_NOT_FOUND            Can not find the matching entry in database.\r
 \r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 TerminalConInUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
-  IN EFI_HANDLE                         NotificationHandle\r
+  IN VOID                               *NotificationHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  TERMINAL_DEV                    *TerminalDevice;\r
-  LIST_ENTRY                      *Link;\r
-  TERMINAL_CONSOLE_IN_EX_NOTIFY   *CurrentNotify;\r
-  LIST_ENTRY                      *NotifyList;\r
+  TERMINAL_DEV                   *TerminalDevice;\r
+  LIST_ENTRY                     *Link;\r
+  TERMINAL_CONSOLE_IN_EX_NOTIFY  *CurrentNotify;\r
+  LIST_ENTRY                     *NotifyList;\r
 \r
   if (NotificationHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (\r
-                  NotificationHandle,\r
-                  &gSimpleTextInExNotifyGuid,\r
-                  NULL,\r
-                  NULL,\r
-                  NULL,\r
-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
   TerminalDevice = TERMINAL_CON_IN_EX_DEV_FROM_THIS (This);\r
 \r
   NotifyList = &TerminalDevice->NotifyList;\r
-  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList,Link); Link = GetNextNode (NotifyList,Link)) {\r
+  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {\r
     CurrentNotify = CR (\r
                       Link,\r
                       TERMINAL_CONSOLE_IN_EX_NOTIFY,\r
                       NotifyEntry,\r
                       TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE\r
                       );\r
-    if (CurrentNotify->NotifyHandle == NotificationHandle) {\r
+    if (CurrentNotify == NotificationHandle) {\r
       //\r
       // Remove the notification function from NotifyList and free resources\r
       //\r
       RemoveEntryList (&CurrentNotify->NotifyEntry);\r
-      Status = gBS->UninstallMultipleProtocolInterfaces (\r
-                      CurrentNotify->NotifyHandle,\r
-                      &gSimpleTextInExNotifyGuid,\r
-                      NULL,\r
-                      NULL\r
-                      );\r
-      ASSERT_EFI_ERROR (Status);\r
+\r
       gBS->FreePool (CurrentNotify);\r
       return EFI_SUCCESS;\r
     }\r
   }\r
 \r
-  return EFI_NOT_FOUND;\r
+  //\r
+  // Can not find the matching entry in database.\r
+  //\r
+  return EFI_INVALID_PARAMETER;\r
 }\r
 \r
 /**\r
@@ -506,32 +434,36 @@ TerminalConInUnregisterKeyNotify (
 **/\r
 VOID\r
 TranslateRawDataToEfiKey (\r
-  IN  TERMINAL_DEV      *TerminalDevice\r
+  IN  TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
   switch (TerminalDevice->TerminalType) {\r
+    case TerminalTypePcAnsi:\r
+    case TerminalTypeVt100:\r
+    case TerminalTypeVt100Plus:\r
+    case TerminalTypeTtyTerm:\r
+    case TerminalTypeLinux:\r
+    case TerminalTypeXtermR6:\r
+    case TerminalTypeVt400:\r
+    case TerminalTypeSCO:\r
+      AnsiRawDataToUnicode (TerminalDevice);\r
+      UnicodeToEfiKey (TerminalDevice);\r
+      break;\r
 \r
-  case PCANSITYPE:\r
-  case VT100TYPE:\r
-  case VT100PLUSTYPE:\r
-    AnsiRawDataToUnicode (TerminalDevice);\r
-    UnicodeToEfiKey (TerminalDevice);\r
-    break;\r
-\r
-  case VTUTF8TYPE:\r
-    //\r
-    // Process all the raw data in the RawFIFO,\r
-    // put the processed key into UnicodeFIFO.\r
-    //\r
-    VTUTF8RawDataToUnicode (TerminalDevice);\r
+    case TerminalTypeVtUtf8:\r
+      //\r
+      // Process all the raw data in the RawFIFO,\r
+      // put the processed key into UnicodeFIFO.\r
+      //\r
+      VTUTF8RawDataToUnicode (TerminalDevice);\r
 \r
-    //\r
-    // Translate all the Unicode data in the UnicodeFIFO to Efi key,\r
-    // then put into EfiKeyFIFO.\r
-    //\r
-    UnicodeToEfiKey (TerminalDevice);\r
+      //\r
+      // Translate all the Unicode data in the UnicodeFIFO to Efi key,\r
+      // then put into EfiKeyFIFO.\r
+      //\r
+      UnicodeToEfiKey (TerminalDevice);\r
 \r
-    break;\r
+      break;\r
   }\r
 }\r
 \r
@@ -546,36 +478,30 @@ TranslateRawDataToEfiKey (
 VOID\r
 EFIAPI\r
 TerminalConInWaitForKey (\r
-  IN  EFI_EVENT       Event,\r
-  IN  VOID            *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   //\r
   // Someone is waiting on the keystroke event, if there's\r
   // a key pending, signal the event\r
   //\r
-  // Context is the pointer to EFI_SIMPLE_TEXT_INPUT_PROTOCOL\r
-  //\r
-  if (!EFI_ERROR (TerminalConInCheckForKey (Context))) {\r
-\r
+  if (!IsEfiKeyFiFoEmpty ((TERMINAL_DEV *)Context)) {\r
     gBS->SignalEvent (Event);\r
   }\r
 }\r
 \r
-\r
 /**\r
-  Check for a pending key in the Efi Key FIFO or Serial device buffer.\r
-\r
-  @param  This                     Indicates the calling context.\r
-\r
-  @retval EFI_SUCCESS              There is key pending.\r
-  @retval EFI_NOT_READY            There is no key pending.\r
-  @retval EFI_DEVICE_ERROR         If Serial IO is not attached to serial device.\r
+  Timer handler to poll the key from serial.\r
 \r
+  @param  Event                    Indicates the event that invoke this function.\r
+  @param  Context                  Indicates the calling context.\r
 **/\r
-EFI_STATUS\r
-TerminalConInCheckForKey (\r
-  IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This\r
+VOID\r
+EFIAPI\r
+TerminalConInTimerHandler (\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   EFI_STATUS              Status;\r
@@ -586,12 +512,13 @@ TerminalConInCheckForKey (
   EFI_SERIAL_IO_PROTOCOL  *SerialIo;\r
   UINTN                   SerialInTimeOut;\r
 \r
-  TerminalDevice  = TERMINAL_CON_IN_DEV_FROM_THIS (This);\r
+  TerminalDevice = (TERMINAL_DEV *)Context;\r
 \r
-  SerialIo        = TerminalDevice->SerialIo;\r
+  SerialIo = TerminalDevice->SerialIo;\r
   if (SerialIo == NULL) {\r
-    return EFI_DEVICE_ERROR;\r
+    return;\r
   }\r
+\r
   //\r
   //  if current timeout value for serial device is not identical with\r
   //  the value saved in TERMINAL_DEV structure, then recalculate the\r
@@ -599,24 +526,23 @@ TerminalConInCheckForKey (
   //\r
   Mode = SerialIo->Mode;\r
   if (Mode->Timeout != TerminalDevice->SerialInTimeOut) {\r
-\r
     SerialInTimeOut = 0;\r
     if (Mode->BaudRate != 0) {\r
       //\r
       // According to BAUD rate to calculate the timeout value.\r
       //\r
-      SerialInTimeOut = (1 + Mode->DataBits + Mode->StopBits) * 2 * 1000000 / (UINTN) Mode->BaudRate;\r
+      SerialInTimeOut = (1 + Mode->DataBits + Mode->StopBits) * 2 * 1000000 / (UINTN)Mode->BaudRate;\r
     }\r
 \r
     Status = SerialIo->SetAttributes (\r
-                        SerialIo,\r
-                        Mode->BaudRate,\r
-                        Mode->ReceiveFifoDepth,\r
-                        (UINT32) SerialInTimeOut,\r
-                        (EFI_PARITY_TYPE) (Mode->Parity),\r
-                        (UINT8) Mode->DataBits,\r
-                        (EFI_STOP_BITS_TYPE) (Mode->StopBits)\r
-                        );\r
+                         SerialIo,\r
+                         Mode->BaudRate,\r
+                         Mode->ReceiveFifoDepth,\r
+                         (UINT32)SerialInTimeOut,\r
+                         (EFI_PARITY_TYPE)(Mode->Parity),\r
+                         (UINT8)Mode->DataBits,\r
+                         (EFI_STOP_BITS_TYPE)(Mode->StopBits)\r
+                         );\r
 \r
     if (EFI_ERROR (Status)) {\r
       TerminalDevice->SerialInTimeOut = 0;\r
@@ -624,61 +550,96 @@ TerminalConInCheckForKey (
       TerminalDevice->SerialInTimeOut = SerialInTimeOut;\r
     }\r
   }\r
+\r
   //\r
-  //  Check whether serial buffer is empty.\r
+  // Check whether serial buffer is empty.\r
+  // Skip the key transfer loop only if the SerialIo protocol instance\r
+  // successfully reports EFI_SERIAL_INPUT_BUFFER_EMPTY.\r
   //\r
   Status = SerialIo->GetControl (SerialIo, &Control);\r
-\r
-  if ((Control & EFI_SERIAL_INPUT_BUFFER_EMPTY) != 0) {\r
+  if (EFI_ERROR (Status) || ((Control & EFI_SERIAL_INPUT_BUFFER_EMPTY) == 0)) {\r
     //\r
-    // Translate all the raw data in RawFIFO into EFI Key,\r
-    // according to different terminal type supported.\r
+    // Fetch all the keys in the serial buffer,\r
+    // and insert the byte stream into RawFIFO.\r
     //\r
-    TranslateRawDataToEfiKey (TerminalDevice);\r
+    while (!IsRawFiFoFull (TerminalDevice)) {\r
+      Status = GetOneKeyFromSerial (TerminalDevice->SerialIo, &Input);\r
+\r
+      if (EFI_ERROR (Status)) {\r
+        if (Status == EFI_DEVICE_ERROR) {\r
+          REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+            EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+            (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR),\r
+            TerminalDevice->DevicePath\r
+            );\r
+        }\r
 \r
-    //\r
-    //  if there is pre-fetched Efi Key in EfiKeyFIFO buffer,\r
-    //  return directly.\r
-    //\r
-    if (!IsEfiKeyFiFoEmpty (TerminalDevice)) {\r
-      return EFI_SUCCESS;\r
-    } else {\r
-      return EFI_NOT_READY;\r
+        break;\r
+      }\r
+\r
+      RawFiFoInsertOneKey (TerminalDevice, Input);\r
     }\r
   }\r
+\r
   //\r
-  // Fetch all the keys in the serial buffer,\r
-  // and insert the byte stream into RawFIFO.\r
+  // Translate all the raw data in RawFIFO into EFI Key,\r
+  // according to different terminal type supported.\r
   //\r
-  do {\r
+  TranslateRawDataToEfiKey (TerminalDevice);\r
+}\r
 \r
-    Status = GetOneKeyFromSerial (TerminalDevice->SerialIo, &Input);\r
+/**\r
+  Process key notify.\r
 \r
-    if (EFI_ERROR (Status)) {\r
-      if (Status == EFI_DEVICE_ERROR) {\r
-        REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
-          EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-          PcdGet32 (PcdStatusCodeValueRemoteConsoleInputError),\r
-          TerminalDevice->DevicePath\r
-          );\r
-      }\r
-      break;\r
-    }\r
+  @param  Event                 Indicates the event that invoke this function.\r
+  @param  Context               Indicates the calling context.\r
+**/\r
+VOID\r
+EFIAPI\r
+KeyNotifyProcessHandler (\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
+  )\r
+{\r
+  BOOLEAN                        HasKey;\r
+  TERMINAL_DEV                   *TerminalDevice;\r
+  EFI_INPUT_KEY                  Key;\r
+  EFI_KEY_DATA                   KeyData;\r
+  LIST_ENTRY                     *Link;\r
+  LIST_ENTRY                     *NotifyList;\r
+  TERMINAL_CONSOLE_IN_EX_NOTIFY  *CurrentNotify;\r
+  EFI_TPL                        OldTpl;\r
 \r
-    RawFiFoInsertOneKey (TerminalDevice, Input);\r
-  } while (TRUE);\r
+  TerminalDevice = (TERMINAL_DEV *)Context;\r
 \r
   //\r
-  // Translate all the raw data in RawFIFO into EFI Key,\r
-  // according to different terminal type supported.\r
+  // Invoke notification functions.\r
   //\r
-  TranslateRawDataToEfiKey (TerminalDevice);\r
+  NotifyList = &TerminalDevice->NotifyList;\r
+  while (TRUE) {\r
+    //\r
+    // Enter critical section\r
+    //\r
+    OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+    HasKey = EfiKeyFiFoForNotifyRemoveOneKey (TerminalDevice->EfiKeyFiFoForNotify, &Key);\r
+    CopyMem (&KeyData.Key, &Key, sizeof (EFI_INPUT_KEY));\r
+    KeyData.KeyState.KeyShiftState  = 0;\r
+    KeyData.KeyState.KeyToggleState = 0;\r
+    //\r
+    // Leave critical section\r
+    //\r
+    gBS->RestoreTPL (OldTpl);\r
+    if (!HasKey) {\r
+      break;\r
+    }\r
 \r
-  if (IsEfiKeyFiFoEmpty (TerminalDevice)) {\r
-    return EFI_NOT_READY;\r
+    for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {\r
+      CurrentNotify = CR (Link, TERMINAL_CONSOLE_IN_EX_NOTIFY, NotifyEntry, TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE);\r
+      if (IsKeyRegistered (&CurrentNotify->KeyData, &KeyData)) {\r
+        CurrentNotify->KeyNotificationFn (&KeyData);\r
+      }\r
+    }\r
   }\r
-\r
-  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -708,16 +669,14 @@ GetOneKeyFromSerial (
   //\r
   // Read one key from serial I/O device.\r
   //\r
-  Status  = SerialIo->Read (SerialIo, &Size, Output);\r
+  Status = SerialIo->Read (SerialIo, &Size, Output);\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     if (Status == EFI_TIMEOUT) {\r
       return EFI_NOT_READY;\r
     }\r
 \r
     return EFI_DEVICE_ERROR;\r
-\r
   }\r
 \r
   if (*Output == 0) {\r
@@ -734,17 +693,17 @@ GetOneKeyFromSerial (
   @param  Input                The key will be input.\r
 \r
   @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If Raw Data buffer is full before key insertion,\r
+  @retval FALSE                If Raw Data buffer is full before key insertion,\r
                                and the key is lost.\r
 \r
 **/\r
 BOOLEAN\r
 RawFiFoInsertOneKey (\r
-  TERMINAL_DEV      *TerminalDevice,\r
-  UINT8             Input\r
+  TERMINAL_DEV  *TerminalDevice,\r
+  UINT8         Input\r
   )\r
 {\r
-  UINT8 Tail;\r
+  UINT8  Tail;\r
 \r
   Tail = TerminalDevice->RawFiFo->Tail;\r
 \r
@@ -755,9 +714,9 @@ RawFiFoInsertOneKey (
     return FALSE;\r
   }\r
 \r
-  TerminalDevice->RawFiFo->Data[Tail]  = Input;\r
+  TerminalDevice->RawFiFo->Data[Tail] = Input;\r
 \r
-  TerminalDevice->RawFiFo->Tail        = (UINT8) ((Tail + 1) % (RAW_FIFO_MAX_NUMBER + 1));\r
+  TerminalDevice->RawFiFo->Tail = (UINT8)((Tail + 1) % (RAW_FIFO_MAX_NUMBER + 1));\r
 \r
   return TRUE;\r
 }\r
@@ -769,7 +728,7 @@ RawFiFoInsertOneKey (
   @param  Output               The key will be removed.\r
 \r
   @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If Raw Data FIFO buffer is empty before remove operation.\r
+  @retval FALSE                If Raw Data FIFO buffer is empty before remove operation.\r
 \r
 **/\r
 BOOLEAN\r
@@ -778,7 +737,7 @@ RawFiFoRemoveOneKey (
   UINT8         *Output\r
   )\r
 {\r
-  UINT8 Head;\r
+  UINT8  Head;\r
 \r
   Head = TerminalDevice->RawFiFo->Head;\r
 \r
@@ -790,9 +749,9 @@ RawFiFoRemoveOneKey (
     return FALSE;\r
   }\r
 \r
-  *Output                       = TerminalDevice->RawFiFo->Data[Head];\r
+  *Output = TerminalDevice->RawFiFo->Data[Head];\r
 \r
-  TerminalDevice->RawFiFo->Head  = (UINT8) ((Head + 1) % (RAW_FIFO_MAX_NUMBER + 1));\r
+  TerminalDevice->RawFiFo->Head = (UINT8)((Head + 1) % (RAW_FIFO_MAX_NUMBER + 1));\r
 \r
   return TRUE;\r
 }\r
@@ -803,7 +762,7 @@ RawFiFoRemoveOneKey (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If Raw Data FIFO buffer is empty.\r
-  @retval FLASE                If Raw Data FIFO buffer is not empty.\r
+  @retval FALSE                If Raw Data FIFO buffer is not empty.\r
 \r
 **/\r
 BOOLEAN\r
@@ -824,7 +783,7 @@ IsRawFiFoEmpty (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If Raw Data FIFO buffer is full.\r
-  @retval FLASE                If Raw Data FIFO buffer is not full.\r
+  @retval FALSE                If Raw Data FIFO buffer is not full.\r
 \r
 **/\r
 BOOLEAN\r
@@ -832,14 +791,133 @@ IsRawFiFoFull (
   TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
-  UINT8 Tail;\r
-  UINT8 Head;\r
+  UINT8  Tail;\r
+  UINT8  Head;\r
 \r
-  Tail  = TerminalDevice->RawFiFo->Tail;\r
-  Head  = TerminalDevice->RawFiFo->Head;\r
+  Tail = TerminalDevice->RawFiFo->Tail;\r
+  Head = TerminalDevice->RawFiFo->Head;\r
 \r
   if (((Tail + 1) % (RAW_FIFO_MAX_NUMBER + 1)) == Head) {\r
+    return TRUE;\r
+  }\r
+\r
+  return FALSE;\r
+}\r
+\r
+/**\r
+  Insert one pre-fetched key into the FIFO buffer.\r
+\r
+  @param  EfiKeyFiFo            Pointer to instance of EFI_KEY_FIFO.\r
+  @param  Input                 The key will be input.\r
+\r
+  @retval TRUE                  If insert successfully.\r
+  @retval FALSE                 If FIFO buffer is full before key insertion,\r
+                                and the key is lost.\r
+\r
+**/\r
+BOOLEAN\r
+EfiKeyFiFoForNotifyInsertOneKey (\r
+  EFI_KEY_FIFO   *EfiKeyFiFo,\r
+  EFI_INPUT_KEY  *Input\r
+  )\r
+{\r
+  UINT8  Tail;\r
+\r
+  Tail = EfiKeyFiFo->Tail;\r
+\r
+  if (IsEfiKeyFiFoForNotifyFull (EfiKeyFiFo)) {\r
+    //\r
+    // FIFO is full\r
+    //\r
+    return FALSE;\r
+  }\r
+\r
+  CopyMem (&EfiKeyFiFo->Data[Tail], Input, sizeof (EFI_INPUT_KEY));\r
+\r
+  EfiKeyFiFo->Tail = (UINT8)((Tail + 1) % (FIFO_MAX_NUMBER + 1));\r
+\r
+  return TRUE;\r
+}\r
+\r
+/**\r
+  Remove one pre-fetched key out of the FIFO buffer.\r
+\r
+  @param  EfiKeyFiFo            Pointer to instance of EFI_KEY_FIFO.\r
+  @param  Output                The key will be removed.\r
+\r
+  @retval TRUE                  If remove successfully.\r
+  @retval FALSE                 If FIFO buffer is empty before remove operation.\r
+\r
+**/\r
+BOOLEAN\r
+EfiKeyFiFoForNotifyRemoveOneKey (\r
+  EFI_KEY_FIFO   *EfiKeyFiFo,\r
+  EFI_INPUT_KEY  *Output\r
+  )\r
+{\r
+  UINT8  Head;\r
+\r
+  Head = EfiKeyFiFo->Head;\r
+  ASSERT (Head < FIFO_MAX_NUMBER + 1);\r
+\r
+  if (IsEfiKeyFiFoForNotifyEmpty (EfiKeyFiFo)) {\r
+    //\r
+    // FIFO is empty\r
+    //\r
+    Output->ScanCode    = SCAN_NULL;\r
+    Output->UnicodeChar = 0;\r
+    return FALSE;\r
+  }\r
+\r
+  CopyMem (Output, &EfiKeyFiFo->Data[Head], sizeof (EFI_INPUT_KEY));\r
+\r
+  EfiKeyFiFo->Head = (UINT8)((Head + 1) % (FIFO_MAX_NUMBER + 1));\r
+\r
+  return TRUE;\r
+}\r
+\r
+/**\r
+  Clarify whether FIFO buffer is empty.\r
+\r
+  @param  EfiKeyFiFo            Pointer to instance of EFI_KEY_FIFO.\r
+\r
+  @retval TRUE                  If FIFO buffer is empty.\r
+  @retval FALSE                 If FIFO buffer is not empty.\r
+\r
+**/\r
+BOOLEAN\r
+IsEfiKeyFiFoForNotifyEmpty (\r
+  EFI_KEY_FIFO  *EfiKeyFiFo\r
+  )\r
+{\r
+  if (EfiKeyFiFo->Head == EfiKeyFiFo->Tail) {\r
+    return TRUE;\r
+  } else {\r
+    return FALSE;\r
+  }\r
+}\r
+\r
+/**\r
+  Clarify whether FIFO buffer is full.\r
 \r
+  @param  EfiKeyFiFo            Pointer to instance of EFI_KEY_FIFO.\r
+\r
+  @retval TRUE                  If FIFO buffer is full.\r
+  @retval FALSE                 If FIFO buffer is not full.\r
+\r
+**/\r
+BOOLEAN\r
+IsEfiKeyFiFoForNotifyFull (\r
+  EFI_KEY_FIFO  *EfiKeyFiFo\r
+  )\r
+{\r
+  UINT8  Tail;\r
+  UINT8  Head;\r
+\r
+  Tail = EfiKeyFiFo->Tail;\r
+  Head = EfiKeyFiFo->Head;\r
+\r
+  if (((Tail + 1) % (FIFO_MAX_NUMBER + 1)) == Head) {\r
     return TRUE;\r
   }\r
 \r
@@ -853,20 +931,50 @@ IsRawFiFoFull (
   @param  Key                  The key will be input.\r
 \r
   @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If FIFO buffer is full before key insertion,\r
+  @retval FALSE                If FIFO buffer is full before key insertion,\r
                                and the key is lost.\r
 \r
 **/\r
 BOOLEAN\r
 EfiKeyFiFoInsertOneKey (\r
-  TERMINAL_DEV      *TerminalDevice,\r
-  EFI_INPUT_KEY     Key\r
+  TERMINAL_DEV   *TerminalDevice,\r
+  EFI_INPUT_KEY  *Key\r
   )\r
 {\r
-  UINT8 Tail;\r
+  UINT8                          Tail;\r
+  LIST_ENTRY                     *Link;\r
+  LIST_ENTRY                     *NotifyList;\r
+  TERMINAL_CONSOLE_IN_EX_NOTIFY  *CurrentNotify;\r
+  EFI_KEY_DATA                   KeyData;\r
 \r
   Tail = TerminalDevice->EfiKeyFiFo->Tail;\r
-  ASSERT (Tail < FIFO_MAX_NUMBER + 1);\r
+\r
+  CopyMem (&KeyData.Key, Key, sizeof (EFI_INPUT_KEY));\r
+  KeyData.KeyState.KeyShiftState  = 0;\r
+  KeyData.KeyState.KeyToggleState = 0;\r
+\r
+  //\r
+  // Signal KeyNotify process event if this key pressed matches any key registered.\r
+  //\r
+  NotifyList = &TerminalDevice->NotifyList;\r
+  for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {\r
+    CurrentNotify = CR (\r
+                      Link,\r
+                      TERMINAL_CONSOLE_IN_EX_NOTIFY,\r
+                      NotifyEntry,\r
+                      TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE\r
+                      );\r
+    if (IsKeyRegistered (&CurrentNotify->KeyData, &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
+      EfiKeyFiFoForNotifyInsertOneKey (TerminalDevice->EfiKeyFiFoForNotify, Key);\r
+      gBS->SignalEvent (TerminalDevice->KeyNotifyProcessEvent);\r
+      break;\r
+    }\r
+  }\r
 \r
   if (IsEfiKeyFiFoFull (TerminalDevice)) {\r
     //\r
@@ -875,9 +983,9 @@ EfiKeyFiFoInsertOneKey (
     return FALSE;\r
   }\r
 \r
-  TerminalDevice->EfiKeyFiFo->Data[Tail] = Key;\r
+  CopyMem (&TerminalDevice->EfiKeyFiFo->Data[Tail], Key, sizeof (EFI_INPUT_KEY));\r
 \r
-  TerminalDevice->EfiKeyFiFo->Tail       = (UINT8) ((Tail + 1) % (FIFO_MAX_NUMBER + 1));\r
+  TerminalDevice->EfiKeyFiFo->Tail = (UINT8)((Tail + 1) % (FIFO_MAX_NUMBER + 1));\r
 \r
   return TRUE;\r
 }\r
@@ -889,16 +997,16 @@ EfiKeyFiFoInsertOneKey (
   @param  Output               The key will be removed.\r
 \r
   @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If FIFO buffer is empty before remove operation.\r
+  @retval FALSE                If FIFO buffer is empty before remove operation.\r
 \r
 **/\r
 BOOLEAN\r
 EfiKeyFiFoRemoveOneKey (\r
-  TERMINAL_DEV  *TerminalDevice,\r
-  EFI_INPUT_KEY *Output\r
+  TERMINAL_DEV   *TerminalDevice,\r
+  EFI_INPUT_KEY  *Output\r
   )\r
 {\r
-  UINT8 Head;\r
+  UINT8  Head;\r
 \r
   Head = TerminalDevice->EfiKeyFiFo->Head;\r
   ASSERT (Head < FIFO_MAX_NUMBER + 1);\r
@@ -912,9 +1020,9 @@ EfiKeyFiFoRemoveOneKey (
     return FALSE;\r
   }\r
 \r
-  *Output                         = TerminalDevice->EfiKeyFiFo->Data[Head];\r
+  CopyMem (Output, &TerminalDevice->EfiKeyFiFo->Data[Head], sizeof (EFI_INPUT_KEY));\r
 \r
-  TerminalDevice->EfiKeyFiFo->Head = (UINT8) ((Head + 1) % (FIFO_MAX_NUMBER + 1));\r
+  TerminalDevice->EfiKeyFiFo->Head = (UINT8)((Head + 1) % (FIFO_MAX_NUMBER + 1));\r
 \r
   return TRUE;\r
 }\r
@@ -925,7 +1033,7 @@ EfiKeyFiFoRemoveOneKey (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If FIFO buffer is empty.\r
-  @retval FLASE                If FIFO buffer is not empty.\r
+  @retval FALSE                If FIFO buffer is not empty.\r
 \r
 **/\r
 BOOLEAN\r
@@ -946,7 +1054,7 @@ IsEfiKeyFiFoEmpty (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If FIFO buffer is full.\r
-  @retval FLASE                If FIFO buffer is not full.\r
+  @retval FALSE                If FIFO buffer is not full.\r
 \r
 **/\r
 BOOLEAN\r
@@ -954,14 +1062,13 @@ IsEfiKeyFiFoFull (
   TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
-  UINT8 Tail;\r
-  UINT8 Head;\r
+  UINT8  Tail;\r
+  UINT8  Head;\r
 \r
-  Tail  = TerminalDevice->EfiKeyFiFo->Tail;\r
-  Head  = TerminalDevice->EfiKeyFiFo->Head;\r
+  Tail = TerminalDevice->EfiKeyFiFo->Tail;\r
+  Head = TerminalDevice->EfiKeyFiFo->Head;\r
 \r
   if (((Tail + 1) % (FIFO_MAX_NUMBER + 1)) == Head) {\r
-\r
     return TRUE;\r
   }\r
 \r
@@ -975,22 +1082,21 @@ IsEfiKeyFiFoFull (
   @param  Input                The key will be input.\r
 \r
   @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If Unicode FIFO buffer is full before key insertion,\r
+  @retval FALSE                If Unicode FIFO buffer is full before key insertion,\r
                                and the key is lost.\r
 \r
 **/\r
 BOOLEAN\r
 UnicodeFiFoInsertOneKey (\r
-  TERMINAL_DEV      *TerminalDevice,\r
-  UINT16            Input\r
+  TERMINAL_DEV  *TerminalDevice,\r
+  UINT16        Input\r
   )\r
 {\r
-  UINT8 Tail;\r
+  UINT8  Tail;\r
 \r
   Tail = TerminalDevice->UnicodeFiFo->Tail;\r
   ASSERT (Tail < FIFO_MAX_NUMBER + 1);\r
 \r
-\r
   if (IsUnicodeFiFoFull (TerminalDevice)) {\r
     //\r
     // Unicode FIFO is full\r
@@ -998,47 +1104,36 @@ UnicodeFiFoInsertOneKey (
     return FALSE;\r
   }\r
 \r
-  TerminalDevice->UnicodeFiFo->Data[Tail]  = Input;\r
+  TerminalDevice->UnicodeFiFo->Data[Tail] = Input;\r
 \r
-  TerminalDevice->UnicodeFiFo->Tail        = (UINT8) ((Tail + 1) % (FIFO_MAX_NUMBER + 1));\r
+  TerminalDevice->UnicodeFiFo->Tail = (UINT8)((Tail + 1) % (FIFO_MAX_NUMBER + 1));\r
 \r
   return TRUE;\r
 }\r
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r
+  The caller should guarantee that Unicode FIFO buffer is not empty\r
+  by IsUnicodeFiFoEmpty ().\r
 \r
   @param  TerminalDevice       Terminal driver private structure.\r
   @param  Output               The key will be removed.\r
 \r
-  @retval TRUE                 If insert successfully.\r
-  @retval FLASE                If Unicode FIFO buffer is empty before remove operation.\r
-\r
 **/\r
-BOOLEAN\r
+VOID\r
 UnicodeFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT16        *Output\r
   )\r
 {\r
-  UINT8 Head;\r
+  UINT8  Head;\r
 \r
   Head = TerminalDevice->UnicodeFiFo->Head;\r
   ASSERT (Head < FIFO_MAX_NUMBER + 1);\r
 \r
-  if (IsUnicodeFiFoEmpty (TerminalDevice)) {\r
-    //\r
-    //  FIFO is empty\r
-    //\r
-    Output = NULL;\r
-    return FALSE;\r
-  }\r
-\r
   *Output = TerminalDevice->UnicodeFiFo->Data[Head];\r
 \r
-  TerminalDevice->UnicodeFiFo->Head = (UINT8) ((Head + 1) % (FIFO_MAX_NUMBER + 1));\r
-\r
-  return TRUE;\r
+  TerminalDevice->UnicodeFiFo->Head = (UINT8)((Head + 1) % (FIFO_MAX_NUMBER + 1));\r
 }\r
 \r
 /**\r
@@ -1047,7 +1142,7 @@ UnicodeFiFoRemoveOneKey (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If Unicode FIFO buffer is empty.\r
-  @retval FLASE                If Unicode FIFO buffer is not empty.\r
+  @retval FALSE                If Unicode FIFO buffer is not empty.\r
 \r
 **/\r
 BOOLEAN\r
@@ -1068,7 +1163,7 @@ IsUnicodeFiFoEmpty (
   @param  TerminalDevice       Terminal driver private structure\r
 \r
   @retval TRUE                 If Unicode FIFO buffer is full.\r
-  @retval FLASE                If Unicode FIFO buffer is not full.\r
+  @retval FALSE                If Unicode FIFO buffer is not full.\r
 \r
 **/\r
 BOOLEAN\r
@@ -1076,46 +1171,19 @@ IsUnicodeFiFoFull (
   TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
-  UINT8 Tail;\r
-  UINT8 Head;\r
+  UINT8  Tail;\r
+  UINT8  Head;\r
 \r
-  Tail  = TerminalDevice->UnicodeFiFo->Tail;\r
-  Head  = TerminalDevice->UnicodeFiFo->Head;\r
+  Tail = TerminalDevice->UnicodeFiFo->Tail;\r
+  Head = TerminalDevice->UnicodeFiFo->Head;\r
 \r
   if (((Tail + 1) % (FIFO_MAX_NUMBER + 1)) == Head) {\r
-\r
     return TRUE;\r
   }\r
 \r
   return FALSE;\r
 }\r
 \r
-/**\r
-  Count Unicode FIFO buffer.\r
-\r
-  @param  TerminalDevice       Terminal driver private structure\r
-\r
-  @return The count in bytes of Unicode FIFO.\r
-\r
-**/\r
-UINT8\r
-UnicodeFiFoGetKeyCount (\r
-  TERMINAL_DEV    *TerminalDevice\r
-  )\r
-{\r
-  UINT8 Tail;\r
-  UINT8 Head;\r
-\r
-  Tail  = TerminalDevice->UnicodeFiFo->Tail;\r
-  Head  = TerminalDevice->UnicodeFiFo->Head;\r
-\r
-  if (Tail >= Head) {\r
-    return (UINT8) (Tail - Head);\r
-  } else {\r
-    return (UINT8) (Tail + FIFO_MAX_NUMBER + 1 - Head);\r
-  }\r
-}\r
-\r
 /**\r
   Update the Unicode characters from a terminal input device into EFI Keys FIFO.\r
 \r
@@ -1124,57 +1192,60 @@ UnicodeFiFoGetKeyCount (
 **/\r
 VOID\r
 UnicodeToEfiKeyFlushState (\r
-  IN  TERMINAL_DEV    *TerminalDevice\r
+  IN  TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
-  EFI_INPUT_KEY Key;\r
-  UINT32        InputState;\r
+  EFI_INPUT_KEY  Key;\r
+  UINT32         InputState;\r
 \r
   InputState = TerminalDevice->InputState;\r
 \r
+  if (IsEfiKeyFiFoFull (TerminalDevice)) {\r
+    return;\r
+  }\r
+\r
   if ((InputState & INPUT_STATE_ESC) != 0) {\r
     Key.ScanCode    = SCAN_ESC;\r
     Key.UnicodeChar = 0;\r
-    EfiKeyFiFoInsertOneKey (TerminalDevice, Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 \r
   if ((InputState & INPUT_STATE_CSI) != 0) {\r
     Key.ScanCode    = SCAN_NULL;\r
     Key.UnicodeChar = CSI;\r
-    EfiKeyFiFoInsertOneKey (TerminalDevice, Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 \r
   if ((InputState & INPUT_STATE_LEFTOPENBRACKET) != 0) {\r
     Key.ScanCode    = SCAN_NULL;\r
     Key.UnicodeChar = LEFTOPENBRACKET;\r
-    EfiKeyFiFoInsertOneKey (TerminalDevice, Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 \r
   if ((InputState & INPUT_STATE_O) != 0) {\r
     Key.ScanCode    = SCAN_NULL;\r
     Key.UnicodeChar = 'O';\r
-    EfiKeyFiFoInsertOneKey (TerminalDevice, Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 \r
   if ((InputState & INPUT_STATE_2) != 0) {\r
     Key.ScanCode    = SCAN_NULL;\r
     Key.UnicodeChar = '2';\r
-    EfiKeyFiFoInsertOneKey (TerminalDevice, Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 \r
   //\r
   // Cancel the timer.\r
   //\r
   gBS->SetTimer (\r
-        TerminalDevice->TwoSecondTimeOut,\r
-        TimerCancel,\r
-        0\r
-        );\r
+         TerminalDevice->TwoSecondTimeOut,\r
+         TimerCancel,\r
+         0\r
+         );\r
 \r
   TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
 }\r
 \r
-\r
 /**\r
   Converts a stream of Unicode characters from a terminal input device into EFI Keys that\r
   can be read through the Simple Input Protocol.\r
@@ -1190,6 +1261,10 @@ UnicodeToEfiKeyFlushState (
   There is one special input sequence that will force the system to reset.\r
   This is ESC R ESC r ESC R.\r
 \r
+  Note: current implementation support terminal types include: PC ANSI, VT100+/VTUTF8, VT100.\r
+        The table below is not same with UEFI Spec 2.3 Appendix B Table 201(not support ANSI X3.64 /\r
+        DEC VT200-500 and extra support PC ANSI, VT100)since UEFI Table 201 is just an example.\r
+\r
   Symbols used in table below\r
   ===========================\r
     ESC = 0x1B\r
@@ -1231,6 +1306,27 @@ UnicodeToEfiKeyFlushState (
   | F12     | 0x16 |           | ESC @    |          |\r
   +=========+======+===========+==========+==========+\r
 \r
+Putty function key map:\r
+  +=========+======+===========+=============+=============+=============+=========+\r
+  |         | EFI  |           |             |             |             |         |\r
+  |         | Scan |           |             |  Normal     |             |         |\r
+  |   KEY   | Code |  VT100+   | Xterm R6    |  VT400      | Linux       | SCO     |\r
+  +=========+======+===========+=============+=============+=============+=========+\r
+  | F1      | 0x0B | ESC O P   | ESC O P     | ESC [ 1 1 ~ | ESC [ [ A   | ESC [ M |\r
+  | F2      | 0x0C | ESC O Q   | ESC O Q     | ESC [ 1 2 ~ | ESC [ [ B   | ESC [ N |\r
+  | F3      | 0x0D | ESC O R   | ESC O R     | ESC [ 1 3 ~ | ESC [ [ C   | ESC [ O |\r
+  | F4      | 0x0E | ESC O S   | ESC O S     | ESC [ 1 4 ~ | ESC [ [ D   | ESC [ P |\r
+  | F5      | 0x0F | ESC O T   | ESC [ 1 5 ~ | ESC [ 1 5 ~ | ESC [ [ E   | ESC [ Q |\r
+  | F6      | 0x10 | ESC O U   | ESC [ 1 7 ~ | ESC [ 1 7 ~ | ESC [ 1 7 ~ | ESC [ R |\r
+  | F7      | 0x11 | ESC O V   | ESC [ 1 8 ~ | ESC [ 1 8 ~ | ESC [ 1 8 ~ | ESC [ S |\r
+  | F8      | 0x12 | ESC O W   | ESC [ 1 9 ~ | ESC [ 1 9 ~ | ESC [ 1 9 ~ | ESC [ T |\r
+  | F9      | 0x13 | ESC O X   | ESC [ 2 0 ~ | ESC [ 2 0 ~ | ESC [ 2 0 ~ | ESC [ U |\r
+  | F10     | 0x14 | ESC O Y   | ESC [ 2 1 ~ | ESC [ 2 1 ~ | ESC [ 2 1 ~ | ESC [ V |\r
+  | Escape  | 0x17 | ESC       | ESC         | ESC         | ESC         | ESC     |\r
+  | F11     | 0x15 | ESC O Z   | ESC [ 2 3 ~ | ESC [ 2 3 ~ | ESC [ 2 3 ~ | ESC [ W |\r
+  | F12     | 0x16 | ESC O [   | ESC [ 2 4 ~ | ESC [ 2 4 ~ | ESC [ 2 4 ~ | ESC [ X |\r
+  +=========+======+===========+=============+=============+=============+=========+\r
+\r
   Special Mappings\r
   ================\r
   ESC R ESC r ESC R = Reset System\r
@@ -1240,14 +1336,14 @@ UnicodeToEfiKeyFlushState (
 **/\r
 VOID\r
 UnicodeToEfiKey (\r
-  IN  TERMINAL_DEV    *TerminalDevice\r
+  IN  TERMINAL_DEV  *TerminalDevice\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_STATUS          TimerStatus;\r
-  UINT16              UnicodeChar;\r
-  EFI_INPUT_KEY       Key;\r
-  BOOLEAN             SetDefaultResetState;\r
+  EFI_STATUS     Status;\r
+  EFI_STATUS     TimerStatus;\r
+  UINT16         UnicodeChar;\r
+  EFI_INPUT_KEY  Key;\r
+  BOOLEAN        SetDefaultResetState;\r
 \r
   TimerStatus = gBS->CheckEvent (TerminalDevice->TwoSecondTimeOut);\r
 \r
@@ -1256,8 +1352,7 @@ UnicodeToEfiKey (
     TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
   }\r
 \r
-  while (!IsUnicodeFiFoEmpty(TerminalDevice)) {\r
-\r
+  while (!IsUnicodeFiFoEmpty (TerminalDevice) && !IsEfiKeyFiFoFull (TerminalDevice)) {\r
     if (TerminalDevice->InputState != INPUT_STATE_DEFAULT) {\r
       //\r
       // Check to see if the 2 seconds timer has expired\r
@@ -1277,328 +1372,714 @@ UnicodeToEfiKey (
     SetDefaultResetState = TRUE;\r
 \r
     switch (TerminalDevice->InputState) {\r
-    case INPUT_STATE_DEFAULT:\r
+      case INPUT_STATE_DEFAULT:\r
 \r
-      break;\r
+        break;\r
 \r
-    case INPUT_STATE_ESC:\r
+      case INPUT_STATE_ESC:\r
 \r
-      if (UnicodeChar == LEFTOPENBRACKET) {\r
-        TerminalDevice->InputState |= INPUT_STATE_LEFTOPENBRACKET;\r
-        TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
-        continue;\r
-      }\r
+        if (UnicodeChar == LEFTOPENBRACKET) {\r
+          TerminalDevice->InputState |= INPUT_STATE_LEFTOPENBRACKET;\r
+          TerminalDevice->ResetState  = RESET_STATE_DEFAULT;\r
+          continue;\r
+        }\r
 \r
-      if (UnicodeChar == 'O' && TerminalDevice->TerminalType == VT100TYPE) {\r
-        TerminalDevice->InputState |= INPUT_STATE_O;\r
-        TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
-        continue;\r
-      }\r
+        if ((UnicodeChar == 'O') && ((TerminalDevice->TerminalType == TerminalTypeVt100) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeTtyTerm) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeVt100Plus)))\r
+        {\r
+          TerminalDevice->InputState |= INPUT_STATE_O;\r
+          TerminalDevice->ResetState  = RESET_STATE_DEFAULT;\r
+          continue;\r
+        }\r
+\r
+        Key.ScanCode = SCAN_NULL;\r
 \r
-      Key.ScanCode = SCAN_NULL;\r
+        if ((TerminalDevice->TerminalType == TerminalTypeVt100Plus) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVtUtf8))\r
+        {\r
+          switch (UnicodeChar) {\r
+            case '1':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case '2':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case '3':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case '4':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+            case '5':\r
+              Key.ScanCode = SCAN_F5;\r
+              break;\r
+            case '6':\r
+              Key.ScanCode = SCAN_F6;\r
+              break;\r
+            case '7':\r
+              Key.ScanCode = SCAN_F7;\r
+              break;\r
+            case '8':\r
+              Key.ScanCode = SCAN_F8;\r
+              break;\r
+            case '9':\r
+              Key.ScanCode = SCAN_F9;\r
+              break;\r
+            case '0':\r
+              Key.ScanCode = SCAN_F10;\r
+              break;\r
+            case '!':\r
+              Key.ScanCode = SCAN_F11;\r
+              break;\r
+            case '@':\r
+              Key.ScanCode = SCAN_F12;\r
+              break;\r
+            case 'h':\r
+              Key.ScanCode = SCAN_HOME;\r
+              break;\r
+            case 'k':\r
+              Key.ScanCode = SCAN_END;\r
+              break;\r
+            case '+':\r
+              Key.ScanCode = SCAN_INSERT;\r
+              break;\r
+            case '-':\r
+              Key.ScanCode = SCAN_DELETE;\r
+              break;\r
+            case '/':\r
+              Key.ScanCode = SCAN_PAGE_DOWN;\r
+              break;\r
+            case '?':\r
+              Key.ScanCode = SCAN_PAGE_UP;\r
+              break;\r
+            default:\r
+              break;\r
+          }\r
+        }\r
 \r
-      if (TerminalDevice->TerminalType == VT100PLUSTYPE ||\r
-          TerminalDevice->TerminalType == VTUTF8TYPE) {\r
         switch (UnicodeChar) {\r
-        case '1':\r
-          Key.ScanCode = SCAN_F1;\r
-          break;\r
-        case '2':\r
-          Key.ScanCode = SCAN_F2;\r
-          break;\r
-        case '3':\r
-          Key.ScanCode = SCAN_F3;\r
-          break;\r
-        case '4':\r
-          Key.ScanCode = SCAN_F4;\r
-          break;\r
-        case '5':\r
-          Key.ScanCode = SCAN_F5;\r
-          break;\r
-        case '6':\r
-          Key.ScanCode = SCAN_F6;\r
-          break;\r
-        case '7':\r
-          Key.ScanCode = SCAN_F7;\r
-          break;\r
-        case '8':\r
-          Key.ScanCode = SCAN_F8;\r
-          break;\r
-        case '9':\r
-          Key.ScanCode = SCAN_F9;\r
-          break;\r
-        case '0':\r
-          Key.ScanCode = SCAN_F10;\r
-          break;\r
-        case '!':\r
-          Key.ScanCode = SCAN_F11;\r
-          break;\r
-        case '@':\r
-          Key.ScanCode = SCAN_F12;\r
-          break;\r
-        case 'h':\r
-          Key.ScanCode = SCAN_HOME;\r
-          break;\r
-        case 'k':\r
-          Key.ScanCode = SCAN_END;\r
-          break;\r
-        case '+':\r
-          Key.ScanCode = SCAN_INSERT;\r
-          break;\r
-        case '-':\r
-          Key.ScanCode = SCAN_DELETE;\r
-          break;\r
-        case '/':\r
-          Key.ScanCode = SCAN_PAGE_DOWN;\r
-          break;\r
-        case '?':\r
-          Key.ScanCode = SCAN_PAGE_UP;\r
-          break;\r
-        default :\r
-          break;\r
+          case 'R':\r
+            if (TerminalDevice->ResetState == RESET_STATE_DEFAULT) {\r
+              TerminalDevice->ResetState = RESET_STATE_ESC_R;\r
+              SetDefaultResetState       = FALSE;\r
+            } else if (TerminalDevice->ResetState == RESET_STATE_ESC_R_ESC_R) {\r
+              gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
+            }\r
+\r
+            Key.ScanCode = SCAN_NULL;\r
+            break;\r
+          case 'r':\r
+            if (TerminalDevice->ResetState == RESET_STATE_ESC_R) {\r
+              TerminalDevice->ResetState = RESET_STATE_ESC_R_ESC_R;\r
+              SetDefaultResetState       = FALSE;\r
+            }\r
+\r
+            Key.ScanCode = SCAN_NULL;\r
+            break;\r
+          default:\r
+            break;\r
         }\r
-      }\r
 \r
-      switch (UnicodeChar) {\r
-      case 'R':\r
-        if (TerminalDevice->ResetState == RESET_STATE_DEFAULT) {\r
-          TerminalDevice->ResetState = RESET_STATE_ESC_R;\r
-          SetDefaultResetState = FALSE;\r
-        } else if (TerminalDevice->ResetState == RESET_STATE_ESC_R_ESC_r) {\r
-          gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
+        if (SetDefaultResetState) {\r
+          TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
         }\r
-        Key.ScanCode = SCAN_NULL;\r
-        break;\r
-      case 'r':\r
-        if (TerminalDevice->ResetState == RESET_STATE_ESC_R) {\r
-          TerminalDevice->ResetState = RESET_STATE_ESC_R_ESC_r;\r
-          SetDefaultResetState = FALSE;\r
+\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
         }\r
-        Key.ScanCode = SCAN_NULL;\r
-        break;\r
-      default :\r
+\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
+\r
         break;\r
-      }\r
 \r
-      if (SetDefaultResetState) {\r
+      case INPUT_STATE_ESC | INPUT_STATE_O:\r
+\r
         TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
-      }\r
 \r
-      if (Key.ScanCode != SCAN_NULL) {\r
-        Key.UnicodeChar = 0;\r
-        EfiKeyFiFoInsertOneKey (TerminalDevice,Key);\r
-        TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+        Key.ScanCode = SCAN_NULL;\r
+\r
+        if (TerminalDevice->TerminalType == TerminalTypeVt100) {\r
+          switch (UnicodeChar) {\r
+            case 'P':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case 'Q':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case 'w':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case 'x':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+            case 't':\r
+              Key.ScanCode = SCAN_F5;\r
+              break;\r
+            case 'u':\r
+              Key.ScanCode = SCAN_F6;\r
+              break;\r
+            case 'q':\r
+              Key.ScanCode = SCAN_F7;\r
+              break;\r
+            case 'r':\r
+              Key.ScanCode = SCAN_F8;\r
+              break;\r
+            case 'p':\r
+              Key.ScanCode = SCAN_F9;\r
+              break;\r
+            case 'M':\r
+              Key.ScanCode = SCAN_F10;\r
+              break;\r
+            default:\r
+              break;\r
+          }\r
+        } else if (TerminalDevice->TerminalType == TerminalTypeTtyTerm) {\r
+          /* Also accept VT100 escape codes for F1-F4, HOME and END for TTY term */\r
+          switch (UnicodeChar) {\r
+            case 'P':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case 'Q':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case 'R':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case 'S':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+            case 'H':\r
+              Key.ScanCode = SCAN_HOME;\r
+              break;\r
+            case 'F':\r
+              Key.ScanCode = SCAN_END;\r
+              break;\r
+          }\r
+        } else if (TerminalDevice->TerminalType == TerminalTypeVt100Plus) {\r
+          switch (UnicodeChar) {\r
+            case 'P':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case 'Q':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case 'R':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case 'S':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+            case 'T':\r
+              Key.ScanCode = SCAN_F5;\r
+              break;\r
+            case 'U':\r
+              Key.ScanCode = SCAN_F6;\r
+              break;\r
+            case 'V':\r
+              Key.ScanCode = SCAN_F7;\r
+              break;\r
+            case 'W':\r
+              Key.ScanCode = SCAN_F8;\r
+              break;\r
+            case 'X':\r
+              Key.ScanCode = SCAN_F9;\r
+              break;\r
+            case 'Y':\r
+              Key.ScanCode = SCAN_F10;\r
+              break;\r
+            case 'Z':\r
+              Key.ScanCode = SCAN_F11;\r
+              break;\r
+            case '[':\r
+              Key.ScanCode = SCAN_F12;\r
+              break;\r
+          }\r
+        } else if (TerminalDevice->TerminalType == TerminalTypeXtermR6) {\r
+          switch (UnicodeChar) {\r
+            case 'P':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case 'Q':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case 'R':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case 'S':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+          }\r
+        }\r
+\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
+\r
         UnicodeToEfiKeyFlushState (TerminalDevice);\r
-        continue;\r
-      }\r
 \r
-      UnicodeToEfiKeyFlushState (TerminalDevice);\r
+        break;\r
 \r
-      break;\r
+      case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET:\r
 \r
-    case INPUT_STATE_ESC | INPUT_STATE_O:\r
+        if ((UnicodeChar == '1') && ((TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeVt400) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeLinux)))\r
+        {\r
+          TerminalDevice->InputState |= INPUT_STATE_1;\r
+          continue;\r
+        }\r
 \r
-      TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
+        if ((UnicodeChar == '2') && ((TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeVt400) ||\r
+                                     (TerminalDevice->TerminalType == TerminalTypeLinux)))\r
+        {\r
+          TerminalDevice->InputState |= INPUT_STATE_2;\r
+          continue;\r
+        }\r
 \r
-      Key.ScanCode = SCAN_NULL;\r
+        if ((UnicodeChar == LEFTOPENBRACKET) && (TerminalDevice->TerminalType == TerminalTypeLinux)) {\r
+          TerminalDevice->InputState |= INPUT_STATE_LEFTOPENBRACKET_2ND;\r
+          continue;\r
+        }\r
 \r
-      if (TerminalDevice->TerminalType == VT100TYPE) {\r
-        switch (UnicodeChar) {\r
-        case 'P':\r
-          Key.ScanCode = SCAN_F1;\r
-          break;\r
-        case 'Q':\r
-          Key.ScanCode = SCAN_F2;\r
-          break;\r
-        case 'w':\r
-          Key.ScanCode = SCAN_F3;\r
-          break;\r
-        case 'x':\r
-          Key.ScanCode = SCAN_F4;\r
-          break;\r
-        case 't':\r
-          Key.ScanCode = SCAN_F5;\r
-          break;\r
-        case 'u':\r
-          Key.ScanCode = SCAN_F6;\r
-          break;\r
-        case 'q':\r
-          Key.ScanCode = SCAN_F7;\r
-          break;\r
-        case 'r':\r
-          Key.ScanCode = SCAN_F8;\r
-          break;\r
-        case 'p':\r
-          Key.ScanCode = SCAN_F9;\r
-          break;\r
-        case 'M':\r
-          Key.ScanCode = SCAN_F10;\r
-          break;\r
-        default :\r
-          break;\r
+        TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
+\r
+        Key.ScanCode = SCAN_NULL;\r
+\r
+        if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVt100) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVt100Plus) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVtUtf8) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeTtyTerm) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeLinux) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVt400) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+        {\r
+          switch (UnicodeChar) {\r
+            case 'A':\r
+              Key.ScanCode = SCAN_UP;\r
+              break;\r
+            case 'B':\r
+              Key.ScanCode = SCAN_DOWN;\r
+              break;\r
+            case 'C':\r
+              Key.ScanCode = SCAN_RIGHT;\r
+              break;\r
+            case 'D':\r
+              Key.ScanCode = SCAN_LEFT;\r
+              break;\r
+            case 'H':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeVt100) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeTtyTerm))\r
+              {\r
+                Key.ScanCode = SCAN_HOME;\r
+              }\r
+\r
+              break;\r
+            case 'F':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeTtyTerm))\r
+              {\r
+                Key.ScanCode = SCAN_END;\r
+              }\r
+\r
+              break;\r
+            case 'K':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt100) {\r
+                Key.ScanCode = SCAN_END;\r
+              }\r
+\r
+              break;\r
+            case 'L':\r
+            case '@':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeVt100))\r
+              {\r
+                Key.ScanCode = SCAN_INSERT;\r
+              }\r
+\r
+              break;\r
+            case 'X':\r
+              if (TerminalDevice->TerminalType == TerminalTypePcAnsi) {\r
+                Key.ScanCode = SCAN_DELETE;\r
+              } else if (TerminalDevice->TerminalType == TerminalTypeSCO) {\r
+                Key.ScanCode = SCAN_F12;\r
+              }\r
+\r
+              break;\r
+            case 'P':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt100) {\r
+                Key.ScanCode = SCAN_DELETE;\r
+              } else if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                         (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F4;\r
+              }\r
+\r
+              break;\r
+            case 'I':\r
+              if (TerminalDevice->TerminalType == TerminalTypePcAnsi) {\r
+                Key.ScanCode = SCAN_PAGE_UP;\r
+              }\r
+\r
+              break;\r
+            case 'V':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F10;\r
+              }\r
+\r
+              break;\r
+            case '?':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt100) {\r
+                Key.ScanCode = SCAN_PAGE_UP;\r
+              }\r
+\r
+              break;\r
+            case 'G':\r
+              if (TerminalDevice->TerminalType == TerminalTypePcAnsi) {\r
+                Key.ScanCode = SCAN_PAGE_DOWN;\r
+              }\r
+\r
+              break;\r
+            case 'U':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F9;\r
+              }\r
+\r
+              break;\r
+            case '/':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt100) {\r
+                Key.ScanCode = SCAN_PAGE_DOWN;\r
+              }\r
+\r
+              break;\r
+            case 'M':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F1;\r
+              }\r
+\r
+              break;\r
+            case 'N':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F2;\r
+              }\r
+\r
+              break;\r
+            case 'O':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F3;\r
+              }\r
+\r
+              break;\r
+            case 'Q':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F5;\r
+              }\r
+\r
+              break;\r
+            case 'R':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F6;\r
+              }\r
+\r
+              break;\r
+            case 'S':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F7;\r
+              }\r
+\r
+              break;\r
+            case 'T':\r
+              if ((TerminalDevice->TerminalType == TerminalTypePcAnsi) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeSCO))\r
+              {\r
+                Key.ScanCode = SCAN_F8;\r
+              }\r
+\r
+              break;\r
+            case 'W':\r
+              if (TerminalDevice->TerminalType == TerminalTypeSCO) {\r
+                Key.ScanCode = SCAN_F11;\r
+              }\r
+\r
+              break;\r
+            default:\r
+              break;\r
+          }\r
         }\r
-      }\r
 \r
-      if (Key.ScanCode != SCAN_NULL) {\r
-        Key.UnicodeChar = 0;\r
-        EfiKeyFiFoInsertOneKey (TerminalDevice,Key);\r
-        TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
-        UnicodeToEfiKeyFlushState (TerminalDevice);\r
-        continue;\r
-      }\r
+        /*\r
+         * The VT220 escape codes that the TTY terminal accepts all have\r
+         * numeric codes, and there are no ambiguous prefixes shared with\r
+         * other terminal types.\r
+         */\r
+        if ((TerminalDevice->TerminalType == TerminalTypeTtyTerm) &&\r
+            (Key.ScanCode == SCAN_NULL) &&\r
+            (UnicodeChar >= '0') &&\r
+            (UnicodeChar <= '9'))\r
+        {\r
+          TerminalDevice->TtyEscapeStr[0] = UnicodeChar;\r
+          TerminalDevice->TtyEscapeIndex  = 1;\r
+          TerminalDevice->InputState     |= INPUT_STATE_LEFTOPENBRACKET_TTY;\r
+          continue;\r
+        }\r
 \r
-      UnicodeToEfiKeyFlushState (TerminalDevice);\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
 \r
-      break;\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
 \r
-    case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET:\r
+        break;\r
 \r
-      TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
+      case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET | INPUT_STATE_1:\r
 \r
-      Key.ScanCode = SCAN_NULL;\r
+        TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
 \r
-      if (TerminalDevice->TerminalType == PCANSITYPE    ||\r
-          TerminalDevice->TerminalType == VT100TYPE     ||\r
-          TerminalDevice->TerminalType == VT100PLUSTYPE ||\r
-          TerminalDevice->TerminalType == VTUTF8TYPE) {\r
-        switch (UnicodeChar) {\r
-        case 'A':\r
-          Key.ScanCode = SCAN_UP;\r
-          break;\r
-        case 'B':\r
-          Key.ScanCode = SCAN_DOWN;\r
-          break;\r
-        case 'C':\r
-          Key.ScanCode = SCAN_RIGHT;\r
-          break;\r
-        case 'D':\r
-          Key.ScanCode = SCAN_LEFT;\r
-          break;\r
-        case 'H':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE ||\r
-              TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_HOME;\r
-          }\r
-          break;\r
-        case 'F':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_END;\r
-          }\r
-          break;\r
-        case 'K':\r
-          if (TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_END;\r
-          }\r
-          break;\r
-        case 'L':\r
-        case '@':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE ||\r
-              TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_INSERT;\r
-          }\r
-          break;\r
-        case 'X':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_DELETE;\r
-          }\r
-          break;\r
-        case 'P':\r
-          if (TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_DELETE;\r
-          } else if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F4;\r
-          }\r
-          break;\r
-        case 'I':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_PAGE_UP;\r
-          }\r
-          break;\r
-        case 'V':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F10;\r
-          }\r
-        case '?':\r
-          if (TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_PAGE_UP;\r
-          }\r
-          break;\r
-        case 'G':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_PAGE_DOWN;\r
-          }\r
-          break;\r
-        case 'U':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F9;\r
-          }\r
-        case '/':\r
-          if (TerminalDevice->TerminalType == VT100TYPE) {\r
-            Key.ScanCode = SCAN_PAGE_DOWN;\r
-          }\r
-          break;\r
-        case 'M':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F1;\r
-          }\r
-          break;\r
-        case 'N':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F2;\r
-          }\r
-          break;\r
-        case 'O':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F3;\r
-          }\r
-          break;\r
-        case 'Q':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F5;\r
-          }\r
-          break;\r
-        case 'R':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F6;\r
-          }\r
-          break;\r
-        case 'S':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F7;\r
+        Key.ScanCode = SCAN_NULL;\r
+\r
+        if ((TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVt400) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeLinux))\r
+        {\r
+          switch (UnicodeChar) {\r
+            case '1':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt400) {\r
+                Key.ScanCode = SCAN_F1;\r
+              }\r
+\r
+              break;\r
+            case '2':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt400) {\r
+                Key.ScanCode = SCAN_F2;\r
+              }\r
+\r
+              break;\r
+            case '3':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt400) {\r
+                Key.ScanCode = SCAN_F3;\r
+              }\r
+\r
+              break;\r
+            case '4':\r
+              if (TerminalDevice->TerminalType == TerminalTypeVt400) {\r
+                Key.ScanCode = SCAN_F4;\r
+              }\r
+\r
+              break;\r
+            case '5':\r
+              if ((TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+                  (TerminalDevice->TerminalType == TerminalTypeVt400))\r
+              {\r
+                Key.ScanCode = SCAN_F5;\r
+              }\r
+\r
+              break;\r
+            case '7':\r
+              Key.ScanCode = SCAN_F6;\r
+              break;\r
+            case '8':\r
+              Key.ScanCode = SCAN_F7;\r
+              break;\r
+            case '9':\r
+              Key.ScanCode = SCAN_F8;\r
+              break;\r
           }\r
-          break;\r
-        case 'T':\r
-          if (TerminalDevice->TerminalType == PCANSITYPE) {\r
-            Key.ScanCode = SCAN_F8;\r
+        }\r
+\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
+\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
+\r
+        break;\r
+\r
+      case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET | INPUT_STATE_2:\r
+\r
+        TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+        Key.ScanCode               = SCAN_NULL;\r
+        if ((TerminalDevice->TerminalType == TerminalTypeXtermR6) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeVt400) ||\r
+            (TerminalDevice->TerminalType == TerminalTypeLinux))\r
+        {\r
+          switch (UnicodeChar) {\r
+            case '0':\r
+              Key.ScanCode = SCAN_F9;\r
+              break;\r
+            case '1':\r
+              Key.ScanCode = SCAN_F10;\r
+              break;\r
+            case '3':\r
+              Key.ScanCode = SCAN_F11;\r
+              break;\r
+            case '4':\r
+              Key.ScanCode = SCAN_F12;\r
+              break;\r
           }\r
-          break;\r
-        default :\r
-          break;\r
         }\r
-      }\r
 \r
-      if (Key.ScanCode != SCAN_NULL) {\r
-        Key.UnicodeChar = 0;\r
-        EfiKeyFiFoInsertOneKey (TerminalDevice,Key);\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
+\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
+\r
+        break;\r
+\r
+      case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET | INPUT_STATE_LEFTOPENBRACKET_2ND:\r
+\r
         TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+        Key.ScanCode               = SCAN_NULL;\r
+\r
+        if (TerminalDevice->TerminalType == TerminalTypeLinux) {\r
+          switch (UnicodeChar) {\r
+            case 'A':\r
+              Key.ScanCode = SCAN_F1;\r
+              break;\r
+            case 'B':\r
+              Key.ScanCode = SCAN_F2;\r
+              break;\r
+            case 'C':\r
+              Key.ScanCode = SCAN_F3;\r
+              break;\r
+            case 'D':\r
+              Key.ScanCode = SCAN_F4;\r
+              break;\r
+            case 'E':\r
+              Key.ScanCode = SCAN_F5;\r
+              break;\r
+          }\r
+        }\r
+\r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
+\r
         UnicodeToEfiKeyFlushState (TerminalDevice);\r
-        continue;\r
-      }\r
 \r
-      UnicodeToEfiKeyFlushState (TerminalDevice);\r
+        break;\r
 \r
-      break;\r
+      case INPUT_STATE_ESC | INPUT_STATE_LEFTOPENBRACKET | INPUT_STATE_LEFTOPENBRACKET_TTY:\r
+        /*\r
+         * Here we handle the VT220 escape codes that we accept.  This\r
+         * state is only used by the TTY terminal type.\r
+         */\r
+        Key.ScanCode = SCAN_NULL;\r
+        if (TerminalDevice->TerminalType == TerminalTypeTtyTerm) {\r
+          if ((UnicodeChar == '~') && (TerminalDevice->TtyEscapeIndex <= 2)) {\r
+            UINT16  EscCode;\r
+            TerminalDevice->TtyEscapeStr[TerminalDevice->TtyEscapeIndex] = 0; /* Terminate string */\r
+            EscCode                                                      = (UINT16)StrDecimalToUintn (TerminalDevice->TtyEscapeStr);\r
+            switch (EscCode) {\r
+              case 2:\r
+                Key.ScanCode = SCAN_INSERT;\r
+                break;\r
+              case 3:\r
+                Key.ScanCode = SCAN_DELETE;\r
+                break;\r
+              case 5:\r
+                Key.ScanCode = SCAN_PAGE_UP;\r
+                break;\r
+              case 6:\r
+                Key.ScanCode = SCAN_PAGE_DOWN;\r
+                break;\r
+              case 11:\r
+              case 12:\r
+              case 13:\r
+              case 14:\r
+              case 15:\r
+                Key.ScanCode = SCAN_F1 + EscCode - 11;\r
+                break;\r
+              case 17:\r
+              case 18:\r
+              case 19:\r
+              case 20:\r
+              case 21:\r
+                Key.ScanCode = SCAN_F6 + EscCode - 17;\r
+                break;\r
+              case 23:\r
+              case 24:\r
+                Key.ScanCode = SCAN_F11 + EscCode - 23;\r
+                break;\r
+              default:\r
+                break;\r
+            }\r
+          } else if (TerminalDevice->TtyEscapeIndex == 1) {\r
+            /* 2 character escape code   */\r
+            TerminalDevice->TtyEscapeStr[TerminalDevice->TtyEscapeIndex++] = UnicodeChar;\r
+            continue;\r
+          } else {\r
+            DEBUG ((DEBUG_ERROR, "Unexpected state in escape2\n"));\r
+          }\r
+        }\r
+\r
+        TerminalDevice->ResetState = RESET_STATE_DEFAULT;\r
 \r
+        if (Key.ScanCode != SCAN_NULL) {\r
+          Key.UnicodeChar = 0;\r
+          EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
+          TerminalDevice->InputState = INPUT_STATE_DEFAULT;\r
+          UnicodeToEfiKeyFlushState (TerminalDevice);\r
+          continue;\r
+        }\r
 \r
-    default:\r
-      //\r
-      // Invalid state. This should never happen.\r
-      //\r
-      ASSERT (FALSE);\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
+        break;\r
 \r
-      UnicodeToEfiKeyFlushState (TerminalDevice);\r
+      default:\r
+        //\r
+        // Invalid state. This should never happen.\r
+        //\r
+        ASSERT (FALSE);\r
 \r
-      break;\r
+        UnicodeToEfiKeyFlushState (TerminalDevice);\r
+\r
+        break;\r
     }\r
 \r
     if (UnicodeChar == ESC) {\r
@@ -1610,7 +2091,7 @@ UnicodeToEfiKey (
     }\r
 \r
     if (TerminalDevice->InputState != INPUT_STATE_DEFAULT) {\r
-      Status = gBS->SetTimer(\r
+      Status = gBS->SetTimer (\r
                       TerminalDevice->TwoSecondTimeOut,\r
                       TimerRelative,\r
                       (UINT64)20000000\r
@@ -1624,13 +2105,18 @@ UnicodeToEfiKey (
     }\r
 \r
     if (UnicodeChar == DEL) {\r
-      Key.ScanCode    = SCAN_DELETE;\r
-      Key.UnicodeChar = 0;\r
+      if (TerminalDevice->TerminalType == TerminalTypeTtyTerm) {\r
+        Key.ScanCode    = SCAN_NULL;\r
+        Key.UnicodeChar = CHAR_BACKSPACE;\r
+      } else {\r
+        Key.ScanCode    = SCAN_DELETE;\r
+        Key.UnicodeChar = 0;\r
+      }\r
     } else {\r
       Key.ScanCode    = SCAN_NULL;\r
       Key.UnicodeChar = UnicodeChar;\r
     }\r
 \r
-    EfiKeyFiFoInsertOneKey (TerminalDevice,Key);\r
+    EfiKeyFiFoInsertOneKey (TerminalDevice, &Key);\r
   }\r
 }\r