To fix

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbKb / Dxe / keyboard.c

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c
index b6b97c3b48e0fdd91e6cd0f1975b41f444b2437f..64bbd30d4ba79ca36602a5246040edab29739d79 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c
@@ -93,8 +93,8 @@ UINT8 KeyConvertionTable[USB_KEYCODE_MAX_MAKE][3] = {
   { SCAN_F8,        0x00,     0x00 },     // 0x41\r
   { SCAN_F9,        0x00,     0x00 },     // 0x42\r
   { SCAN_F10,       0x00,     0x00 },     // 0x43\r
-  { SCAN_NULL,      0x00,     0x00 },     // 0x44   F11\r
-  { SCAN_NULL,      0x00,     0x00 },     // 0x45   F12\r
+  { SCAN_F11,      0x00,     0x00 },     // 0x44   F11\r
+  { SCAN_F12,      0x00,     0x00 },     // 0x45   F12\r
   { SCAN_NULL,      0x00,     0x00 },     // 0x46   PrintScreen\r
   { SCAN_NULL,      0x00,     0x00 },     // 0x47   Scroll Lock\r
   { SCAN_NULL,      0x00,     0x00 },     // 0x48   Pause\r
@@ -210,9 +210,6 @@ InitUSBKeyboard (
   UINT8               Duration;\r
   EFI_STATUS          Status;\r
   UINT32              TransferResult;\r
-  EFI_USB_IO_PROTOCOL *UsbIo;\r
-\r
-  UsbIo = UsbKeyboardDevice->UsbIo;\r
 \r
   KbdReportStatusCode (\r
     UsbKeyboardDevice->DevicePath,\r
@@ -292,6 +289,7 @@ InitUSBKeyboard (
   UsbKeyboardDevice->ShiftOn    = 0;\r
   UsbKeyboardDevice->NumLockOn  = 0;\r
   UsbKeyboardDevice->CapsOn     = 0;\r
+  UsbKeyboardDevice->ScrollOn   = 0;  \r
   ZeroMem (UsbKeyboardDevice->LastKeyCodeArray, sizeof (UINT8) * 8);\r
 \r
   //\r
@@ -360,19 +358,16 @@ KeyboardHandler (
   UINT8               Index;\r
   UINT8               Index2;\r
   BOOLEAN             Down;\r
-  EFI_STATUS          Status;\r
   BOOLEAN             KeyRelease;\r
   BOOLEAN             KeyPress;\r
   UINT8               SavedTail;\r
   USB_KEY             UsbKey;\r
   UINT8               NewRepeatKey;\r
   UINT32              UsbStatus;\r
-  UINT8               *DataPtr;\r
 \r
   ASSERT (Context);\r
 \r
   NewRepeatKey      = 0;\r
-  DataPtr           = (UINT8 *) Data;\r
   UsbKeyboardDevice = (USB_KB_DEV *) Context;\r
   UsbIo             = UsbKeyboardDevice->UsbIo;\r
 \r
@@ -412,15 +407,15 @@ KeyboardHandler (
     // Delete & Submit this interrupt again\r
     //\r
     \r
-    Status = UsbIo->UsbAsyncInterruptTransfer (\r
-                      UsbIo,\r
-                      UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,\r
-                      FALSE,\r
-                      0,\r
-                      0,\r
-                      NULL,\r
-                      NULL\r
-                      );\r
+    UsbIo->UsbAsyncInterruptTransfer (\r
+             UsbIo,\r
+             UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,\r
+             FALSE,\r
+             0,\r
+             0,\r
+             NULL,\r
+             NULL\r
+             );\r
 \r
     gBS->SetTimer (\r
           UsbKeyboardDevice->DelayedRecoveryEvent,\r