diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp index 31affc9e58..0bc1dec746 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_alps.cpp @@ -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 diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h b/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h index 25fbf1af28..4ca02ce706 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_defs.h @@ -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 diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp index 06a6049c08..b41fdea02e 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp @@ -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); }