diff options
| author | coderkun <olli@coderkun.de> | 2017-04-01 10:56:29 +0200 |
|---|---|---|
| committer | coderkun <olli@coderkun.de> | 2017-04-01 10:56:29 +0200 |
| commit | 605c4129cc89e8fe647881108b0c9c79d4da1aea (patch) | |
| tree | 9af55a60d567bd66b5c8572c04ab63b62abb5a02 /tmk_core/protocol/vusb/main.c | |
| parent | b0ade6dc9838d4112cbc3093ac3033aa81ef172d (diff) | |
| parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
Merge branch 'master' into coderkun_neo2
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 |