tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
niruiyu 2011-10-19 03:21:15 +00:00
parent 26a74a36c1
commit 55d4edfbb3
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.c
View File

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

1
IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/BiosKeyboard.h
View File

@ -219,7 +219,6 @@ typedef struct {
UINT16 StatusRegisterAddress; UINT16 StatusRegisterAddress;
UINT16 CommandRegisterAddress; UINT16 CommandRegisterAddress;
BOOLEAN ExtendedKeyboard; BOOLEAN ExtendedKeyboard;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
// //
// Buffer storing EFI_KEY_DATA // Buffer storing EFI_KEY_DATA