Change over unix line-endings to dos line endings.

[pub/USBasp.git] / Projects / AVRISP-MKII / makefile

diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index f5bb5b7..89afa5d 100644 (file)
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\r
 \r
 \r
-# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, NONE for projects not requiring\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 BOARD = USBKEY\r
@@ -119,7 +119,6 @@ LUFA_PATH = ../../
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
-LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 \r
@@ -141,10 +140,10 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBInterrupt.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
@@ -158,7 +157,7 @@ CPPSRC =
 #     Even though the DOS/Win* filesystem matches both .s and .S the same,\r
 #     it will preserve the spelling of the filenames, and gcc itself does\r
 #     care about how the name is spelled on its command-line.\r
-ASRC =\r
+ASRC = \r
 \r
 \r
 # Optimization level, can be [0, 1, 2, 3, s]. \r
@@ -191,13 +190,16 @@ CSTANDARD = -std=gnu99
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
-CDEFS += -DRESET_LINE_PORT=PORTB\r
-CDEFS += -DRESET_LINE_PIN=PINB\r
-CDEFS += -DRESET_LINE_DDR=DDRB\r
-CDEFS += -DRESET_LINE_MASK="(1 << 4)"\r
+CDEFS += -DAUX_LINE_PORT=PORTB\r
+CDEFS += -DAUX_LINE_PIN=PINB\r
+CDEFS += -DAUX_LINE_DDR=DDRB\r
+CDEFS += -DAUX_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
+#CDEFS += -DXPROG_VIA_HARDWARE_USART\r
+#CDEFS += -DNO_VTARGET_DETECT\r
+#CDEFS += -DLIBUSB_FILTERDRV_COMPAT\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r