Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The SysReq key was determined incorrectly - you have to press Alt, not Ctrl to

Browse Source 
turn Print-Screen into SysReq. Now, getting into the debugger works via USB
  keyboards as well.
* I switched the break/pause key detection to Alt, too, although I could not
  find any such mechanism on PS/2 keyboards. Someone knows better how to deal
  with this one? (the key actually produces two scancodes, 0x1d + 0x45 on PS/2
  keyboards)
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31670 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-07-21 11:42:42 +00:00
parent db8fb4fdf0
commit 14aeff5f47
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/add-ons/kernel/drivers/input/usb_hid/KeyboardDevice.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008 Michael Lotz <mmlr@mlotz.ch>
* Copyright 2008 Michael Lotz <mmlr@mlotz.ch>
* Distributed under the terms of the MIT license.
*/
@ -22,6 +22,10 @@
#include "kb_mouse_driver.h"
#define LEFT_ALT_KEY 0x04
#define RIGHT_ALT_KEY 0x40
#define ALT_KEYS (LEFT_ALT_KEY | RIGHT_ALT_KEY)
static usb_id sDebugKeyboardPipe = 0;
static size_t sDebugKeyboardReportSize = 0;
static int32 sDebuggerCommandAdded = 0;
@ -242,7 +246,7 @@ KeyboardDevice::_InterpretBuffer()
return B_OK;
}
const static uint32 sModifierTable[] = {
const static uint32 kModifierTable[] = {
KEY_ControlL,
KEY_ShiftL,
KEY_AltL,
@ -253,7 +257,7 @@ KeyboardDevice::_InterpretBuffer()
KEY_WinR
};
const static uint32 sKeyTable[] = {
const static uint32 kKeyTable[] = {
0x00, // ERROR
0x00, // ERROR
0x00, // ERROR
@ -396,12 +400,13 @@ KeyboardDevice::_InterpretBuffer()
0x6c, // Muhenkan, key left to spacebar, japanese
};
static size_t sKeyTableSize = sizeof(sKeyTable) / sizeof(sKeyTable[0]);
const static size_t kKeyTableSize
= sizeof(kKeyTable) / sizeof(kKeyTable[0]);
uint8 modifierChange = fLastTransferBuffer[0] ^ fTransferBuffer[0];
for (uint8 i = 0; modifierChange; i++, modifierChange >>= 1) {
if (modifierChange & 1)
_WriteKey(sModifierTable[i], (fTransferBuffer[0] >> i) & 1);
_WriteKey(kModifierTable[i], (fTransferBuffer[0] >> i) & 1);
}
bool phantomState = true;
@ -443,16 +448,17 @@ KeyboardDevice::_InterpretBuffer()
// a change occured
uint32 key = 0;
if (current[i] < sKeyTableSize)
key = sKeyTable[current[i]];
if (current[i] < kKeyTableSize)
key = kKeyTable[current[i]];
if (key == KEY_Pause && (current[0] & 1))
if (key == KEY_Pause && (current[0] & ALT_KEYS) != 0)
key = KEY_Break;
else if (key == 0xe && (current[0] & 1)) {
else if (key == 0xe && (current[0] & ALT_KEYS) != 0) {
key = KEY_SysRq;
sysReqPressed = keyDown;
} else if (sysReqPressed && keyDown && current[i] >= 4
&& current[i] <= 30 && (fLastTransferBuffer[0] & 0x44) != 0) {
} else if (sysReqPressed && keyDown
&& current[i] >= 4 && current[i] <= 30
&& (fLastTransferBuffer[0] & ALT_KEYS) != 0) {
// Alt-SysReq+letter was pressed
sDebugKeyboardPipe = fInterruptPipe;
sDebugKeyboardReportSize = fTotalReportSize;