integrate V-USB support into ps2_usb

[max/tmk_keyboard.git] / tmk.c

diff --git a/tmk.c b/tmk.c
index b4f76f5d4ac1d69bcc712042fea77fdfb3ad94c3..18a05ffdff4e7292eefa84445fd770d690a1a066 100644 (file)
--- a/tmk.c
+++ b/tmk.c
@@ -28,15 +28,16 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
+#include "keyboard.h"
 #include "usb.h"
-#include "matrix_skel.h"
-#include "key_process.h"
+#include "matrix.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "controller.h"
-#include "timer.h"
 #include "jump_bootloader.h"
+#ifdef PS2_MOUSE_ENABLE
+#   include "ps2_mouse.h"
+#endif
 
 
 #define CPU_PRESCALE(n)    (CLKPR = 0x80, CLKPR = (n))
@@ -62,9 +63,7 @@ int main(void)
     usb_init();
     while (!usb_configured()) /* wait */ ;
 
-    timer_init();
-
-    matrix_init();
+    keyboard_init();
     matrix_scan();
     if (matrix_key_count() >= 3) {
 #ifdef DEBUG_LED
@@ -91,8 +90,8 @@ int main(void)
         jump_bootloader(); // not return
     }
 
+
     while (1) {
-       proc_matrix(); 
-        _delay_ms(2);
+       keyboard_proc(); 
     }
 }