summaryrefslogtreecommitdiff
path: root/tmk_core/protocol/vusb/main.c
diff options
context:
space:
mode:
authorDavid Olsson2017-02-11 10:50:37 +0100
committerDavid Olsson2017-02-11 10:50:37 +0100
commit052f81aacaa3b5afa93f9db3667f31f9365348ce (patch)
treedcfde5c6fed00e248535ac4d975831f33316cc8a /tmk_core/protocol/vusb/main.c
parentaa69337cf563d7b37722aabfcd1c5bae6c185208 (diff)
parent835556da9111d91b71c545d6a273e843f07631ae (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/protocol/vusb/main.c')
-rw-r--r--tmk_core/protocol/vusb/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c
index 8e4a266e9..f6a0c7e9a 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