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

[pub/USBasp.git] / Demos / OTG / TestApp / makefile

diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile
index 0d19831..763838e 100644 (file)
--- a/Demos/OTG/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\r
 \r
 \r
-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, USER or blank 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
@@ -101,7 +101,7 @@ F_CPU = 8000000
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
-F_CLOCK = 8000000\r
+F_CLOCK = $(F_CPU)\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -122,25 +122,28 @@ OBJDIR = .
 LUFA_PATH = ../../..\r
 \r
 \r
+# LUFA library compile-time options\r
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
+\r
+\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          TestEvents.c                                                \\r
          Descriptors.c                                               \\r
-         $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \\r
-         $(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c                \\r
          $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c               \\r
-         $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \\r
-         $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
+         $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
+         $(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/HighLevel/Events.c            \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.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
@@ -186,9 +189,7 @@ CSTANDARD = -std=gnu99
 \r
 \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)\r
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES\r
-CDEFS += -DNUM_BLOCKS=100 -DBLOCK_SIZE=8 -DNUM_HANDLES=20\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
@@ -507,7 +508,7 @@ sizeafter:
 checkhooks: build\r
        @echo\r
        @echo ------- Unhooked LUFA Events -------\r
-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \\r
+       @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \\r
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r
        @echo ------------------------------------\r