Standardized the naming scheme given to configuration descriptor sub-elements in...

[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 2add46a..532c266 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -75,7 +75,7 @@
                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
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_CallManagement;\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


@@ -85,7 +85,7 @@
                        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_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
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_CallManagement;\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