summaryrefslogtreecommitdiffstats
path: root/tmk_core/common
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2015-04-28 11:27:10 +0900
committertmk <hasu@tmk-kbd.com>2015-04-28 11:27:10 +0900
commitd9fee5571d7de08e76dff5ce75816faf522240f6 (patch)
tree47fac278e044a8f574f9c886f528100e79777c1b /tmk_core/common
parent55fc97f957555c20c4509e587e8fd2ef1194ab0d (diff)
parent4d116a04e94cf0d19317d5b44e4fa9f34a3e5594 (diff)
Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594'
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/keyboard.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index f0ead604ec..b03b124d76 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -39,6 +39,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef SERIAL_MOUSE_ENABLE
#include "serial_mouse.h"
#endif
+#ifdef ADB_MOUSE_ENABLE
+#include "adb.h"
+#endif
#ifdef MATRIX_HAS_GHOST
@@ -69,6 +72,9 @@ void keyboard_init(void)
#ifdef SERIAL_MOUSE_ENABLE
serial_mouse_init();
#endif
+#ifdef ADB_MOUSE_ENABLE
+ adb_mouse_init();
+#endif
#ifdef BOOTMAGIC_ENABLE
@@ -147,6 +153,10 @@ MATRIX_LOOP_END:
serial_mouse_task();
#endif
+#ifdef ADB_MOUSE_ENABLE
+ adb_mouse_task();
+#endif
+
// update LED
if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds();