Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

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

diff --git a/Projects/AVRISP-MKII/Config/AppConfig.h b/Projects/AVRISP-MKII/Config/AppConfig.h
index b7598a5..bd5ab93 100644 (file)
--- a/Projects/AVRISP-MKII/Config/AppConfig.h
+++ b/Projects/AVRISP-MKII/Config/AppConfig.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -33,10 +33,10 @@
  *
  *  This is a header file which is be used to configure some of
  *  the application's compile time options, as an alternative to
- *  specifying the compile time constants supplied through a 
+ *  specifying the compile time constants supplied through a
  *  makefile or build system.
  *
- *  For information on what each token does, refer to the 
+ *  For information on what each token does, refer to the
  *  \ref Sec_Options section of the application documentation.
  */
 
@@ -46,7 +46,11 @@
        #define AUX_LINE_PORT              PORTB
        #define AUX_LINE_PIN               PINB
        #define AUX_LINE_DDR               DDRB
-       #define AUX_LINE_MASK              (1 << 4)
+       #if (BOARD == BOARD_U2S)
+               #define AUX_LINE_MASK          (1 << 0)
+       #else
+               #define AUX_LINE_MASK          (1 << 4)
+       #endif
 
        #define ENABLE_ISP_PROTOCOL
        #define ENABLE_XPROG_PROTOCOL
@@ -60,6 +64,7 @@
 //     #define INVERTED_ISP_MISO
 
 //     #define LIBUSB_DRIVER_COMPAT
+//     #define RESET_TOGGLES_LIBUSB_COMPAT
 //     #define FIRMWARE_VERSION_MINOR     0x11
 
-#endif
\ No newline at end of file
+#endif