Partial commit: Rename USBFOO LED driver to fix capitalisation of file name, which...

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

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 4610888..9c6eb04 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   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
-  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
-  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
@@ -83,30 +83,30 @@
                #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
-                       #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
 
                /** Endpoint number for the CDC control interface event notification endpoint. */
-               #define CDC_NOTIFICATION_EPNUM         3
-
-               /** Size of the CDC control interface notification endpoint bank, in bytes. */
-               #define CDC_NOTIFICATION_EPSIZE        8
+               #define CDC_NOTIFICATION_EPNUM         2
 
                /** Endpoint number for the CDC data interface TX (data IN) endpoint. */
-               #define CDC_TX_EPNUM                   1        
+               #define CDC_TX_EPNUM                   3
 
                /** Endpoint number for the CDC data interface RX (data OUT) endpoint. */
-               #define CDC_RX_EPNUM                   2        
+               #define CDC_RX_EPNUM                   4
 
                /** Size of the CDC data interface TX and RX data endpoint banks, in bytes. */
                #define CDC_TXRX_EPSIZE                16
 
+               /** Size of the CDC control interface notification endpoint bank, in bytes. */
+               #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.
@@ -130,7 +130,7 @@
                        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.
                 */
@@ -166,3 +166,4 @@
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
+