Fixed programming errors in the AVRISP-MKII project when the programming packet is...

[pub/USBasp.git] / Demos / Device / ClassDriver / DualVirtualSerial / Descriptors.h

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
index fd6735e..aa86b0e 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,7 +32,7 @@
  *
  *  Header file for Descriptors.c.
  */
  *
  *  Header file for Descriptors.c.
  */

- 
+

 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 


@@ -40,26 +40,25 @@
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/USB/Class/CDC.h>

 
        /* Macros: */
 
        /* Macros: */

-               /** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */
-               #define CDC1_NOTIFICATION_EPNUM        3
-

                /** Endpoint number of the first CDC interface's device-to-host data IN endpoint. */
                #define CDC1_TX_EPNUM                  1
 
                /** Endpoint number of the first CDC interface's host-to-device data OUT endpoint. */
                #define CDC1_RX_EPNUM                  2
 
                /** Endpoint number of the first CDC interface's device-to-host data IN endpoint. */
                #define CDC1_TX_EPNUM                  1
 
                /** Endpoint number of the first CDC interface's host-to-device data OUT endpoint. */
                #define CDC1_RX_EPNUM                  2
 

-               /** Endpoint number of the second CDC interface's device-to-host notification IN endpoint. */
-               #define CDC2_NOTIFICATION_EPNUM        4
+               /** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */
+               #define CDC1_NOTIFICATION_EPNUM        3

 
                /** Endpoint number of the second CDC interface's device-to-host data IN endpoint. */
 
                /** Endpoint number of the second CDC interface's device-to-host data IN endpoint. */

-               #define CDC2_TX_EPNUM                  5
+               #define CDC2_TX_EPNUM                  4

 
                /** Endpoint number of the second CDC interface's host-to-device data OUT endpoint. */
 
                /** Endpoint number of the second CDC interface's host-to-device data OUT endpoint. */

-               #define CDC2_RX_EPNUM                  6
+               #define CDC2_RX_EPNUM                  5
+
+               /** Endpoint number of the second CDC interface's device-to-host notification IN endpoint. */
+               #define CDC2_NOTIFICATION_EPNUM        6

 
                /** Size in bytes of the CDC device-to-host notification IN endpoints. */
                #define CDC_NOTIFICATION_EPSIZE        8
 
                /** Size in bytes of the CDC device-to-host notification IN endpoints. */
                #define CDC_NOTIFICATION_EPSIZE        8


@@ -77,18 +76,18 @@
                        USB_Descriptor_Configuration_Header_t    Config;
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;
                        USB_Descriptor_Configuration_Header_t    Config;
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;
-                       CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;
-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;
+                       USB_CDC_Descriptor_FunctionalHeader_t    CDC1_Functional_Header;
+                       USB_CDC_Descriptor_FunctionalACM_t       CDC1_Functional_ACM;
+                       USB_CDC_Descriptor_FunctionalUnion_t     CDC1_Functional_Union;

                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;
                        USB_Descriptor_Interface_t               CDC1_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;
                        USB_Descriptor_Interface_t               CDC1_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;
-                       CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;
-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;
+                       USB_CDC_Descriptor_FunctionalHeader_t    CDC2_Functional_Header;
+                       USB_CDC_Descriptor_FunctionalACM_t       CDC2_Functional_ACM;
+                       USB_CDC_Descriptor_FunctionalUnion_t     CDC2_Functional_Union;

                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;
                        USB_Descriptor_Interface_t               CDC2_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC2_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;
                        USB_Descriptor_Interface_t               CDC2_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC2_DataOutEndpoint;