diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:47:56 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:47:56 +0000 |
| commit | 0b6d5467bc70ba36ff71a186da9cf4d0742612a6 (patch) | |
| tree | a0292668256c00166ee52cac38da1d4dc7316726 /Projects/AVRISP-MKII/Descriptors.h | |
| parent | ea922c98d187eb74c31535afa3334ead5bd50526 (diff) | |
| download | lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.tar.gz lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.tar.bz2 lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.zip | |
Oops - revert commit of an incomplete port of the AVRISP-MKII project.
Diffstat (limited to 'Projects/AVRISP-MKII/Descriptors.h')
| -rw-r--r-- | Projects/AVRISP-MKII/Descriptors.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h index c831cffd6..ca68fd518 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 @@ -77,7 +70,7 @@ 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, |