diff options
| author | tmk <nobody@nowhere> | 2014-08-26 17:48:34 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-08-26 17:48:34 +0900 |
| commit | b9e265368fde73daff069788dcb58c8230d01b32 (patch) | |
| tree | ce081df2bc887c948ab9e0d5fc1242f8cc70aeb0 /common/keyboard.c | |
| parent | 10eb70acb4c8a03fc5bda32d9c23fc41266aef7a (diff) | |
| parent | 4799c99b4d1f065d1c23f3f27df079072d0ce8e9 (diff) | |
Merge branch 'rhaberkorn-serial-mouse'
Diffstat (limited to 'common/keyboard.c')
| -rw-r--r-- | common/keyboard.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/common/keyboard.c b/common/keyboard.c index 2b66f20a01..020be8eadf 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -37,6 +37,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef PS2_MOUSE_ENABLE # include "ps2_mouse.h" #endif +#ifdef SERIAL_MOUSE_ENABLE +#include "serial_mouse.h" +#endif #ifdef MATRIX_HAS_GHOST @@ -64,6 +67,10 @@ void keyboard_init(void) #ifdef PS2_MOUSE_ENABLE ps2_mouse_init(); #endif +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_init(); +#endif + #ifdef BOOTMAGIC_ENABLE bootmagic(); @@ -126,6 +133,10 @@ MATRIX_LOOP_END: ps2_mouse_task(); #endif +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_task(); +#endif + // update LED if (led_status != host_keyboard_leds()) { led_status = host_keyboard_leds(); |