Cleanups to the Device mode Mass Storage demo applications' SCSI routines.

[pub/USBasp.git] / Demos / Device / LowLevel / USBtoSerial / USBtoSerial.c

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index 736c0af..92449a6 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -81,9 +81,9 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
+       Serial_Init(9600, false);\r
        LEDs_Init();\r
-       ReconfigureUSART();\r
-       USB_Init();     \r
+       USB_Init();\r
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
@@ -296,9 +296,11 @@ void CDC_Task(void)
  */\r
 ISR(USART1_RX_vect, ISR_BLOCK)\r
 {\r
+       uint8_t ReceivedByte = UDR1;\r
+\r
        /* Only store received characters if the USB interface is connected */\r
-       if ((USB_DeviceState != DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)\r
-         Buffer_StoreElement(&Tx_Buffer, UDR1);\r
+       if ((USB_DeviceState == DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)\r
+         Buffer_StoreElement(&Tx_Buffer, ReceivedByte);\r
 }\r
 \r
 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */\r