diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 01:11:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 01:11:04 +0000 |
| commit | 7c8d16fd7adae430f94004048a7702b7338f5eb1 (patch) | |
| tree | 5049e7b34cbc48603a7e72293ccd7fac0cc1ac0d /Projects | |
| parent | 28401f7bb749350a66ebe95649d01a25c01842f7 (diff) | |
| download | lufa-7c8d16fd7adae430f94004048a7702b7338f5eb1.tar.gz lufa-7c8d16fd7adae430f94004048a7702b7338f5eb1.tar.bz2 lufa-7c8d16fd7adae430f94004048a7702b7338f5eb1.zip | |
Oops - need to turn off USART via control register B before reconfiguring, fix ordering of USART control register modifications in the Benito and USBtoSerial projects.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Benito/Benito.c | 4 | ||||
| -rw-r--r-- | Projects/USBtoSerial/USBtoSerial.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index 834554b4f..23786fb9e 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -236,17 +236,17 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI } /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */ - UCSR1A = 0; UCSR1B = 0; + UCSR1A = 0; UCSR1C = 0; /* Set the new baud rate before configuring the USART */ UBRR1 = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS); /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */ + UCSR1C = ConfigMask; UCSR1A = (1 << U2X1); UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1)); - UCSR1C = ConfigMask; } /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c index b59a3648f..2c2d0c006 100644 --- a/Projects/USBtoSerial/USBtoSerial.c +++ b/Projects/USBtoSerial/USBtoSerial.c @@ -200,15 +200,15 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI } /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */ - UCSR1A = 0; UCSR1B = 0; + UCSR1A = 0; UCSR1C = 0; /* Set the new baud rate before configuring the USART */ UBRR1 = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS); /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */ + UCSR1C = ConfigMask; UCSR1A = (1 << U2X1); UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1)); - UCSR1C = ConfigMask; } |