diff options
author | Dean Camera <[email protected]> | 2010-08-22 02:45:20 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-08-22 02:45:20 +0000 |
commit | 1be3436e895c9937dcd4ebbec33ea199f3e26db2 (patch) | |
tree | 79dea3910fc817fa020c4f13f9f981d137005ee9 /Projects | |
parent | 81998ce297fd9959f505e96a69337f3548db0d71 (diff) | |
download | qmk_firmware-1be3436e895c9937dcd4ebbec33ea199f3e26db2.tar.gz qmk_firmware-1be3436e895c9937dcd4ebbec33ea199f3e26db2.zip |
Moved calls to Device mode Class Driver events to after the request has been acknowledged, so that long event handlers do do skew the timing of the control requests.
Fixed USBtoSerial and Benito project SetLineEncoding calls failing if the USART is busy, due to the RX ISR delaying the control request handler.
Diffstat (limited to 'Projects')
-rw-r--r-- | Projects/Benito/makefile | 1 | ||||
-rw-r--r-- | Projects/USBtoSerial/USBtoSerial.c | 2 | ||||
-rw-r--r-- | Projects/USBtoSerial/makefile | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile index d8babd86b7..23b9ed1705 100644 --- a/Projects/Benito/makefile +++ b/Projects/Benito/makefile @@ -121,6 +121,7 @@ LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT LUFA_OPTS += -D AVR_RESET_LINE_PORT="PORTD" LUFA_OPTS += -D AVR_RESET_LINE_DDR="DDRD" diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c index b50537e729..845c2a51c8 100644 --- a/Projects/USBtoSerial/USBtoSerial.c +++ b/Projects/USBtoSerial/USBtoSerial.c @@ -207,6 +207,6 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */ UCSR1C = ConfigMask; - UCSR1A = (1 << U2X1); + UCSR1A = (1 << U2X1); UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1)); } diff --git a/Projects/USBtoSerial/makefile b/Projects/USBtoSerial/makefile index a87f303206..b77b6b6549 100644 --- a/Projects/USBtoSerial/makefile +++ b/Projects/USBtoSerial/makefile @@ -121,6 +121,7 @@ LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT # Create the LUFA source path variables by including the LUFA root makefile |