AppConfigHeaders: Switch DualRole and low level Host mode demos to use LUFAConfig...

[pub/USBasp.git] / Projects / XPLAINBridge / AVRISPDescriptors.h

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h
index 8c9bc29..c0eeedf 100644 (file)
--- a/Projects/XPLAINBridge/AVRISPDescriptors.h
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -42,18 +42,15 @@
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Macros: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Macros: */

-               #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
                #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. */
                #endif
 
                /** Size in bytes of the AVRISP data endpoint. */


@@ -67,6 +64,8 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;
                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;
                        USB_Descriptor_Interface_t               AVRISP_Interface;
                        USB_Descriptor_Endpoint_t                AVRISP_DataInEndpoint;
                        USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;