From 676d94d13791a99751cebf724fd5a56b150f344d Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 2 Nov 2013 03:10:49 +0900 Subject: Fix PS/2 mouse support --- common/keyboard.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'common/keyboard.c') diff --git a/common/keyboard.c b/common/keyboard.c index 601e3abe17..63a58b2187 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -30,8 +30,13 @@ along with this program. If not, see . #include "sendchar.h" #include "bootmagic.h" #include "eeconfig.h" -#include "mousekey.h" #include "backlight.h" +#ifdef MOUSEKEY_ENABLE +# include "mousekey.h" +#endif +#ifdef PS2_MOUSE_ENABLE +# include "ps2_mouse.h" +#endif #ifdef MATRIX_HAS_GHOST @@ -111,10 +116,18 @@ void keyboard_task(void) action_exec(TICK); MATRIX_LOOP_END: + #ifdef MOUSEKEY_ENABLE // mousekey repeat & acceleration mousekey_task(); #endif + +#ifdef PS2_MOUSE_ENABLE + if (ps2_mouse_read() == 0) { + ps2_mouse_usb_send(); + } +#endif + // update LED if (led_status != host_keyboard_leds()) { led_status = host_keyboard_leds(); -- cgit v1.2.3 From d7f663a1ea4487a6dc5be76085eff7b00bec9704 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Nov 2013 11:19:59 +0900 Subject: Fix to build ps2_mouse with both LUFA and PJRC - change API of ps2_mouse; ps2_mouse_task() - remove mouse_report from host.c --- common/keyboard.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'common/keyboard.c') diff --git a/common/keyboard.c b/common/keyboard.c index 63a58b2187..2b66f20a01 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -123,9 +123,7 @@ MATRIX_LOOP_END: #endif #ifdef PS2_MOUSE_ENABLE - if (ps2_mouse_read() == 0) { - ps2_mouse_usb_send(); - } + ps2_mouse_task(); #endif // update LED -- cgit v1.2.3