Merge branch 'rn42' into merge_rn42

[tmk_firmware.git] / common / keyboard.c

diff --git a/common/keyboard.c b/common/keyboard.c
index 9a809ff4a153dbfca52f1a248cb9e001e26cfd06..1e3fb510a44d254d01a3b290ac6042764e785552 100644 (file)
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -36,6 +36,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
@@ -63,6 +66,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();
@@ -125,6 +132,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();