diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
| commit | 902d5077cd54f3a964e3276d7858212d975818ec (patch) | |
| tree | cddf5a379614f421908bbe57ae5d396cc1e2ed37 /tmk_core/protocol/vusb/main.c | |
| parent | 4d7105c2cf47c7604b54cdf488b4eb9d08c1f1cf (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
Merge remote-tracking branch 'upstream/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 |