diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-05-19 00:40:49 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-05-19 00:40:49 +0900 |
| commit | 81137b7a61ef11df023e1f542840a80bfc1ca090 (patch) | |
| tree | 92cbbfe97ca83ab5646c8cd48758207cdeceb615 /tmk_core/protocol/lufa | |
| parent | 6014d1014e96a7b484699d4dd8c04292c0233b0e (diff) | |
| parent | 80fd3b0b240a8840fbca1cc3cc70e76f5b52b888 (diff) | |
Merge branch 'ibm4704_fix_protocol'
Diffstat (limited to 'tmk_core/protocol/lufa')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index cdfc7bc6ad..391064c9b2 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -544,7 +544,7 @@ int8_t sendchar(uint8_t c) /******************************************************************************* * main ******************************************************************************/ -static void SetupHardware(void) +static void setup_mcu(void) { /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); @@ -552,7 +552,10 @@ static void SetupHardware(void) /* Disable clock division */ clock_prescale_set(clock_div_1); +} +static void setup_usb(void) +{ // Leonardo needs. Without this USB device is not recognized. USB_Disable(); @@ -566,7 +569,9 @@ static void SetupHardware(void) int main(void) __attribute__ ((weak)); int main(void) { - SetupHardware(); + setup_mcu(); + keyboard_setup(); + setup_usb(); sei(); /* wait for USB startup & debug output */ |