Minor documentation adjustments to the demos, projects and bootloaders to ensure...

[pub/USBasp.git] / Projects / AVRISP-MKII / Descriptors.h

diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h
index c831cff..1b140f3 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.h
+++ b/Projects/AVRISP-MKII/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -37,30 +37,20 @@
 #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
+               #if !defined(LIBUSB_DRIVER_COMPAT) || defined(__DOXYGEN__)
+                       /** Endpoint address of the AVRISP data OUT endpoint. */
+                       #define AVRISP_DATA_OUT_EPADDR     (ENDPOINT_DIR_OUT | 2)
 
-                       /** Endpoint number of the AVRISP data IN endpoint. */
-                       #define AVRISP_DATA_IN_EPNUM       2
+                       /** Endpoint address of the AVRISP data IN endpoint. */
+                       #define AVRISP_DATA_IN_EPADDR      (ENDPOINT_DIR_IN  | 2)
                #else
-                       /** Endpoint number of the AVRISP data OUT endpoint. */
-                       #define AVRISP_DATA_OUT_EPNUM      2
-
-                       /** Endpoint number of the AVRISP data IN endpoint. */
-                       #define AVRISP_DATA_IN_EPNUM       3
+                       #define AVRISP_DATA_OUT_EPADDR     (ENDPOINT_DIR_OUT | 2)
+                       #define AVRISP_DATA_IN_EPADDR      (ENDPOINT_DIR_IN  | 3)
                #endif
 
                /** Size in bytes of the AVRISP data endpoint. */
@@ -74,10 +64,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,