X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0486f12e3eab71e75273b774bb13eeb5937c544d..24f730fce3f2022762011d795c3feada5ef874b3:/Projects/AVRISP/makefile

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 35e1e4244..2b6a1e858 100644
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
-BOARD  = USBKEY
+BOARD = USBKEY
 
 
 # Processor frequency.
@@ -116,8 +116,7 @@ LUFA_PATH = ../../
 
 
 # LUFA library compile-time options
-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS  = -D USB_DEVICE_ONLY
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D NO_STREAM_CALLBACKS
@@ -130,7 +129,11 @@ SRC = $(TARGET).c                                                 \
 	  Descriptors.c                                               \
       Lib/V2Protocol.c                                            \
       Lib/V2ProtocolParams.c                                      \
-      Lib/V2ProtocolTarget.c                                      \
+      Lib/ISPProtocol.c                                           \
+      Lib/ISPTarget.c                                             \
+	  Lib/PDIProtocol.c                                           \
+	  Lib/PDITarget.c                                             \
+	  Lib/NVMTarget.c                                             \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
@@ -188,9 +191,12 @@ CSTANDARD = -std=gnu99
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
 CDEFS += -DRESET_LINE_PORT=PORTB
+CDEFS += -DRESET_LINE_PIN=PINB
 CDEFS += -DRESET_LINE_DDR=DDRB
 CDEFS += -DRESET_LINE_MASK="(1 << 4)"
 CDEFS += -DVTARGET_ADC_CHANNEL=2
+CDEFS += -DENABLE_ISP_PROTOCOL
+CDEFS += -DENABLE_PDI_PROTOCOL
 
 
 # Place -D or -U options here for ASM sources
@@ -512,7 +518,7 @@ $(LUFA_PATH)/LUFA/LUFA_Events.lst:
 checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst
 	@echo
 	@echo Checking for invalid events...
-	@$(shell) avr-nm $(TARGET).elf | sed -n -e 's/^.*EVENT_/EVENT_/p' | \
+	@$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \
 	                 grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true
 	@sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp
 	@if test -s InvalidEvents.tmp; then exit 1; fi