X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ea922c98d187eb74c31535afa3334ead5bd50526..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Projects/AVRISP-MKII/Descriptors.h

diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h
index c831cffd6..786e487bd 100644
--- a/Projects/AVRISP-MKII/Descriptors.h
+++ b/Projects/AVRISP-MKII/Descriptors.h
@@ -37,18 +37,11 @@
 #define _DESCRIPTORS_H_
 
 	/* Includes: */
-		#include <LUFA/Common/Common.h>
-		#include <LUFA/Drivers/USB/USB.h>
+		#include <avr/pgmspace.h>
 
-		#if (ARCH == ARCH_AVR8)
-			#include <avr/pgmspace.h>
-		#endif
+		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */
-		#if (ARCH == ARCH_UC3) // TODO: FIXME
-			#define PROGMEM const
-		#endif
-	
 		#if !defined(LIBUSB_DRIVER_COMPAT)
 			/** Endpoint number of the AVRISP data OUT endpoint. */
 			#define AVRISP_DATA_OUT_EPNUM      2
@@ -74,10 +67,12 @@
 		typedef struct
 		{
 			USB_Descriptor_Configuration_Header_t    Config;
+			
+			// Atmel AVRISP-MKII Interface
 			USB_Descriptor_Interface_t               AVRISP_Interface;
 			USB_Descriptor_Endpoint_t                AVRISP_DataInEndpoint;
 			USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;
-		} ATTR_PACKED USB_Descriptor_Configuration_t;
+		} USB_Descriptor_Configuration_t;
 
 	/* Function Prototypes: */
 		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,