X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c1a1b6eeecb375259968ef6d989833312047f2d8..cfe054474ffafddcbba0f6d3f46d3f02473fac96:/Bootloaders/DFU/Descriptors.h

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index b6d1a2af3..0943ef32b 100644
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -44,11 +44,11 @@
 		#define DTYPE_DFUFunctional               0x21
 		
 		/** DFU attribute mask, indicating that the DFU device will detach and re-attach when a DFU_DETACH
-		 *  command is issued, rather than the host issing a USB Reset.
+		 *  command is issued, rather than the host issuing a USB Reset.
 		 */
 		#define ATTR_WILL_DETATCH                 (1 << 3)
 
-		/** DFU attribute mask, indicating that the DFU device can communicate during the manefestation phase
+		/** DFU attribute mask, indicating that the DFU device can communicate during the manifestation phase
 		 *  (memory programming phase).
 		 */
 		#define ATTR_MANEFESTATION_TOLLERANT      (1 << 2)
@@ -65,58 +65,49 @@
 
 		#if defined(__AVR_AT90USB1286__)
 			#define PRODUCT_ID_CODE               0x2FFB
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x97
-			#define SIGNATURE_BYTE_3              0x82
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x97
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB1287__)
 			#define PRODUCT_ID_CODE               0x2FFB
-			
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x97
-			#define SIGNATURE_BYTE_3              0x82
+			#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 SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x96
-			#define SIGNATURE_BYTE_3              0x82
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x96
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB647__)
 			#define PRODUCT_ID_CODE               0x2FF9
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x96
-			#define SIGNATURE_BYTE_3              0x82
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x96
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB162__)
 			#define PRODUCT_ID_CODE               0x2FFA
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x94
-			#define SIGNATURE_BYTE_3              0x82
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x94
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_AT90USB82__)
 			#define PRODUCT_ID_CODE               0x2FF7
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x94
-			#define SIGNATURE_BYTE_3              0x82
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x94
+			#define AVR_SIGNATURE_3               0x82
 		#elif defined(__AVR_ATmega32U6__)
 			#define PRODUCT_ID_CODE               0x2FFB
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x95
-			#define SIGNATURE_BYTE_3              0x88
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x95
+			#define AVR_SIGNATURE_3               0x88
 		#elif defined(__AVR_ATmega32U4__)
 			#define PRODUCT_ID_CODE               0x2FF4
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x95
-			#define SIGNATURE_BYTE_3              0x87	
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x95
+			#define AVR_SIGNATURE_3               0x87
 		#elif defined(__AVR_ATmega16U4__)
 			#define PRODUCT_ID_CODE               0x2FF3
-
-			#define SIGNATURE_BYTE_1              0x1E
-			#define SIGNATURE_BYTE_2              0x94
-			#define SIGNATURE_BYTE_3              0x88
+			#define AVR_SIGNATURE_1               0x1E
+			#define AVR_SIGNATURE_2               0x94
+			#define AVR_SIGNATURE_3               0x88
 		#else
 			#error The selected AVR part is not currently supported by this bootloader.
 		#endif
@@ -160,7 +151,7 @@
 		} USB_Descriptor_Configuration_t;
 		
 	/* Function Prototypes: */
-		uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-		                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif