Finish initial draft of the Host Mode HID Class driver.

[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 bb1b4da..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
@@ -263,11 +263,7 @@ void CDC_Task(void)
        if ((Tx_Buffer.Elements) && LineEncoding.BaudRateBPS)\r
        {\r
                /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
-               while (!(Endpoint_IsReadWriteAllowed()))\r
-               {\r
-                       if (USB_DeviceState == DEVICE_STATE_Unattached)\r
-                         return;\r
-               }\r
+               Endpoint_WaitUntilReady();\r
                \r
                /* Write the bytes from the buffer to the endpoint while space is available */\r
                while (Tx_Buffer.Elements && Endpoint_IsReadWriteAllowed())\r
@@ -287,11 +283,7 @@ void CDC_Task(void)
                if (IsFull && !(Tx_Buffer.Elements))\r
                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
-                       while (!(Endpoint_IsReadWriteAllowed()))\r
-                       {\r
-                               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
-                                 return;\r
-                       }\r
+                       Endpoint_WaitUntilReady();\r
                                \r
                        /* Send an empty packet to terminate the transfer */\r
                        Endpoint_ClearIN();\r
@@ -304,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