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

[pub/USBasp.git] / Bootloaders / CDC / Descriptors.h

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 8cef3f9..c843bec 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] 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
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -83,11 +83,11 @@
                #elif defined(__AVR_ATmega8U2__)
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93
                #elif defined(__AVR_ATmega8U2__)
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93

-                       #define AVR_SIGNATURE_3               0x82
+                       #define AVR_SIGNATURE_3               0x89

                #elif defined(__AVR_AT90USB82__)
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_AT90USB82__)
                        #define AVR_SIGNATURE_1               0x1E

-                       #define AVR_SIGNATURE_2               0x93
-                       #define AVR_SIGNATURE_3               0x89
+                       #define AVR_SIGNATURE_2               0x94
+                       #define AVR_SIGNATURE_3               0x82

                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
                #else
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif


@@ -108,40 +108,6 @@
                #define CDC_NOTIFICATION_EPSIZE        8
 
        /* Type Defines: */
                #define CDC_NOTIFICATION_EPSIZE        8
 
        /* Type Defines: */

-               /** Type define for a CDC class-specific functional header descriptor. This indicates to the host that the device
-                *  contains one or more CDC functional data descriptors, which give the CDC interface's capabilities and configuration.
-                *  See the CDC class specification for more details.
-                */
-               typedef struct
-               {
-                       USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-                       uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors. */
-                       uint16_t                CDCSpecification; /**< Version number of the CDC specification implemented by the device,
-                                                                  *   encoded in BCD format.
-                                                                  */
-               } USB_Descriptor_CDC_FunctionalHeader_t;
-
-               /** Type define for a CDC class-specific functional ACM descriptor. This indicates to the host that the CDC interface
-                *  supports the CDC ACM subclass of the CDC specification. See the CDC class specification for more details.
-                */
-               typedef struct
-               {
-                       USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-                       uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors. */
-                       uint8_t                 Capabilities; /**< Capabilities of the ACM interface, given as a bit mask. */
-               } USB_Descriptor_CDC_FunctionalACM_t;
-
-               /** Type define for a CDC class-specific functional Union descriptor. This indicates to the host that specific
-                *  CDC control and data interfaces are related. See the CDC class specification for more details.
-                */
-               typedef struct
-               {
-                       USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-                       uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors. */
-                       uint8_t                 MasterInterfaceNumber; /**< Interface number of the CDC Control interface. */
-                       uint8_t                 SlaveInterfaceNumber; /**< Interface number of the CDC Data interface. */
-               } USB_Descriptor_CDC_FunctionalUnion_t;
-

                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which
                 *  vary between devices, and which describe the device's usage to the host.
                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which
                 *  vary between devices, and which describe the device's usage to the host.


@@ -149,11 +115,15 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;

+                       
+                       // CDC Control Interface

                        USB_Descriptor_Interface_t               CDC_CCI_Interface;
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;

-                       USB_Descriptor_CDC_FunctionalHeader_t    CDC_Functional_Header;
-                       USB_Descriptor_CDC_FunctionalACM_t       CDC_Functional_ACM;
-                       USB_Descriptor_CDC_FunctionalUnion_t     CDC_Functional_Union;
+                       USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;
+                       USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;
+                       USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;

                        USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;
                        USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;

+                       
+                       // CDC Data Interface

                        USB_Descriptor_Interface_t               CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;
                        USB_Descriptor_Interface_t               CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;