diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c index 4ade1e340c..c4f1ee1780 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c @@ -1622,6 +1622,16 @@ Returns: ConsoleIn->Key.UnicodeChar = ConvertKeyboardScanCodeToEfiKey[Index].UnicodeChar; } } + // + // Translate the CTRL-Alpha characters to their corresponding control value (ctrl-a = 0x0001 through ctrl-Z = 0x001A) + // + if (ConsoleIn->Ctrled) { + if (ConsoleIn->Key.UnicodeChar >= 'a' && ConsoleIn->Key.UnicodeChar <= 'z') { + ConsoleIn->Key.UnicodeChar = (UINT16) (ConsoleIn->Key.UnicodeChar - 'a' + 1); + } else if (ConsoleIn->Key.UnicodeChar >= 'A' && ConsoleIn->Key.UnicodeChar <= 'Z') { + ConsoleIn->Key.UnicodeChar = (UINT16) (ConsoleIn->Key.UnicodeChar - 'A' + 1); + } + } break; } diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c index 44914afb54..9ad1bcef24 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c @@ -857,7 +857,18 @@ USBKeyCodeToEFIScanCode ( } } - + // + // Translate the CTRL-Alpha characters to their corresponding control value (ctrl-a = 0x0001 through ctrl-Z = 0x001A) + // + if (UsbKeyboardDevice->CtrlOn) { + if (Key->UnicodeChar >= 'a' && Key->UnicodeChar <= 'z') { + Key->UnicodeChar = (UINT16) (Key->UnicodeChar - 'a' + 1); + } else if (Key->UnicodeChar >= 'A' && Key->UnicodeChar <= 'Z') { + Key->UnicodeChar = (UINT16) (Key->UnicodeChar - 'A' + 1); + } + } + + if (KeyChar >= 0x59 && KeyChar <= 0x63) { if (UsbKeyboardDevice->NumLockOn && !UsbKeyboardDevice->ShiftOn) {