Merge branch 'rhaberkorn-serial-mouse'

1 files changed, 11 insertions, 0 deletions

diff --git a/common/keyboard.c b/common/keyboard.c
index 2b66f20a0..020be8ead 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();