i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable_keyboard() should now work a little better.

Browse Source 
Disabled keyboard tests for now - we will just assume there is a keyboard.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14485 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-10-24 10:23:30 +00:00
parent 75fc86b667
commit 411b881b0d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
+10 -4
View File
@@ -27,8 +27,9 @@ enum {
} leds_status; } leds_status;
enum { enum {
PS2_DATA_SET_LEDS = 0xed, PS2_DATA_SET_LEDS = 0xed,
PS2_ENABLE_KEYBOARD = 0xf4, PS2_ENABLE_KEYBOARD = 0xf4,
PS2_DISABLE_KEYBOARD = 0xf5,
EXTENDED_KEY = 0xe0, EXTENDED_KEY = 0xe0,
}; };
@@ -237,13 +238,14 @@ enable_keyboard(void)
{ {
uint32 tries = 3; uint32 tries = 3;
keyboard_empty_data();
while (tries-- > 0) { while (tries-- > 0) {
keyboard_empty_data();
if (keyboard_command(PS2_ENABLE_KEYBOARD, NULL, 0) == B_OK) if (keyboard_command(PS2_ENABLE_KEYBOARD, NULL, 0) == B_OK)
return B_OK; return B_OK;
} }
dprintf("enable_keyboard() failed\n");
return B_ERROR; return B_ERROR;
} }
@@ -260,6 +262,8 @@ probe_keyboard(void)
keyboard_empty_data(); keyboard_empty_data();
// Keyboard detection does not seem to be working always correctly
#if 0
// Keyboard self-test // Keyboard self-test
if (ps2_write_ctrl(PS2_CTRL_KEYBOARD_SELF_TEST) != B_OK) if (ps2_write_ctrl(PS2_CTRL_KEYBOARD_SELF_TEST) != B_OK)
@@ -284,6 +288,8 @@ probe_keyboard(void)
// Enable keyboard // Enable keyboard
return enable_keyboard(); return enable_keyboard();
#endif
return B_OK;
} }