Change the Keyboard thunk driver to remove DevicePath reference.

Signed-off-by: niruiyu
Reviewed-by: jyao1
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12548 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
index 2729d0b4416bf26d1588199dc98ac0731803cfa4..2f732c7407f3e62227b6a3f68a9b08d095d2eaa7 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
@@ -279,19 +279,12 @@ BiosKeyboardDriverBindingStart (
   BiosKeyboardPrivate->SimpleTextInputEx.UnregisterKeyNotify = BiosKeyboardUnregisterKeyNotify;    \r
   InitializeListHead (&BiosKeyboardPrivate->NotifyList);\r
 \r
-  Status = gBS->HandleProtocol (\r
-                  Controller,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &BiosKeyboardPrivate->DevicePath\r
-                  );\r
-\r
   //\r
   // Report that the keyboard is being enabled\r
   //\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+  REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE,\r
-    BiosKeyboardPrivate->DevicePath\r
+    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE\r
     );\r
 \r
   //\r
@@ -350,10 +343,9 @@ BiosKeyboardDriverBindingStart (
   //\r
   // Report a Progress Code for an attempt to detect the precense of the keyboard device in the system\r
   //\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+  REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT,\r
-    BiosKeyboardPrivate->DevicePath\r
+    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT\r
     );\r
 \r
   //\r
@@ -454,10 +446,9 @@ Done:
     //\r
     // Report an Error Code for failing to start the keyboard device\r
     //\r
-    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+    REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      StatusCode,\r
-      BiosKeyboardPrivate->DevicePath\r
+      StatusCode\r
       );\r
   }\r
 \r
@@ -1011,19 +1002,17 @@ BiosKeyboardReset (
   // 1\r
   // Report reset progress code\r
   //\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+  REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET,\r
-    BiosKeyboardPrivate->DevicePath\r
+    EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET\r
     );\r
 \r
   //\r
   // Report a Progress Code for clearing the keyboard buffer\r
   //\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+  REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER,\r
-    BiosKeyboardPrivate->DevicePath\r
+    EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER\r
     );\r
 \r
   //\r
@@ -1115,10 +1104,9 @@ BiosKeyboardReset (
     //\r
     // Report a Progress Code for performing a self test on the keyboard controller\r
     //\r
-    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+    REPORT_STATUS_CODE (\r
       EFI_PROGRESS_CODE,\r
-      EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST,\r
-      BiosKeyboardPrivate->DevicePath\r
+      EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST\r
       );\r
 \r
     Status = KeyboardCommand (\r
@@ -1681,10 +1669,9 @@ CheckKeyboardConnect (
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "[KBD]CheckKeyboardConnect - Keyboard enable failed!\n"));\r
-    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+    REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR,\r
-      BiosKeyboardPrivate->DevicePath\r
+      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR\r
       );\r
     return FALSE;\r
   }\r
@@ -1697,10 +1684,9 @@ CheckKeyboardConnect (
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "[KBD]CheckKeyboardConnect - Timeout!\n"));\r
-    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+    REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR,\r
-      BiosKeyboardPrivate->DevicePath\r
+      EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR\r
       );\r
     return FALSE;\r
   }\r

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
index 5e9fdabaa87be842b88f160295e748525b31cacf..8c40d11ef8b279ee9512d6e4208424c88ea00f5f 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
@@ -219,7 +219,6 @@ typedef struct {
   UINT16                                      StatusRegisterAddress;\r
   UINT16                                      CommandRegisterAddress;\r
   BOOLEAN                                     ExtendedKeyboard;\r
-  EFI_DEVICE_PATH_PROTOCOL                    *DevicePath;\r
   \r
   //\r
   // Buffer storing EFI_KEY_DATA\r