aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/USBtoSerial
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-05-02 05:16:34 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-05-02 05:16:34 +0000
commit3d28d53c3e2ae529933283e63a8b05f2ab1ce2be (patch)
treef395bb297884750d54614b941f2bda0727cc2796 /Projects/USBtoSerial
parent9a1560dc050f79fd189838a87ce623e79ff48677 (diff)
downloadlufa-3d28d53c3e2ae529933283e63a8b05f2ab1ce2be.tar.gz
lufa-3d28d53c3e2ae529933283e63a8b05f2ab1ce2be.tar.bz2
lufa-3d28d53c3e2ae529933283e63a8b05f2ab1ce2be.zip
Change AVRISP project's timeout to be interrupt based again, but make the interrupt itself interruptable and use a seperate assembly file to hand-optimize the ISR code.
Removed the cast to uint16_t on the set baud rate in the USBtoSerial project, so that the higher >1M baud rates can be selected (thanks to Steffan).
Diffstat (limited to 'Projects/USBtoSerial')
-rw-r--r--Projects/USBtoSerial/USBtoSerial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c
index c9bc71734..1b4cab289 100644
--- a/Projects/USBtoSerial/USBtoSerial.c
+++ b/Projects/USBtoSerial/USBtoSerial.c
@@ -194,5 +194,5 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
UCSR1A = (1 << U2X1);
UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
UCSR1C = ConfigMask;
- UBRR1 = SERIAL_2X_UBBRVAL((uint16_t)CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+ UBRR1 = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
}