[Description]

Merged in EDK 1151.
[Tracker]
1151 Logo & Print key could not be retrieved from USB keyboard

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5371 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
index 72fafd9472277404ba2f6a5f7108dd2053d293eb..b7cd8c1199f597c9e855ea6e9b4651b092605eb2 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/keyboard.c
@@ -128,16 +128,16 @@ UINT8 KeyboardLayoutTable[USB_KEYCODE_MAX_MAKE + 8][5] = {
   {EfiKeyZero,       '0',      '0',   EFI_INSERT_MODIFIER,      EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_NUM_LOCK},   // 0x62\r
   {EfiKeyPeriod,     '.',      '.',   EFI_DELETE_MODIFIER,      EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_NUM_LOCK},   // 0x63\r
   {EfiKeyB0,         '\\',     '|',   EFI_NULL_MODIFIER,        EFI_AFFECTED_BY_STANDARD_SHIFT}, // 0x64 Keyboard Non-US \ and |\r
-  {EfiKeyA4,         0x00,     0x00,  EFI_NULL_MODIFIER,        0},                              // 0x65 Keyboard Application\r
+  {EfiKeyA4,         0x00,     0x00,  EFI_MENU_MODIFIER,        0},                              // 0x65 Keyboard Application\r
 \r
   {EfiKeyLCtrl,      0,        0,     EFI_LEFT_CONTROL_MODIFIER,    0},  // 0xe0\r
   {EfiKeyLShift,     0,        0,     EFI_LEFT_SHIFT_MODIFIER,      0},  // 0xe1\r
   {EfiKeyLAlt,       0,        0,     EFI_LEFT_ALT_MODIFIER,        0},  // 0xe2\r
-  {EfiKeyA0,         0,        0,     EFI_NULL_MODIFIER,            0},  // 0xe3\r
+  {EfiKeyA0,         0,        0,     EFI_LEFT_LOGO_MODIFIER,       0},  // 0xe3\r
   {EfiKeyRCtrl,      0,        0,     EFI_RIGHT_CONTROL_MODIFIER,   0},  // 0xe4\r
   {EfiKeyRShift,     0,        0,     EFI_RIGHT_SHIFT_MODIFIER,     0},  // 0xe5\r
   {EfiKeyA2,         0,        0,     EFI_RIGHT_ALT_MODIFIER,       0},  // 0xe6\r
-  {EfiKeyA3,         0,        0,     EFI_NULL_MODIFIER,            0},  // 0xe7\r
+  {EfiKeyA3,         0,        0,     EFI_RIGHT_LOGO_MODIFIER,      0},  // 0xe7\r
 };\r
 \r
 VOID\r
@@ -1346,6 +1346,7 @@ USBParseKey (
       //\r
       // SysReq release\r
       //\r
+      case EFI_PRINT_MODIFIER:\r
       case EFI_SYS_REQUEST_MODIFIER:\r
         UsbKeyboardDevice->SysReqOn = 0;\r
         break;\r
@@ -1435,6 +1436,7 @@ USBParseKey (
     //\r
     // SysReq press\r
     //\r
+    case EFI_PRINT_MODIFIER:\r
     case EFI_SYS_REQUEST_MODIFIER:\r
       UsbKeyboardDevice->SysReqOn = 1;\r
       continue;\r
@@ -1480,7 +1482,6 @@ USBParseKey (
     //\r
     case EFI_FUNCTION_KEY_ELEVEN_MODIFIER:\r
     case EFI_FUNCTION_KEY_TWELVE_MODIFIER:\r
-    case EFI_PRINT_MODIFIER:\r
     case EFI_PAUSE_MODIFIER:\r
     case EFI_BREAK_MODIFIER:\r
       //\r