Endpoint configuration is now refined to give better output when all configurations...

[pub/USBasp.git] / Bootloaders / TeensyHID / makefile

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 2173c35..48c4d1e 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -75,7 +75,7 @@ BOARD  = USBKEY
 #         F_CPU = 16000000\r
 #         F_CPU = 18432000\r
 #         F_CPU = 20000000\r
-F_CPU = 8000000\r
+F_CPU = 16000000\r
 \r
 \r
 # Input clock frequency.\r
@@ -89,7 +89,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 = 16000000\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -106,17 +106,27 @@ TARGET = TeensyHID
 OBJDIR = .\r
 \r
 \r
+# Path to the LUFA library\r
+LUFA_PATH = ../..\r
+\r
+\r
 # List C source files here. (C dependencies are automatically generated.)\r
-SRC = $(TARGET).c                                          \\r
-         Descriptors.c                                        \\r
-         ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
-         ../../LUFA/Drivers/USB/HighLevel/Events.c            \\r
-         ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \\r
-         \r
+SRC = $(TARGET).c                                                 \\r
+         Descriptors.c                                               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.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/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/Class/ConfigDescriptor.c      \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \\r
+\r
+\r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r
@@ -148,7 +158,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r
-EXTRAINCDIRS = ../../\r
+EXTRAINCDIRS = $(LUFA_PATH)/\r
 \r
 \r
 # Compiler flag to set the C Standard level.\r
@@ -165,10 +175,10 @@ BOOT_START = 0xC000
 \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 += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DFEATURELESS_CONTROL_ONLY_DEVICE\r
-CDEFS += -DSTATIC_ENDPOINT_CONFIGURATION -DFIXED_CONTROL_ENDPOINT_SIZE=8\r
+CDEFS += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DCONTROL_ONLY_DEVICE\r
+CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION\r
 CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL -DUSE_SINGLE_DEVICE_CONFIGURATION\r
+CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r