diff options
| author | tmk <nobody@nowhere> | 2013-11-21 13:01:47 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-11-21 13:01:47 +0900 |
| commit | 772ab7025ddf88126d9d6ddb654f62434985504b (patch) | |
| tree | f0b4558bba2621a824736ceea0b09b51fdd41613 /common/keyboard.c | |
| parent | 821578293c79c5612f9b77e447295f2947fd6c3d (diff) | |
| parent | a9c3f4750b3d703b8bbbc90db2566afd2aab0ec9 (diff) | |
Merge branch 'ps2_mouse_fix'
Diffstat (limited to 'common/keyboard.c')
| -rw-r--r-- | common/keyboard.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/common/keyboard.c b/common/keyboard.c index 601e3abe17..2b66f20a01 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -30,8 +30,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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,16 @@ void keyboard_task(void) action_exec(TICK); MATRIX_LOOP_END: + #ifdef MOUSEKEY_ENABLE // mousekey repeat & acceleration mousekey_task(); #endif + +#ifdef PS2_MOUSE_ENABLE + ps2_mouse_task(); +#endif + // update LED if (led_status != host_keyboard_leds()) { led_status = host_keyboard_leds(); |