Add FatFS library to the Webserver project, extend the HTTP server so that it now...

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

diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile
index 27a7850..3c72ad8 100644 (file)
--- a/Projects/Webserver/makefile
+++ b/Projects/Webserver/makefile
@@ -116,13 +116,31 @@ LUFA_PATH = ../../
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS += -D USB_HOST_ONLY\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS  = -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\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
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r

-         Lib/WebserverApp.c                                          \\r
+         Descriptors.c                                               \\r
+         USBDeviceMode.c                                             \\r
+         USBHostMode.c                                               \\r
+         Lib/SCSI.c                                                  \\r
+         Lib/uIPManagement.c                                         \\r
+         Lib/DHCPApp.c                                               \\r
+         Lib/HTTPServerApp.c                                         \\r
+         Lib/DataflashManager.c                                      \\r
+         Lib/uip/uip.c                                               \\r
+         Lib/uip/uip_arp.c                                           \\r
+         Lib/uip/uiplib.c                                            \\r
+         Lib/uip/psock.c                                             \\r
+         Lib/uip/timer.c                                             \\r
+         Lib/uip/uip-neighbor.c                                      \\r
+         Lib/uip/conf/clock-arch.c                                   \\r
+         Lib/FatFS/diskio.c                                          \\r
+         Lib/FatFS/ff.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/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r


@@ -133,17 +151,11 @@ SRC = $(TARGET).c                                                 \
          $(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
          $(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

+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MassStorage.c    \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/MassStorage.c      \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/RNDIS.c          \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/RNDIS.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/RNDIS.c          \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/RNDIS.c            \\r

-         Lib/uip/uip.c                                               \\r
-         Lib/uip/uip_arp.c                                           \\r
-         Lib/uip/uiplib.c                                            \\r
-         Lib/uip/psock.c                                             \\r
-         Lib/uip/timer.c                                             \\r
-         Lib/uip/uip-neighbor.c                                      \\r
-         Lib/uip/conf/clock-arch.c                                   \\r
-         \r
-         \r
+\r

 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r


@@ -175,7 +187,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
 #     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 = $(LUFA_PATH)/ Lib/uip/ Lib/uip/conf/\r
+EXTRAINCDIRS = $(LUFA_PATH)/ Lib/uip/ Lib/uip/conf/ Lib/FatFS/\r

 \r
 \r
 # Compiler flag to set the C Standard level.\r
 \r
 \r
 # Compiler flag to set the C Standard level.\r


@@ -188,6 +200,7 @@ 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
 \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 += -DENABLE_DHCP\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r