Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[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 3ed406d..af963b1 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -192,9 +192,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                                 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
                                */\r
 \r
                                                 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
                                */\r
 \r

-                               /* Acknowledge status stage */\r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -204,89 +202,98 @@ void EVENT_USB_UnhandledControlPacket(void)
 /** Task to manage CDC data transmission and reception to and from the host, from and to the physical USART. */\r
 void CDC_Task(void)\r
 {\r
 /** Task to manage CDC data transmission and reception to and from the host, from and to the physical USART. */\r
 void CDC_Task(void)\r
 {\r

-       if (USB_IsConnected)\r
-       {\r
+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+         \r

 #if 0\r
 #if 0\r

-               /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r
-                                handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
-               */\r
+       /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r
+                        handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
+       */\r

 \r
 \r

-               USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
-                       {\r
-                               .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                               .Notification     = NOTIF_SerialState,\r
-                               .wValue           = 0,\r
-                               .wIndex           = 0,\r
-                               .wLength          = sizeof(uint16_t),\r
-                       };\r
-                       \r
-               uint16_t LineStateMask;\r
-               \r
-               // Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host\r
+       USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
+               {\r
+                       .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                       .Notification     = NOTIF_SerialState,\r
+                       .wValue           = 0,\r
+                       .wIndex           = 0,\r
+                       .wLength          = sizeof(uint16_t),\r
+               };\r

                \r
                \r

-               Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
-               Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
-               Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
-               Endpoint_ClearIN();\r
+       uint16_t LineStateMask;\r
+       \r
+       // Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host\r
+       \r
+       Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
+       Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
+       Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
+       Endpoint_ClearIN();\r

 #endif\r
 \r
 #endif\r
 \r

-               /* Select the Serial Rx Endpoint */\r
-               Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
-               \r
-               /* Check to see if a packet has been received from the host */\r
-               if (Endpoint_IsOUTReceived())\r
+       /* Select the Serial Rx Endpoint */\r
+       Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
+       \r
+       /* Check to see if a packet has been received from the host */\r
+       if (Endpoint_IsOUTReceived())\r
+       {\r
+               /* Read the bytes in from the endpoint into the buffer while space is available */\r
+               while (Endpoint_BytesInEndpoint() && (Rx_Buffer.Elements != BUFF_STATICSIZE))\r

                {\r
                {\r

-                       /* Read the bytes in from the endpoint into the buffer while space is available */\r
-                       while (Endpoint_BytesInEndpoint() && (BUFF_STATICSIZE - Rx_Buffer.Elements))\r
-                       {\r
-                               /* Store each character from the endpoint */\r
-                               Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());\r
-                       }\r
-                       \r
-                       /* Check to see if all bytes in the current packet have been read */\r
-                       if (!(Endpoint_BytesInEndpoint()))\r
-                       {\r
-                               /* Clear the endpoint buffer */\r
-                               Endpoint_ClearOUT();\r
-                       }\r
+                       /* Store each character from the endpoint */\r
+                       Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());\r

                }\r
                \r
                }\r
                \r

-               /* Check if Rx buffer contains data - if so, send it */\r
-               if (Rx_Buffer.Elements)\r
-                 Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r
+               /* Check to see if all bytes in the current packet have been read */\r
+               if (!(Endpoint_BytesInEndpoint()))\r
+               {\r
+                       /* Clear the endpoint buffer */\r
+                       Endpoint_ClearOUT();\r
+               }\r
+       }\r
+       \r
+       /* Check if Rx buffer contains data - if so, send it */\r
+       if (Rx_Buffer.Elements)\r
+         Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r

 \r
 \r

-               /* Select the Serial Tx Endpoint */\r
-               Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
+       /* Select the Serial Tx Endpoint */\r
+       Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r

 \r
 \r

-               /* Check if the Tx buffer contains anything to be sent to the host */\r
-               if (Tx_Buffer.Elements)\r
+       /* Check if the Tx buffer contains anything to be sent to the host */\r
+       if (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
+               \r
+               /* Write the bytes from the buffer to the endpoint while space is available */\r
+               while (Tx_Buffer.Elements && Endpoint_IsReadWriteAllowed())\r
+               {\r
+                       /* Write each byte retreived from the buffer to the endpoint */\r
+                       Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
+               }\r
+               \r
+               /* Remember if the packet to send completely fills the endpoint */\r
+               bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
+               \r
+               /* Send the data */\r
+               Endpoint_ClearIN();\r
+\r
+               /* If no more data to send and the last packet filled the endpoint, send an empty packet to release\r
+                * the buffer on the receiver (otherwise all data will be cached until a non-full packet is received) */\r
+               if (IsFull && !(Tx_Buffer.Elements))\r

                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\r

-                       while (!(Endpoint_IsReadWriteAllowed()));\r
-                       \r
-                       /* Write the bytes from the buffer to the endpoint while space is available */\r
-                       while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
+                       while (!(Endpoint_IsReadWriteAllowed()))\r

                        {\r
                        {\r

-                               /* Write each byte retreived from the buffer to the endpoint */\r
-                               Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
+                               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                                 return;\r

                        }\r
                        }\r

-                       \r
-                       /* Remember if the packet to send completely fills the endpoint */\r
-                       bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
-                       \r
-                       /* Send the data */\r
+                               \r
+                       /* Send an empty packet to terminate the transfer */\r

                        Endpoint_ClearIN();\r
                        Endpoint_ClearIN();\r

-\r
-                       /* If no more data to send and the last packet filled the endpoint, send an empty packet to release\r
-                        * the buffer on the receiver (otherwise all data will be cached until a non-full packet is received) */\r
-                       if (IsFull && !(Tx_Buffer.Elements))\r
-                       {\r
-                               /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
-                               while (!(Endpoint_IsReadWriteAllowed()));\r
-\r
-                               /* Send an empty packet to terminate the transfer */\r
-                               Endpoint_ClearIN();\r
-                       }\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r


@@ -297,11 +304,8 @@ void CDC_Task(void)
 ISR(USART1_RX_vect, ISR_BLOCK)\r
 {\r
        /* Only store received characters if the USB interface is connected */\r
 ISR(USART1_RX_vect, ISR_BLOCK)\r
 {\r
        /* Only store received characters if the USB interface is connected */\r

-       if (USB_IsConnected)\r
-       {\r
-               /* Character received, store it into the buffer */\r
-               Buffer_StoreElement(&Tx_Buffer, UDR1);\r
-       }\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         Buffer_StoreElement(&Tx_Buffer, UDR1);\r

 }\r
 \r
 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */\r
 }\r
 \r
 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */\r