Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[pub/USBasp.git] / Projects / Magstripe / makefile

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 25f3fa4..dda15ac 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287
 
 
-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring
+# 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  = USER
@@ -101,7 +101,7 @@ F_CPU = 16000000
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_CLOCK = 16000000
+F_CLOCK = $(F_CPU)
 
 
 # Output format. (can be srec, ihex, binary)
@@ -118,19 +118,37 @@ TARGET = Magstripe
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../..
+
+
+# LUFA library compile-time options
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-         Descriptors.c                                        \
-         CircularBitBuffer.c                                  \
-         ../../LUFA/Scheduler/Scheduler.c                     \
-         ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-         ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-         ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-         ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-         ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-         ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-         ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-         
+SRC = $(TARGET).c                                                 \
+         Descriptors.c                                               \
+         Lib/CircularBitBuffer.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               \
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -162,7 +180,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
@@ -174,10 +192,7 @@ 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)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
 CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
 CDEFS += -DMAG_T1_DATA="(1 << 1)"
 CDEFS += -DMAG_T2_CLOCK="(1 << 2)"
@@ -504,7 +519,7 @@ sizeafter:
 checkhooks: build
        @echo
        @echo ------- Unhooked LUFA Events -------
-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \
+       @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \
                           echo "(None)"
        @echo ------------------------------------