diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-05 05:08:07 +0100 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-05 05:08:07 +0100 |
| commit | b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1 (patch) | |
| tree | df9fb78b55c4a9b8262e35ac7bd26ec0ebdb64db /tmk_core/protocol/vusb/main.c | |
| parent | e8ba4838d30ef3af6d8e69ebc1d00a1910806ac2 (diff) | |
| parent | f0633f2540be3ba86797522a2075a9f5ba2ad5c6 (diff) | |
| download | qmk_firmware-b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1.tar.gz qmk_firmware-b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1.tar.xz | |
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.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 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 |