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

ps2: rename a constant also used in pads

Browse Source
This commit is contained in:
Jérôme Duval 2013-10-04 16:05:59 +02:00
parent df6c32e882
commit f0d09d4925
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp
View File

@ -331,7 +331,7 @@ switch_hardware_tab(ps2_dev* dev, bool on)
uint8 command = PS2_CMD_MOUSE_SET_RES;
if (on) {
arg = 0x0A;
command = PS2_CMD_KEYBOARD_SET_TYPEMATIC;
command = PS2_CMD_SET_TYPEMATIC;
}
if (ps2_dev_command(dev, PS2_CMD_MOUSE_GET_INFO, NULL, 0, val, 3) != B_OK
|| ps2_dev_command(dev, PS2_CMD_DISABLE, NULL, 0, NULL, 0) != B_OK

2
src/add-ons/kernel/bus_managers/ps2/ps2_defs.h
View File

@ -55,7 +55,7 @@
#define PS2_CMD_MOUSE_SET_STREAM 0xea
#define PS2_CMD_KEYBOARD_SET_LEDS 0xed
#define PS2_CMD_MOUSE_SET_POLL 0xf0
#define PS2_CMD_KEYBOARD_SET_TYPEMATIC 0xf3
#define PS2_CMD_SET_TYPEMATIC 0xf3
#define PS2_CMD_ECHO 0xee
#define PS2_CMD_TEST_PASSED 0xaa
#define PS2_CMD_GET_DEVICE_ID 0xf2

6
src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
View File

@ -113,7 +113,7 @@ set_typematic(int32 rate, bigtime_t delay)
value |= 0 << 5;
return ps2_dev_command(&ps2_device[PS2_DEVICE_KEYB],
PS2_CMD_KEYBOARD_SET_TYPEMATIC, &value, 1, NULL, 0);
PS2_CMD_SET_TYPEMATIC, &value, 1, NULL, 0);
}
@ -309,10 +309,10 @@ probe_keyboard(void)
B_PRIx32 "\n", cmdbyte, status);
}
}
status = ps2_dev_command(&ps2_device[PS2_DEVICE_KEYB],
PS2_CMD_GET_DEVICE_ID, NULL, 0, sKeyboardIds, sizeof(sKeyboardIds));
if (status != B_OK) {
INFO("ps2: cannot read keyboard device id:%#08" B_PRIx32 "\n", status);
}