Device mode class driver callbacks are now fired before the control request status...

[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 49befad..89a8855 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

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


@@ -75,20 +75,18 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r

-                       USB_Descriptor_Interface_Association_t   IAD1;\r
+                       USB_Descriptor_Interface_Association_t   CDC1_IAD;\r

                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r
                        USB_Descriptor_Interface_t               CDC1_DCI_Interface;\r
                        USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r
                        USB_Descriptor_Interface_t               CDC1_DCI_Interface;\r
                        USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;\r

-                       USB_Descriptor_Interface_Association_t   IAD2;\r
+                       USB_Descriptor_Interface_Association_t   CDC2_IAD;\r

                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r