Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
index a2fff65..3beea74 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
@@ -43,13 +43,13 @@
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r

-               #define CDC_NOTIFICATION_EPNUM         2\r
+               #define CDC_NOTIFICATION_EPNUM         1\r

 \r
                /** Endpoint number of the CDC device-to-host data IN endpoint. */\r
 \r
                /** Endpoint number of the CDC device-to-host data IN endpoint. */\r

-               #define CDC_TX_EPNUM                   3\r
+               #define CDC_TX_EPNUM                   2\r

 \r
                /** Endpoint number of the CDC host-to-device data OUT endpoint. */\r
 \r
                /** Endpoint number of the CDC host-to-device data OUT endpoint. */\r

-               #define CDC_RX_EPNUM                   4\r
+               #define CDC_RX_EPNUM                   3\r

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


@@ -58,10 +58,10 @@
                #define CDC_TXRX_EPSIZE                16\r
 \r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r
                #define CDC_TXRX_EPSIZE                16\r
 \r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r

-               #define MASS_STORAGE_IN_EPNUM          3\r
+               #define MASS_STORAGE_IN_EPNUM          4\r

 \r
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */\r
 \r
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */\r

-               #define MASS_STORAGE_OUT_EPNUM         4\r
+               #define MASS_STORAGE_OUT_EPNUM         5\r

 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r
 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r


@@ -74,15 +74,21 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r

+\r
+                       // CDC Control Interface\r

                        USB_Descriptor_Interface_Association_t   CDC_IAD;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;\r
                        USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;\r
                        USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;\r
                        USB_Descriptor_Interface_Association_t   CDC_IAD;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;\r
                        USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;\r
                        USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;\r

+\r
+                       // CDC Data Interface\r

                        USB_Descriptor_Interface_t               CDC_DCI_Interface;\r
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;\r
                        USB_Descriptor_Interface_t               CDC_DCI_Interface;\r
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;\r

+\r
+                       // Mass Storage Interface\r

                        USB_Descriptor_Interface_t               MS_Interface;\r
                        USB_Descriptor_Endpoint_t                MS_DataInEndpoint;\r
                        USB_Descriptor_Endpoint_t                MS_DataOutEndpoint;\r
                        USB_Descriptor_Interface_t               MS_Interface;\r
                        USB_Descriptor_Endpoint_t                MS_DataInEndpoint;\r
                        USB_Descriptor_Endpoint_t                MS_DataOutEndpoint;\r