Commit 7c8d16fd authored by Dean Camera's avatar Dean Camera
Browse files

Oops - need to turn off USART via control register B before reconfiguring, fix...

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.
parent 28401f7b
...@@ -38,12 +38,12 @@ all: ...@@ -38,12 +38,12 @@ all:
$(MAKE) -C PrinterHost clean $(MAKE) -C PrinterHost clean
$(MAKE) -C PrinterHost all $(MAKE) -C PrinterHost all
$(MAKE) -C StillImageHost clean
$(MAKE) -C StillImageHost all
$(MAKE) -C RNDISEthernetHost clean $(MAKE) -C RNDISEthernetHost clean
$(MAKE) -C RNDISEthernetHost all $(MAKE) -C RNDISEthernetHost all
$(MAKE) -C StillImageHost clean
$(MAKE) -C StillImageHost all
$(MAKE) -C VirtualSerialHost clean $(MAKE) -C VirtualSerialHost clean
$(MAKE) -C VirtualSerialHost all $(MAKE) -C VirtualSerialHost all
...@@ -57,6 +57,6 @@ all: ...@@ -57,6 +57,6 @@ all:
$(MAKE) -C MouseHost $@ $(MAKE) -C MouseHost $@
$(MAKE) -C MouseHostWithParser $@ $(MAKE) -C MouseHostWithParser $@
$(MAKE) -C PrinterHost $@ $(MAKE) -C PrinterHost $@
$(MAKE) -C StillImageHost $@
$(MAKE) -C RNDISEthernetHost $@ $(MAKE) -C RNDISEthernetHost $@
$(MAKE) -C StillImageHost $@
$(MAKE) -C VirtualSerialHost $@ $(MAKE) -C VirtualSerialHost $@
...@@ -236,17 +236,17 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI ...@@ -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 */ /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
UCSR1A = 0;
UCSR1B = 0; UCSR1B = 0;
UCSR1A = 0;
UCSR1C = 0; UCSR1C = 0;
/* Set the new baud rate before configuring the USART */ /* Set the new baud rate before configuring the USART */
UBRR1 = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS); 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 */ /* 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)); 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 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
......
...@@ -200,15 +200,15 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI ...@@ -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 */ /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
UCSR1A = 0;
UCSR1B = 0; UCSR1B = 0;
UCSR1A = 0;
UCSR1C = 0; UCSR1C = 0;
/* Set the new baud rate before configuring the USART */ /* Set the new baud rate before configuring the USART */
UBRR1 = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS); 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 */ /* 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)); UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
UCSR1C = ConfigMask;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment