diff options
| author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
|---|---|---|
| committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
| commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
| tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /tmk_core/protocol/vusb/main.c | |
| parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
Merge remote-tracking branch 'qmk/master'
Diffstat (limited to 'tmk_core/protocol/vusb/main.c')
| -rw-r--r-- | tmk_core/protocol/vusb/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c index 8e4a266e9b..f6a0c7e9a4 100644 --- a/tmk_core/protocol/vusb/main.c +++ b/tmk_core/protocol/vusb/main.c @@ -48,8 +48,12 @@ int main(void) uint16_t last_timer = timer_read(); #endif +#ifdef CLKPR + // avoid unintentional changes of clock frequency in devices that have a + // clock prescaler CLKPR = 0x80, CLKPR = 0; -#ifndef PS2_USE_USART +#endif +#ifndef NO_UART uart_init(UART_BAUD_RATE); #endif |