Clean out some of the spurious whitespace.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23332 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -64,18 +64,18 @@ const uint32 key_table[] = {
|
|||||||
0x50, // B
|
0x50, // B
|
||||||
0x4e, // C
|
0x4e, // C
|
||||||
0x3e, // D
|
0x3e, // D
|
||||||
0x29, // E
|
0x29, // E
|
||||||
0x3f, // F
|
0x3f, // F
|
||||||
0x40, // G
|
0x40, // G
|
||||||
0x41, // H
|
0x41, // H
|
||||||
0x2e, // I
|
0x2e, // I
|
||||||
0x42, // J
|
0x42, // J
|
||||||
0x43, // K
|
0x43, // K
|
||||||
0x44, // L
|
0x44, // L
|
||||||
0x52, // M
|
0x52, // M
|
||||||
0x51, // N
|
0x51, // N
|
||||||
0x2f, // O
|
0x2f, // O
|
||||||
0x30, // P
|
0x30, // P
|
||||||
0x27, // Q
|
0x27, // Q
|
||||||
0x2a, // R
|
0x2a, // R
|
||||||
0x3d, // S
|
0x3d, // S
|
||||||
@@ -85,12 +85,12 @@ const uint32 key_table[] = {
|
|||||||
0x28, // W
|
0x28, // W
|
||||||
0x4d, // X
|
0x4d, // X
|
||||||
0x2c, // Y
|
0x2c, // Y
|
||||||
0x4c, // Z
|
0x4c, // Z
|
||||||
0x12, // 1
|
0x12, // 1
|
||||||
0x13, // 2
|
0x13, // 2
|
||||||
0x14, // 3
|
0x14, // 3
|
||||||
0x15, // 4
|
0x15, // 4
|
||||||
0x16, // 5
|
0x16, // 5
|
||||||
0x17, // 6
|
0x17, // 6
|
||||||
0x18, // 7
|
0x18, // 7
|
||||||
0x19, // 8
|
0x19, // 8
|
||||||
@@ -105,7 +105,7 @@ const uint32 key_table[] = {
|
|||||||
0x1d, // =
|
0x1d, // =
|
||||||
0x31, // [
|
0x31, // [
|
||||||
0x32, // ]
|
0x32, // ]
|
||||||
0x00, // unmapped
|
0x00, // unmapped
|
||||||
0x33, // \
|
0x33, // \
|
||||||
0x45, // ;
|
0x45, // ;
|
||||||
0x46, // '
|
0x46, // '
|
||||||
@@ -128,7 +128,7 @@ const uint32 key_table[] = {
|
|||||||
0x0d, // F12
|
0x0d, // F12
|
||||||
0x0e, // PrintScreen
|
0x0e, // PrintScreen
|
||||||
KEY_Scroll, // Scroll Lock
|
KEY_Scroll, // Scroll Lock
|
||||||
KEY_Pause, // Pause (0x7f with Ctrl)
|
KEY_Pause, // Pause (0x7f with Ctrl)
|
||||||
0x1f, // Insert
|
0x1f, // Insert
|
||||||
0x20, // Home
|
0x20, // Home
|
||||||
0x21, // Page up
|
0x21, // Page up
|
||||||
@@ -146,7 +146,7 @@ const uint32 key_table[] = {
|
|||||||
0x3a, // Pad +
|
0x3a, // Pad +
|
||||||
0x5b, // Pad Enter
|
0x5b, // Pad Enter
|
||||||
0x58, // Pad 1
|
0x58, // Pad 1
|
||||||
0x59, // Pad 2
|
0x59, // Pad 2
|
||||||
0x5a, // Pad 3
|
0x5a, // Pad 3
|
||||||
0x48, // Pad 4
|
0x48, // Pad 4
|
||||||
0x49, // Pad 5
|
0x49, // Pad 5
|
||||||
@@ -156,7 +156,7 @@ const uint32 key_table[] = {
|
|||||||
0x39, // Pad 9
|
0x39, // Pad 9
|
||||||
0x64, // Pad 0
|
0x64, // Pad 0
|
||||||
0x65, // Pad .
|
0x65, // Pad .
|
||||||
0x69, // <
|
0x69, // <
|
||||||
KEY_Menu, // Menu
|
KEY_Menu, // Menu
|
||||||
KEY_Power, // Power
|
KEY_Power, // Power
|
||||||
KEY_NumEqual, // Pad =
|
KEY_NumEqual, // Pad =
|
||||||
@@ -172,30 +172,30 @@ const uint32 key_table[] = {
|
|||||||
0x00, // F22 unmapped
|
0x00, // F22 unmapped
|
||||||
0x00, // F23 unmapped
|
0x00, // F23 unmapped
|
||||||
0x00, // F24 unmapped
|
0x00, // F24 unmapped
|
||||||
0x00, // Execute unmapped
|
0x00, // Execute unmapped
|
||||||
0x00, // Help unmapped
|
0x00, // Help unmapped
|
||||||
0x00, // Menu unmapped
|
0x00, // Menu unmapped
|
||||||
0x00, // Select unmapped
|
0x00, // Select unmapped
|
||||||
0x00, // Stop unmapped
|
0x00, // Stop unmapped
|
||||||
0x00, // Again unmapped
|
0x00, // Again unmapped
|
||||||
0x00, // Undo unmapped
|
0x00, // Undo unmapped
|
||||||
0x00, // Cut unmapped
|
0x00, // Cut unmapped
|
||||||
0x00, // Copy unmapped
|
0x00, // Copy unmapped
|
||||||
0x00, // Paste unmapped
|
0x00, // Paste unmapped
|
||||||
0x00, // Find unmapped
|
0x00, // Find unmapped
|
||||||
0x00, // Mute unmapped
|
0x00, // Mute unmapped
|
||||||
0x00, // Volume up unmapped
|
0x00, // Volume up unmapped
|
||||||
0x00, // Volume down unmapped
|
0x00, // Volume down unmapped
|
||||||
0x00, // CapsLock unmapped
|
0x00, // CapsLock unmapped
|
||||||
0x00, // NumLock unmapped
|
0x00, // NumLock unmapped
|
||||||
0x00, // Scroll lock unmapped
|
0x00, // Scroll lock unmapped
|
||||||
0x70, // Keypad . on Brazilian ABNT2
|
0x70, // Keypad . on Brazilian ABNT2
|
||||||
0x00, // = sign
|
0x00, // = sign
|
||||||
0x6b, // Ro (\\ key, japanese)
|
0x6b, // Ro (\\ key, japanese)
|
||||||
0x6e, // Katakana/Hiragana, second key right to spacebar, japanese
|
0x6e, // Katakana/Hiragana, second key right to spacebar, japanese
|
||||||
0x6a, // Yen (macron key, japanese)
|
0x6a, // Yen (macron key, japanese)
|
||||||
0x6d, // Henkan, first key right to spacebar, japanese
|
0x6d, // Henkan, first key right to spacebar, japanese
|
||||||
0x6c, // Muhenkan, key left to spacebar, japanese
|
0x6c, // Muhenkan, key left to spacebar, japanese
|
||||||
0x00, // unmapped
|
0x00, // unmapped
|
||||||
0x00, // unmapped
|
0x00, // unmapped
|
||||||
0x00, // unmapped
|
0x00, // unmapped
|
||||||
@@ -525,7 +525,7 @@ interpret_mouse_buffer(hid_device_info *device)
|
|||||||
const report_insn *insn = &device->insns [i];
|
const report_insn *insn = &device->insns [i];
|
||||||
int32 value =
|
int32 value =
|
||||||
(((report [insn->byte_idx + 1] << 8) |
|
(((report [insn->byte_idx + 1] << 8) |
|
||||||
report [insn->byte_idx]) >> insn->bit_pos)
|
report [insn->byte_idx]) >> insn->bit_pos)
|
||||||
& ((1 << insn->num_bits) - 1);
|
& ((1 << insn->num_bits) - 1);
|
||||||
|
|
||||||
if (insn->usage_page == USAGE_PAGE_BUTTON) {
|
if (insn->usage_page == USAGE_PAGE_BUTTON) {
|
||||||
@@ -746,7 +746,7 @@ hid_device_added(const usb_device *dev, void **cookie)
|
|||||||
/* Generic Desktop : Keyboard or Mouse */
|
/* Generic Desktop : Keyboard or Mouse */
|
||||||
|
|
||||||
if (memcmp(rep_desc, "\x05\x01\x09\x06", 4) != 0 &&
|
if (memcmp(rep_desc, "\x05\x01\x09\x06", 4) != 0 &&
|
||||||
memcmp(rep_desc, "\x05\x01\x09\x02", 4) != 0) {
|
memcmp(rep_desc, "\x05\x01\x09\x02", 4) != 0) {
|
||||||
DPRINTF_INFO((MY_ID "not a keyboard or a mouse %08lx\n", *(uint32*)rep_desc));
|
DPRINTF_INFO((MY_ID "not a keyboard or a mouse %08lx\n", *(uint32*)rep_desc));
|
||||||
free(rep_desc);
|
free(rep_desc);
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
@@ -938,25 +938,25 @@ hid_device_control(driver_cookie *cookie, uint32 op,
|
|||||||
// call_back function
|
// call_back function
|
||||||
}
|
}
|
||||||
|
|
||||||
err = acquire_sem_etc(device->sem_cb, 1,
|
err = acquire_sem_etc(device->sem_cb, 1,
|
||||||
B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT,
|
B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT,
|
||||||
device->repeat_timer.current_delay);
|
device->repeat_timer.current_delay);
|
||||||
if (err == B_TIMED_OUT) {
|
if (err == B_TIMED_OUT) {
|
||||||
// this case is for handling key repeats, it means
|
// this case is for handling key repeats, it means
|
||||||
// no interrupt transfer has happened
|
// no interrupt transfer has happened
|
||||||
write_key(device, device->repeat_timer.key, true);
|
write_key(device, device->repeat_timer.key, true);
|
||||||
// the next timeout is reduced to the repeat_rate
|
// the next timeout is reduced to the repeat_rate
|
||||||
device->repeat_timer.current_delay = device->repeat_rate;
|
device->repeat_timer.current_delay = device->repeat_rate;
|
||||||
} else if (err == B_OK) {
|
} else if (err == B_OK) {
|
||||||
// this case is for when an actual interrupt transfer
|
// this case is for when an actual interrupt transfer
|
||||||
// happened, it is the only possible reason to be here
|
// happened, it is the only possible reason to be here
|
||||||
device->transfer_scheduled = false;
|
device->transfer_scheduled = false;
|
||||||
err = handle_interrupt_transfer(device);
|
err = handle_interrupt_transfer(device);
|
||||||
if (err != B_OK)
|
if (err != B_OK)
|
||||||
return err;
|
return err;
|
||||||
} else {
|
} else {
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// process what is in the ring_buffer, it could be written
|
// process what is in the ring_buffer, it could be written
|
||||||
@@ -981,7 +981,7 @@ hid_device_control(driver_cookie *cookie, uint32 op,
|
|||||||
// call_back function
|
// call_back function
|
||||||
|
|
||||||
err = acquire_sem_etc(device->sem_cb, 1, B_CAN_INTERRUPT, 0LL);
|
err = acquire_sem_etc(device->sem_cb, 1, B_CAN_INTERRUPT, 0LL);
|
||||||
if (err != B_OK)
|
if (err != B_OK)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
err = handle_interrupt_transfer(device);
|
err = handle_interrupt_transfer(device);
|
||||||
@@ -992,9 +992,9 @@ hid_device_control(driver_cookie *cookie, uint32 op,
|
|||||||
ring_buffer_user_read(device->rbuf, arg, sizeof(mouse_movement));
|
ring_buffer_user_read(device->rbuf, arg, sizeof(mouse_movement));
|
||||||
return B_OK;
|
return B_OK;
|
||||||
|
|
||||||
case MS_NUM_EVENTS:
|
case MS_NUM_EVENTS:
|
||||||
return (int32)(ring_buffer_readable(device->rbuf)
|
return (int32)(ring_buffer_readable(device->rbuf)
|
||||||
/ sizeof(mouse_movement));
|
/ sizeof(mouse_movement));
|
||||||
|
|
||||||
case MS_SET_CLICKSPEED:
|
case MS_SET_CLICKSPEED:
|
||||||
#ifdef __HAIKU__
|
#ifdef __HAIKU__
|
||||||
|
|||||||
Reference in New Issue
Block a user