X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/357ccc577bc6f8710ff942019e16cfa6a08466b7..cf610c5c91c3eee02dec7ca848acc8da831ad98a:/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 4b5409f5c..444dc019d 100644
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -36,7 +36,6 @@
 
 #include "CDC.h"
 
-/* Globals: */
 /** Contains the current baud rate and other settings of the virtual serial port. While this demo does not use
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host
  *  upon request or the host will assume the device is non-functional.
@@ -50,6 +49,7 @@ CDC_Line_Coding_t LineEncoding = { .BaudRateBPS = 0,
                                    .ParityType  = Parity_None,
                                    .DataBits    = 8            };
 
+
 #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).
@@ -62,11 +62,8 @@ static int CDC_putchar(char c, FILE *stream)
 	if (!(LineEncoding.BaudRateBPS))
 	  return -1;
 	
-	while (!(Endpoint_IsReadWriteAllowed()))
-	{
-		if (USB_DeviceState != DEVICE_STATE_Configured)
-		  return -1;
-	}
+	if (Endpoint_WaitUntilReady())
+	  return -1;
 
 	Endpoint_Write_Byte(c);
 	Endpoint_ClearIN();
@@ -85,11 +82,8 @@ static int CDC_getchar(FILE *stream)
 	
 	for (;;)
 	{
-		while (!(Endpoint_IsReadWriteAllowed()))
-		{
-			if (USB_DeviceState != DEVICE_STATE_Configured)
-			  return -1;
-		}
+		if (Endpoint_WaitUntilReady())
+		  return -1;
 	
 		if (!(Endpoint_BytesInEndpoint()))
 		{
@@ -143,7 +137,7 @@ void SetupHardware(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and
  *  starts the library USB task to begin the enumeration and USB management process.
  */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	/* Indicate USB enumerating */
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
@@ -152,7 +146,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
  *  the status LEDs and stops the USB management and CDC management tasks.
  */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {
 	/* Indicate USB not ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
@@ -161,7 +155,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
  *  of the USB device after enumeration - the device endpoints are configured and the CDC management task started.
  */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	/* Indicate USB connected and ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -187,13 +181,16 @@ void EVENT_USB_ConfigurationChanged(void)
 	{
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	}
+	
+	/* Reset line encoding baud rate so that the host knows to send new values */
+	LineEncoding.BaudRateBPS = 0;
 }
 
-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
  *  control requests that are not handled internally by the USB library (including the CDC control commands,
  *  which are all issued via the control endpoint), so that they can be handled appropriately for the application.
  */
-void EVENT_USB_UnhandledControlPacket(void)
+void EVENT_USB_Device_UnhandledControlRequest(void)
 {
 	/* Process CDC specific control requests */
 	switch (USB_ControlRequest.bRequest)
@@ -250,14 +247,6 @@ 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",
-					};
 	
 	/* Device must be connected and configured for the task to run */
 	if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -288,22 +277,20 @@ void CDC_Task(void)
 
 	/* Determine if a joystick action has occurred */
 	if (JoyStatus_LCL & JOY_UP)
-	  ReportString = JoystickStrings[0];
+	  ReportString = "Joystick Up\r\n";
 	else if (JoyStatus_LCL & JOY_DOWN)
-	  ReportString = JoystickStrings[1];
+	  ReportString = "Joystick Down\r\n";
 	else if (JoyStatus_LCL & JOY_LEFT)
-	  ReportString = JoystickStrings[2];
+	  ReportString = "Joystick Left\r\n";
 	else if (JoyStatus_LCL & JOY_RIGHT)
-	  ReportString = JoystickStrings[3];
+	  ReportString = "Joystick Right\r\n";
 	else if (JoyStatus_LCL & JOY_PRESS)
-	  ReportString = JoystickStrings[4];
+	  ReportString = "Joystick Pressed\r\n";
+	else
+	  ActionSent = false;
 
 	/* Flag management - Only allow one string to be sent per action */
-	if (ReportString == NULL)
-	{
-		ActionSent = false;
-	}
-	else if ((ActionSent == false) && LineEncoding.BaudRateBPS)
+	if ((ReportString != NULL) && (ActionSent == false) && LineEncoding.BaudRateBPS)
 	{
 		ActionSent = true;
 
@@ -324,11 +311,7 @@ void CDC_Task(void)
 		if (IsFull)
 		{
 			/* Wait until the endpoint is ready for another packet */
-			while (!(Endpoint_IsINReady()))
-			{
-				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
-			}
+			Endpoint_WaitUntilReady();
 			
 			/* Send an empty packet to ensure that the host does not buffer data sent to it */
 			Endpoint_ClearIN();