Device mode class driver callbacks are now fired before the control request status...

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

diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h
index e9dbea9..3a48283 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.h
+++ b/Projects/AVRISP-MKII/Descriptors.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -42,11 +42,22 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
-               /** Endpoint number of the AVRISP bidirectional data endpoint. */\r
-               #define AVRISP_DATA_EPNUM              2\r
+               #if !defined(LIBUSB_FILTERDRV_COMPAT)\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r
+\r
+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       2\r
+               #else\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r
+\r
+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       3\r
+               #endif\r
 \r
                /** Size in bytes of the AVRISP data endpoint. */\r
-               #define AVRISP_DATA_EPSIZE             64       \r
+               #define AVRISP_DATA_EPSIZE             64\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
@@ -56,9 +67,9 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
-                       USB_Descriptor_Interface_t               AVRISPInterface;\r
-                       USB_Descriptor_Endpoint_t                DataInEndpoint;\r
-                       USB_Descriptor_Endpoint_t                DataOutEndpoint;\r
+                       USB_Descriptor_Interface_t               AVRISP_Interface;\r
+                       USB_Descriptor_Endpoint_t                AVRISP_DataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;\r
                } USB_Descriptor_Configuration_t;\r
 \r
        /* Function Prototypes: */\r