X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/092f82e06fc64436fd957b4b6b8d5ce33532efae..a8871c7fba73307226bd13e2cad4c840c850e6f1:/Bootloaders/DFU/Descriptors.h

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index fc3d5ffce..5b38e60fc 100644
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -68,16 +68,16 @@
 			#define AVR_SIGNATURE_1               0x1E
 			#define AVR_SIGNATURE_2               0x97
 			#define AVR_SIGNATURE_3               0x82
-		#elif defined(__AVR_AT90USB1286__)
-			#define PRODUCT_ID_CODE               0x2FFB
-			#define AVR_SIGNATURE_1               0x1E
-			#define AVR_SIGNATURE_2               0x97
-			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB647__)
 			#define PRODUCT_ID_CODE               0x2FF9
 			#define AVR_SIGNATURE_1               0x1E
 			#define AVR_SIGNATURE_2               0x96
 			#define AVR_SIGNATURE_3               0x82
+		#elif defined(__AVR_AT90USB1286__)
+			#define PRODUCT_ID_CODE               0x2FFB
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x97
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB646__)
 			#define PRODUCT_ID_CODE               0x2FF9
 			#define AVR_SIGNATURE_1               0x1E
@@ -93,16 +93,16 @@
 			#define AVR_SIGNATURE_1               0x1E
 			#define AVR_SIGNATURE_2               0x95
 			#define AVR_SIGNATURE_3               0x87
-		#elif defined(__AVR_ATmega32U2__)
-			#define PRODUCT_ID_CODE               0x2FF0
-			#define AVR_SIGNATURE_1               0x1E
-			#define AVR_SIGNATURE_2               0x95
-			#define AVR_SIGNATURE_3               0x8A
 		#elif defined(__AVR_ATmega16U4__)
 			#define PRODUCT_ID_CODE               0x2FF3
 			#define AVR_SIGNATURE_1               0x1E
 			#define AVR_SIGNATURE_2               0x94
 			#define AVR_SIGNATURE_3               0x88
+		#elif defined(__AVR_ATmega32U2__)
+			#define PRODUCT_ID_CODE               0x2FF0
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x95
+			#define AVR_SIGNATURE_3               0x8A
 		#elif defined(__AVR_ATmega16U2__)
 			#define PRODUCT_ID_CODE               0x2FEF
 			#define AVR_SIGNATURE_1               0x1E
@@ -140,19 +140,19 @@
 			USB_Descriptor_Header_t               Header; /**< Standard descriptor header structure */
 			
 			uint8_t                               Attributes; /**< DFU device attributes, a mask comprising of the
-			                                                    *  ATTR_* macros listed in this source file
-			                                                    */
+			                                                   *  ATTR_* macros listed in this source file
+			                                                   */
 			uint16_t                              DetachTimeout; /**< Timeout in milliseconds between a USB_DETACH
-			                                                        *  command being issued and the device detaching
-			                                                        *  from the USB bus
-			                                                        */																	
+			                                                       *  command being issued and the device detaching
+			                                                       *  from the USB bus
+			                                                       */																	
 			uint16_t                              TransferSize; /**< Maximum number of bytes the DFU device can accept
-			                                                      *  from the host in a transaction
-			                                                      */			
+			                                                     *  from the host in a transaction
+			                                                     */			
 			uint16_t                              DFUSpecification;	/**< BCD packed DFU specification number this DFU
-			                                                          *  device complies with
-			                                                          */
-		} USB_DFU_Functional_Descriptor_t;
+			                                                         *  device complies with
+			                                                         */
+		} USB_Descriptor_DFU_Functional_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
@@ -162,7 +162,7 @@
 		{
 			USB_Descriptor_Configuration_Header_t Config;
 			USB_Descriptor_Interface_t            DFU_Interface;
-			USB_DFU_Functional_Descriptor_t       DFU_Functional;
+			USB_Descriptor_DFU_Functional_t       DFU_Functional;
 		} USB_Descriptor_Configuration_t;
 		
 	/* Function Prototypes: */