X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/67f390fe746ccc4d1dceac23f590eb1723cb7ff2..eff07bb87758a12064d9de9c859b1e6e6502f2ea:/Demos/Device/LowLevel/CDC/CDC.c?ds=inline

diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/CDC/CDC.c
index d8263b11f..73b486ccd 100644
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -49,37 +49,53 @@ CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
                                  .CharFormat  = OneStopBit,
                                  .ParityType  = Parity_None,
                                  .DataBits    = 8            };
+							
+/** Indicates if the host has set the device line encoding. Until the line encoding is set by the host, the device should
+ *  not attempt to send any bytes.
+ */	 
+bool LineEncodingSet = false;
+
 
 #if 0
 /* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in
  *       <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).
  */
 	
-static int CDC_putchar (char c, FILE *stream)
-{
-	if (!(USB_IsConnected))
-	  return -1;
-	  
+static int CDC_putchar(char c, FILE *stream)
+{	  
 	Endpoint_SelectEndpoint(CDC_TX_EPNUM);
-	while (!(Endpoint_IsReadWriteAllowed()));
+
+	if (!(LineEncodingSet))
+	  return -1;
+	
+	while (!(Endpoint_IsReadWriteAllowed()))
+	{
+		if (USB_DeviceState != DEVICE_STATE_Configured)
+		  return -1;
+	}
+
 	Endpoint_Write_Byte(c);
 	Endpoint_ClearIN();
 	
 	return 0;
 }
 
-static int CDC_getchar (FILE *stream)
+static int CDC_getchar(FILE *stream)
 {
 	int c;
-	  
+
+	if (!(LineEncodingSet))
+	  return -1;
+
 	Endpoint_SelectEndpoint(CDC_RX_EPNUM);
 	
 	for (;;)
 	{
-		if (!(USB_IsConnected))
-		  return -1;
-
-		while (!(Endpoint_IsReadWriteAllowed()));
+		while (!(Endpoint_IsReadWriteAllowed()))
+		{
+			if (USB_DeviceState != DEVICE_STATE_Configured)
+			  return -1;
+		}
 	
 		if (!(Endpoint_BytesInEndpoint()))
 		{
@@ -212,6 +228,9 @@ void EVENT_USB_UnhandledControlPacket(void)
 
 				/* Read the line coding data in from the host into the global struct */
 				Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
+				
+				/* Indicate that the line encoding has been set, and the device may now send data */
+				LineEncodingSet = true;
 
 				/* Finalize the stream transfer to clear the last packet from the host */
 				Endpoint_ClearIN();
@@ -229,9 +248,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 						 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:
 				*/
 				
-				/* Acknowledge status stage */
-				while (!(Endpoint_IsINReady()));
-				Endpoint_ClearIN();
+				Endpoint_ClearStatusStage();
 			}
 	
 			break;
@@ -244,18 +261,17 @@ void CDC_Task(void)
 	char*       ReportString    = NULL;
 	uint8_t     JoyStatus_LCL   = Joystick_GetStatus();
 	static bool ActionSent      = false;
-
-	char* JoystickStrings[] =
-		{
-			"Joystick Up\r\n",
-			"Joystick Down\r\n",
-			"Joystick Left\r\n",
-			"Joystick Right\r\n",
-			"Joystick Pressed\r\n",
-		};
+	char*       JoystickStrings[] =
+					{
+						"Joystick Up\r\n",
+						"Joystick Down\r\n",
+						"Joystick Left\r\n",
+						"Joystick Right\r\n",
+						"Joystick Pressed\r\n",
+					};
 	
 	/* Device must be connected and configured for the task to run */
-	if (!(USB_IsConnected) || !(USB_ConfigurationNumber))
+	if (USB_DeviceState != DEVICE_STATE_Configured)
 	  return;
 	  
 #if 0
@@ -298,7 +314,7 @@ void CDC_Task(void)
 	{
 		ActionSent = false;
 	}
-	else if (ActionSent == false)
+	else if ((ActionSent == false) && LineEncodingSet)
 	{
 		ActionSent = true;
 
@@ -319,7 +335,11 @@ void CDC_Task(void)
 		if (IsFull)
 		{
 			/* Wait until the endpoint is ready for another packet */
-			while (!(Endpoint_IsINReady()));
+			while (!(Endpoint_IsINReady()))
+			{
+				if (USB_DeviceState == DEVICE_STATE_Unattached)
+				  return;
+			}
 			
 			/* Send an empty packet to ensure that the host does not buffer data sent to it */
 			Endpoint_ClearIN();