diff options
author | root <root@no.no.james.local> | 2015-06-08 11:12:28 +0100 |
---|---|---|
committer | root <root@no.no.james.local> | 2015-06-08 11:12:28 +0100 |
commit | c88477f285ae9206846cf02b14337dd0837fee2e (patch) | |
tree | a68630a1fb35db8d008a854969ff38c04903d76f /app/tims_keyboard.c | |
parent | 7a64ff65d2c6c667b757cebd9997fbf89f11b143 (diff) | |
download | tims_keyboard-c88477f285ae9206846cf02b14337dd0837fee2e.tar.gz tims_keyboard-c88477f285ae9206846cf02b14337dd0837fee2e.tar.bz2 tims_keyboard-c88477f285ae9206846cf02b14337dd0837fee2e.zip |
initialize the keyboard after usb comes up so we can reply to usb quickly
Diffstat (limited to 'app/tims_keyboard.c')
-rw-r--r-- | app/tims_keyboard.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/app/tims_keyboard.c b/app/tims_keyboard.c index 4897c4d..b67e46a 100644 --- a/app/tims_keyboard.c +++ b/app/tims_keyboard.c @@ -26,33 +26,12 @@ main (void) nvic_set_priority (NVIC_SYSTICK_IRQ, 0x80); nvic_set_priority (NVIC_EXTI0_IRQ, 0xc0); - usart_init (); - ticker_init (); - -#ifdef DEBUG - printf ("USART and ticker started\r\n"); -#endif + atkbd_init(); usb_init (); -#ifdef DEBUG - printf ("USB started\r\n"); -#endif - - atkbd_init (); - -#ifdef DEBUG - printf ("ATKBD i/f started\r\n"); -#endif - - while (ticks < AT_KBD_INIT_TIME) - usb_poll (); - - atkbd_start (); - -#ifdef DEBUG - printf ("Keyboard started\r\n"); -#endif + usart_init (); + ticker_init (); usb_run (); return 0; |