X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..8c6c27d88bb40ecf55f369fc4499ec990d2d93d2:/Demos/Device/ClassDriver/DualCDC/DualCDC.c?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index 216902c67..000d18b9a 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -41,18 +41,24 @@
  *  within a device can be differentiated from one another. This is for the first CDC interface,
  *  which sends strings to the host for each joystick movement.
  */
-USB_ClassInfo_CDC_t VirtualSerial1_CDC_Interface =
+USB_ClassInfo_CDC_Device_t VirtualSerial1_CDC_Interface =
 	{
-		.ControlInterfaceNumber     = 0,
-
-		.DataINEndpointNumber       = CDC1_TX_EPNUM,
-		.DataINEndpointSize         = CDC_TXRX_EPSIZE,
-
-		.DataOUTEndpointNumber      = CDC1_RX_EPNUM,
-		.DataOUTEndpointSize        = CDC_TXRX_EPSIZE,
-
-		.NotificationEndpointNumber = CDC1_NOTIFICATION_EPNUM,
-		.NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,
+		.Config =
+			{
+				.ControlInterfaceNumber           = 0,
+
+				.DataINEndpointNumber             = CDC1_TX_EPNUM,
+				.DataINEndpointSize               = CDC_TXRX_EPSIZE,
+				.DataINEndpointDoubleBank         = false,
+
+				.DataOUTEndpointNumber            = CDC1_RX_EPNUM,
+				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
+				.DataOUTEndpointDoubleBank        = false,
+
+				.NotificationEndpointNumber       = CDC1_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
+				.NotificationEndpointDoubleBank   = false,
+			},
 	};
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
@@ -60,18 +66,24 @@ USB_ClassInfo_CDC_t VirtualSerial1_CDC_Interface =
  *  within a device can be differentiated from one another. This is for the second CDC interface,
  *  which echos back all received data from the host.
  */
-USB_ClassInfo_CDC_t VirtualSerial2_CDC_Interface =
+USB_ClassInfo_CDC_Device_t VirtualSerial2_CDC_Interface =
 	{
-		.ControlInterfaceNumber     = 2,
-
-		.DataINEndpointNumber       = CDC2_TX_EPNUM,
-		.DataINEndpointSize         = CDC_TXRX_EPSIZE,
-
-		.DataOUTEndpointNumber      = CDC2_RX_EPNUM,
-		.DataOUTEndpointSize        = CDC_TXRX_EPSIZE,
-
-		.NotificationEndpointNumber = CDC2_NOTIFICATION_EPNUM,
-		.NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,
+		.Config =
+			{
+				.ControlInterfaceNumber           = 2,
+
+				.DataINEndpointNumber             = CDC2_TX_EPNUM,
+				.DataINEndpointSize               = CDC_TXRX_EPSIZE,
+				.DataINEndpointDoubleBank         = false,
+
+				.DataOUTEndpointNumber            = CDC2_RX_EPNUM,
+				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
+				.DataOUTEndpointDoubleBank        = false,
+
+				.NotificationEndpointNumber       = CDC2_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
+				.NotificationEndpointDoubleBank   = false,
+			},
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -88,17 +100,15 @@ int main(void)
 		CheckJoystickMovement();
 
 		/* Discard all received data on the first CDC interface */
-		uint16_t BytesToDiscard = USB_CDC_BytesReceived(&VirtualSerial1_CDC_Interface);
-		while (BytesToDiscard--)
-		  USB_CDC_ReceiveByte(&VirtualSerial1_CDC_Interface);
+		while (CDC_Device_BytesReceived(&VirtualSerial1_CDC_Interface))
+		  CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
 
 		/* Echo all received data on the second CDC interface */
-		uint16_t BytesToEcho = USB_CDC_BytesReceived(&VirtualSerial2_CDC_Interface);
-		while (BytesToEcho--)
-		  USB_CDC_SendByte(&VirtualSerial2_CDC_Interface, USB_CDC_ReceiveByte(&VirtualSerial2_CDC_Interface));
+		while (CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface))
+		  CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface));
 		  
-		USB_CDC_USBTask(&VirtualSerial1_CDC_Interface);
-		USB_CDC_USBTask(&VirtualSerial2_CDC_Interface);
+		CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);
+		CDC_Device_USBTask(&VirtualSerial2_CDC_Interface);
 		USB_USBTask();
 	}
 }
@@ -128,25 +138,16 @@ void CheckJoystickMovement(void)
 	char*       ReportString  = NULL;
 	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",
-		};
-
 	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;
 	  
@@ -154,37 +155,37 @@ void CheckJoystickMovement(void)
 	{
 		ActionSent = true;
 		
-		USB_CDC_SendString(&VirtualSerial1_CDC_Interface, ReportString, strlen(ReportString));		
+		CDC_Device_SendString(&VirtualSerial1_CDC_Interface, ReportString, strlen(ReportString));		
 	}
 }
 
 /** Event handler for the library USB Connection event. */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
 /** Event handler for the library USB Disconnection event. */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
 /** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 
-	if (!(USB_CDC_ConfigureEndpoints(&VirtualSerial1_CDC_Interface)))
+	if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial1_CDC_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
-	if (!(USB_CDC_ConfigureEndpoints(&VirtualSerial2_CDC_Interface)))
+	if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial2_CDC_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
-/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_UnhandledControlPacket(void)
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
 {
-	USB_CDC_ProcessControlPacket(&VirtualSerial1_CDC_Interface);
-	USB_CDC_ProcessControlPacket(&VirtualSerial2_CDC_Interface);
+	CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);
+	CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);
 }