diff options
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 753762358..80781d2f3 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
@@ -1070,7 +1070,6 @@ void protocol_setup(void) { | |||
1070 | 1070 | ||
1071 | setup_mcu(); | 1071 | setup_mcu(); |
1072 | usb_device_state_init(); | 1072 | usb_device_state_init(); |
1073 | keyboard_setup(); | ||
1074 | } | 1073 | } |
1075 | 1074 | ||
1076 | void protocol_init(void) { | 1075 | void protocol_init(void) { |
@@ -1095,21 +1094,11 @@ void protocol_init(void) { | |||
1095 | #else | 1094 | #else |
1096 | USB_USBTask(); | 1095 | USB_USBTask(); |
1097 | #endif | 1096 | #endif |
1098 | /* init modules */ | ||
1099 | keyboard_init(); | ||
1100 | host_set_driver(&lufa_driver); | ||
1101 | #ifdef SLEEP_LED_ENABLE | ||
1102 | sleep_led_init(); | ||
1103 | #endif | ||
1104 | 1097 | ||
1105 | #ifdef VIRTSER_ENABLE | 1098 | host_set_driver(&lufa_driver); |
1106 | virtser_init(); | ||
1107 | #endif | ||
1108 | |||
1109 | print("Keyboard start.\n"); | ||
1110 | } | 1099 | } |
1111 | 1100 | ||
1112 | void protocol_task(void) { | 1101 | void protocol_pre_task(void) { |
1113 | #if !defined(NO_USB_STARTUP_CHECK) | 1102 | #if !defined(NO_USB_STARTUP_CHECK) |
1114 | if (USB_DeviceState == DEVICE_STATE_Suspended) { | 1103 | if (USB_DeviceState == DEVICE_STATE_Suspended) { |
1115 | print("[s]"); | 1104 | print("[s]"); |
@@ -1133,9 +1122,9 @@ void protocol_task(void) { | |||
1133 | suspend_wakeup_init(); | 1122 | suspend_wakeup_init(); |
1134 | } | 1123 | } |
1135 | #endif | 1124 | #endif |
1125 | } | ||
1136 | 1126 | ||
1137 | keyboard_task(); | 1127 | void protocol_post_task(void) { |
1138 | |||
1139 | #ifdef MIDI_ENABLE | 1128 | #ifdef MIDI_ENABLE |
1140 | MIDI_Device_USBTask(&USB_MIDI_Interface); | 1129 | MIDI_Device_USBTask(&USB_MIDI_Interface); |
1141 | #endif | 1130 | #endif |