Add a PcdPs2KbdExtendedVerification to let user to choose whether extend reset for keyboard driver in start (). Add more debug information in the driver.

Signed-off-by: li-elvin
Reviewed-by: mdkinney

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

3 files changed, 69 insertions, 3 deletions

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
index 06ef9d3345..24578aab81 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
@@ -361,10 +361,10 @@ BiosKeyboardDriverBindingStart (
   //

   Status = BiosKeyboardPrivate->SimpleTextInputEx.Reset (

                                                     &BiosKeyboardPrivate->SimpleTextInputEx,

-                                                    FALSE

+                                                    FeaturePcdGet (PcdPs2KbdExtendedVerification)

                                                     );

-

   if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "[KBD]Reset Failed. Status - %r\n", Status));  

     StatusCode = EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_NOT_DETECTED;

     goto Done;

   }

@@ -436,6 +436,7 @@ BiosKeyboardDriverBindingStart (
       }

     }

   }

+  DEBUG ((EFI_D_INFO, "[KBD]Extended keystrokes supported by CSM16 - %02x\n", (UINTN)BiosKeyboardPrivate->ExtendedKeyboard));

   //

   // Install protocol interfaces for the keyboard device.

   //

@@ -1679,6 +1680,12 @@ CheckKeyboardConnect (
              KBC_INPBUF_VIA60_KBEN

              );

   if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "[KBD]CheckKeyboardConnect - Keyboard enable failed!\n"));

+    REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR,

+      BiosKeyboardPrivate->DevicePath

+      );

     return FALSE;

   }

 

@@ -1689,6 +1696,12 @@ CheckKeyboardConnect (
              );

 

   if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "[KBD]CheckKeyboardConnect - Timeout!\n"));

+    REPORT_STATUS_CODE_WITH_DEVICE_PATH (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR,

+      BiosKeyboardPrivate->DevicePath

+      );

     return FALSE;

   }

 

@@ -1763,6 +1776,13 @@ BiosKeyboardTimerHandler (
 

   KeyData.Key.ScanCode            = (UINT16) Regs.H.AH;

   KeyData.Key.UnicodeChar         = (UINT16) Regs.H.AL;

+  DEBUG ((

+    EFI_D_INFO,

+    "[KBD]INT16 returns EFI_INPUT_KEY.ScanCode - %x, EFI_INPUT_KEY.UnicodeChar - %x\n",

+    KeyData.Key.ScanCode,

+    KeyData.Key.UnicodeChar

+    ));

+  

   KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID;

   KeyData.KeyState.KeyToggleState = EFI_TOGGLE_STATE_VALID;

   //

@@ -1801,6 +1821,40 @@ BiosKeyboardTimerHandler (
   KbFlag1 = *((UINT8 *) (UINTN) 0x417);  // read the STATUS FLAGS 1

   KbFlag2 = *((UINT8 *) (UINTN) 0x418); // read STATUS FLAGS 2

 

+  DEBUG_CODE (

+    {

+      if ((KbFlag1 & KB_CAPS_LOCK_BIT) == KB_CAPS_LOCK_BIT) {

+        DEBUG ((EFI_D_INFO, "[KBD]Caps Lock Key is pressed.\n"));

+      }

+      if ((KbFlag1 & KB_NUM_LOCK_BIT) == KB_NUM_LOCK_BIT) {

+        DEBUG ((EFI_D_INFO, "[KBD]Num Lock Key is pressed.\n"));

+      }

+      if ((KbFlag1 & KB_SCROLL_LOCK_BIT) == KB_SCROLL_LOCK_BIT) {

+        DEBUG ((EFI_D_INFO, "[KBD]Scroll Lock Key is pressed.\n"));

+      } 

+      if ((KbFlag1 & KB_ALT_PRESSED) == KB_ALT_PRESSED) {

+        if ((KbFlag2 & KB_LEFT_ALT_PRESSED) == KB_LEFT_ALT_PRESSED) {

+          DEBUG ((EFI_D_INFO, "[KBD]Left Alt Key is pressed.\n"));

+        } else {

+          DEBUG ((EFI_D_INFO, "[KBD]Right Alt Key is pressed.\n"));

+        }

+      }  

+      if ((KbFlag1 & KB_CTRL_PRESSED) == KB_CTRL_PRESSED) {

+        if ((KbFlag2 & KB_LEFT_CTRL_PRESSED) == KB_LEFT_CTRL_PRESSED) {

+          DEBUG ((EFI_D_INFO, "[KBD]Left Ctrl Key is pressed.\n"));

+        } else {

+          DEBUG ((EFI_D_INFO, "[KBD]Right Ctrl Key is pressed.\n"));

+        }

+      }  

+      if ((KbFlag1 & KB_LEFT_SHIFT_PRESSED) == KB_LEFT_SHIFT_PRESSED) {

+        DEBUG ((EFI_D_INFO, "[KBD]Left Shift Key is pressed.\n"));

+      }

+      if ((KbFlag1 & KB_RIGHT_SHIFT_PRESSED) == KB_RIGHT_SHIFT_PRESSED) {

+        DEBUG ((EFI_D_INFO, "[KBD]Right Shift Key is pressed.\n"));

+      }

+    }

+  );

+

   //

   // Record toggle state

   //

@@ -1864,6 +1918,13 @@ BiosKeyboardTimerHandler (
     }

   }

 

+  DEBUG ((

+    EFI_D_INFO,

+    "[KBD]Convert to EFI Scan Code, EFI_INPUT_KEY.ScanCode - %x, EFI_INPUT_KEY.UnicodeChar - %x\n",

+    KeyData.Key.ScanCode,

+    KeyData.Key.UnicodeChar

+    ));

+

   //

   // Need not return associated shift state if a class of printable characters that

   // are normally adjusted by shift modifiers.

@@ -1872,6 +1933,7 @@ BiosKeyboardTimerHandler (
   if ((KeyData.Key.UnicodeChar >= L'A' && KeyData.Key.UnicodeChar <= L'Z') ||

       (KeyData.Key.UnicodeChar >= L'a' && KeyData.Key.UnicodeChar <= L'z')

      ) {

+    DEBUG ((EFI_D_INFO, "[KBD]Shift key with a~z are pressed, remove shift state in EFI_KEY_STATE.\n"));

     KeyData.KeyState.KeyShiftState &= ~(EFI_LEFT_SHIFT_PRESSED | EFI_RIGHT_SHIFT_PRESSED);

   }

 

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
index 8dc14308b8..5e9fdabaa8 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
@@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/BaseLib.h>

+#include <Library/PcdLib.h>

 

 //

 // Driver Binding Externs

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
index 6166ba3ec3..28ef29bf1c 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
@@ -4,7 +4,7 @@
 # Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol service.

 # This dirver uses legacy INT16 to get the key stroke status.

 #

-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 #

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions

@@ -57,6 +57,7 @@
   UefiLib

   DebugLib

   BaseLib

+  PcdLib

 

 [Protocols]

   gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START

@@ -66,3 +67,5 @@
   gEfiPs2PolicyProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

 

+[FeaturePcd]

+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE
\ No newline at end of file