Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project.

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index bbe2276..ed0e9e8 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -7,7 +7,23 @@
  /** \page Page_ChangeLog Project Changelog
   *
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
  /** \page Page_ChangeLog Project Changelog
   *
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX

-  *  - No Changes.
+  *  <b>New:</b>
+  *  - Core:
+  *   - <i>None</i>
+  *  - Library Applications:
+  *   - <i>None</i>
+  *
+  *  <b>Changed:</b>
+  *  - Core:
+  *   - <i>None</i>
+  *  - Library Applications:
+  *   - <i>None</i>
+  *
+  *  <b>Fixed:</b>
+  *  - Core:
+  *   - <i>None</i>
+  *  - Library Applications:
+  *   - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project

   *
   *  \section Sec_ChangeLog120730 Version 120730
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLog120730 Version 120730
   *  <b>New:</b>

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h
index a14515d..20725c5 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.h
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h
@@ -59,13 +59,13 @@
                /** Endpoint address of the AVRISP data IN endpoint, when in LibUSB driver compatibility mode. */
                #define AVRISP_DATA_IN_EPADDR_LIBUSB   (ENDPOINT_DIR_IN  | 3)
 
                /** Endpoint address of the AVRISP data IN endpoint, when in LibUSB driver compatibility mode. */
                #define AVRISP_DATA_IN_EPADDR_LIBUSB   (ENDPOINT_DIR_IN  | 3)
 

-               #if !defined(LIBUSB_DRIVER_COMPAT) || defined(__DOXYGEN__)
-                       /** Endpoint address of the AVRISP data IN endpoint. */
-                       #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_JUNGO
-               #elif defined(RESET_TOGGLES_LIBUSB_COMPAT)
+               #if defined(RESET_TOGGLES_LIBUSB_COMPAT)

                        #define AVRISP_DATA_IN_EPADDR      AVRISP_CurrDataINEndpointAddress
                        #define AVRISP_DATA_IN_EPADDR      AVRISP_CurrDataINEndpointAddress

-               #else
+               #elif defined(LIBUSB_DRIVER_COMPAT)

                        #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_LIBUSB
                        #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_LIBUSB

+               #else
+                       /** Endpoint address of the AVRISP data IN endpoint. */
+                       #define AVRISP_DATA_IN_EPADDR      AVRISP_DATA_IN_EPADDR_JUNGO

                #endif
                
                /** Size in bytes of the AVRISP data endpoint. */
                #endif
                
                /** Size in bytes of the AVRISP data endpoint. */