diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-26 09:05:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 09:05:55 +0100 |
| commit | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (patch) | |
| tree | 4cae966728b7b6baf101a7ab2b95eeff16cce141 /tmk_core/protocol/vusb/main.c | |
| parent | f91f0a715d51286064bfe808b0d463878a6d3588 (diff) | |
| parent | aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a (diff) | |
Merge pull request #17 from qmk/master
Merged from QMK project
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 |