Renamed USB_Device_SetHighSpeed() to USB_Device_SetFullSpeed() so that the correct...

[pub/USBasp.git] / Demos / Device / ClassDriver / DualCDC / DualCDC.c

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index ca33f10..82ed59d 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -41,18 +41,21 @@
  *  within a device can be differentiated from one another. This is for the first CDC interface,\r
  *  which sends strings to the host for each joystick movement.\r
  */\r
  *  within a device can be differentiated from one another. This is for the first CDC interface,\r
  *  which sends strings to the host for each joystick movement.\r
  */\r

-USB_ClassInfo_CDC_t VirtualSerial1_CDC_Interface =\r
+USB_ClassInfo_CDC_Device_t VirtualSerial1_CDC_Interface =\r

        {\r
        {\r

-               .ControlInterfaceNumber     = 0,\r
+               .Config =\r
+                       {\r
+                               .ControlInterfaceNumber     = 0,\r

 \r
 \r

-               .DataINEndpointNumber       = CDC1_TX_EPNUM,\r
-               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r
+                               .DataINEndpointNumber       = CDC1_TX_EPNUM,\r
+                               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r

 \r
 \r

-               .DataOUTEndpointNumber      = CDC1_RX_EPNUM,\r
-               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r
+                               .DataOUTEndpointNumber      = CDC1_RX_EPNUM,\r
+                               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r

 \r
 \r

-               .NotificationEndpointNumber = CDC1_NOTIFICATION_EPNUM,\r
-               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
+                               .NotificationEndpointNumber = CDC1_NOTIFICATION_EPNUM,\r
+                               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
+                       },\r

        };\r
 \r
 /** LUFA CDC Class driver interface configuration and state information. This structure is\r
        };\r
 \r
 /** LUFA CDC Class driver interface configuration and state information. This structure is\r


@@ -60,18 +63,21 @@ USB_ClassInfo_CDC_t VirtualSerial1_CDC_Interface =
  *  within a device can be differentiated from one another. This is for the second CDC interface,\r
  *  which echos back all received data from the host.\r
  */\r
  *  within a device can be differentiated from one another. This is for the second CDC interface,\r
  *  which echos back all received data from the host.\r
  */\r

-USB_ClassInfo_CDC_t VirtualSerial2_CDC_Interface =\r
+USB_ClassInfo_CDC_Device_t VirtualSerial2_CDC_Interface =\r

        {\r
        {\r

-               .ControlInterfaceNumber     = 2,\r
+               .Config =\r
+                       {\r
+                               .ControlInterfaceNumber     = 2,\r

 \r
 \r

-               .DataINEndpointNumber       = CDC2_TX_EPNUM,\r
-               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r
+                               .DataINEndpointNumber       = CDC2_TX_EPNUM,\r
+                               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r

 \r
 \r

-               .DataOUTEndpointNumber      = CDC2_RX_EPNUM,\r
-               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r
+                               .DataOUTEndpointNumber      = CDC2_RX_EPNUM,\r
+                               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r

 \r
 \r

-               .NotificationEndpointNumber = CDC2_NOTIFICATION_EPNUM,\r
-               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
+                               .NotificationEndpointNumber = CDC2_NOTIFICATION_EPNUM,\r
+                               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
+                       },\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -88,13 +94,11 @@ int main(void)
                CheckJoystickMovement();\r
 \r
                /* Discard all received data on the first CDC interface */\r
                CheckJoystickMovement();\r
 \r
                /* Discard all received data on the first CDC interface */\r

-               uint16_t BytesToDiscard = CDC_Device_BytesReceived(&VirtualSerial1_CDC_Interface);\r
-               while (BytesToDiscard--)\r
+               while (CDC_Device_BytesReceived(&VirtualSerial1_CDC_Interface))\r

                  CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);\r
 \r
                /* Echo all received data on the second CDC interface */\r
                  CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);\r
 \r
                /* Echo all received data on the second CDC interface */\r

-               uint16_t BytesToEcho = CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface);\r
-               while (BytesToEcho--)\r
+               while (CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface))\r

                  CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface));\r
                  \r
                CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);\r
                  CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface));\r
                  \r
                CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);\r


@@ -128,7 +132,7 @@ void CheckJoystickMovement(void)
        char*       ReportString  = NULL;\r
        static bool ActionSent = false;\r
 \r
        char*       ReportString  = NULL;\r
        static bool ActionSent = false;\r
 \r

-       char* JoystickStrings[] =\r
+       char* const JoystickStrings[] =\r

                {\r
                        "Joystick Up\r\n",\r
                        "Joystick Down\r\n",\r
                {\r
                        "Joystick Up\r\n",\r
                        "Joystick Down\r\n",\r