Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile
index 2091f8d..175cf1f 100644 (file)
--- a/Projects/Webserver/makefile
+++ b/Projects/Webserver/makefile
@@ -79,8 +79,8 @@ BOARD = USBKEY
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #

-#     This will be an integer division of F_CLOCK below, as it is sourced by
-#     F_CLOCK after it has run through any CPU prescalers. Note that this value
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value

 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.


@@ -88,7 +88,7 @@ F_CPU = 8000000
 
 
 # Input clock frequency.
 
 
 # Input clock frequency.

-#     This will define a symbol, F_CLOCK, in all source code files equal to the
+#     This will define a symbol, F_USB, in all source code files equal to the

 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed
 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed


@@ -98,7 +98,7 @@ F_CPU = 8000000
 #
 #     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.
 #
 #     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 = $(F_CPU)
+F_USB = $(F_CPU)

 
 
 # Output format. (can be srec, ihex, binary)
 
 
 # Output format. (can be srec, ihex, binary)


@@ -128,22 +128,25 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
 LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
 
 LUFA_OPTS += -D ENABLE_DHCP_CLIENT
 LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
 
 LUFA_OPTS += -D ENABLE_DHCP_CLIENT

+LUFA_OPTS += -D ENABLE_DHCP_SERVER

 LUFA_OPTS += -D ENABLE_TELNET_SERVER
 LUFA_OPTS += -D MAX_URI_LENGTH=50
 LUFA_OPTS += -D ENABLE_TELNET_SERVER
 LUFA_OPTS += -D MAX_URI_LENGTH=50

-LUFA_OPTS += -D UIP_CONF_UDP="defined(ENABLE_DHCP_CLIENT)"
+
+LUFA_OPTS += -D UIP_CONF_UDP="defined(ENABLE_DHCP_CLIENT) || defined(ENABLE_DHCP_SERVER)"
+LUFA_OPTS += -D UIP_CONF_BROADCAST=1

 LUFA_OPTS += -D UIP_CONF_TCP=1
 LUFA_OPTS += -D UIP_CONF_UDP_CONNS=1
 LUFA_OPTS += -D UIP_CONF_MAX_CONNECTIONS=3
 LUFA_OPTS += -D UIP_CONF_MAX_LISTENPORTS=5
 LUFA_OPTS += -D UIP_CONF_TCP=1
 LUFA_OPTS += -D UIP_CONF_UDP_CONNS=1
 LUFA_OPTS += -D UIP_CONF_MAX_CONNECTIONS=3
 LUFA_OPTS += -D UIP_CONF_MAX_LISTENPORTS=5

-LUFA_OPTS += -D UIP_URGDATA=0

 LUFA_OPTS += -D UIP_CONF_BUFFER_SIZE=1514
 LUFA_OPTS += -D UIP_CONF_BUFFER_SIZE=1514

-LUFA_OPTS += -D UIP_ARCH_CHKSUM=0

 LUFA_OPTS += -D UIP_CONF_LL_802154=0
 LUFA_OPTS += -D UIP_CONF_LL_80211=0
 LUFA_OPTS += -D UIP_CONF_ROUTER=0
 LUFA_OPTS += -D UIP_CONF_ICMP6=0
 LUFA_OPTS += -D UIP_CONF_LL_802154=0
 LUFA_OPTS += -D UIP_CONF_LL_80211=0
 LUFA_OPTS += -D UIP_CONF_ROUTER=0
 LUFA_OPTS += -D UIP_CONF_ICMP6=0

-LUFA_OPTS += -D UIP_ARCH_ADD32=0

 LUFA_OPTS += -D UIP_CONF_ICMP_DEST_UNREACH=1
 LUFA_OPTS += -D UIP_CONF_ICMP_DEST_UNREACH=1

+LUFA_OPTS += -D UIP_URGDATA=0
+LUFA_OPTS += -D UIP_ARCH_CHKSUM=0
+LUFA_OPTS += -D UIP_ARCH_ADD32=0

 LUFA_OPTS += -D UIP_NEIGHBOR_CONF_ADDRTYPE=0
 
 
 LUFA_OPTS += -D UIP_NEIGHBOR_CONF_ADDRTYPE=0
 
 


@@ -159,7 +162,9 @@ SRC = $(TARGET).c                                                 \
          Lib/SCSI.c                                                  \
          Lib/DataflashManager.c                                      \
          Lib/uIPManagement.c                                         \
          Lib/SCSI.c                                                  \
          Lib/DataflashManager.c                                      \
          Lib/uIPManagement.c                                         \

+         Lib/DHCPCommon.c                                            \

          Lib/DHCPClientApp.c                                         \
          Lib/DHCPClientApp.c                                         \

+         Lib/DHCPServerApp.c                                         \

          Lib/HTTPServerApp.c                                         \
          Lib/TELNETServerApp.c                                       \
          Lib/uip/uip.c                                               \
          Lib/HTTPServerApp.c                                         \
          Lib/TELNETServerApp.c                                       \
          Lib/uip/uip.c                                               \


@@ -217,20 +222,20 @@ CSTANDARD = -std=c99
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL

-CDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CDEFS += -DF_USB=$(F_USB)UL

 CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)
 CDEFS += $(LUFA_OPTS)
 
 
 # Place -D or -U options here for ASM sources
 ADEFS  = -DF_CPU=$(F_CPU)
 CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)
 CDEFS += $(LUFA_OPTS)
 
 
 # Place -D or -U options here for ASM sources
 ADEFS  = -DF_CPU=$(F_CPU)

-ADEFS += -DF_CLOCK=$(F_CLOCK)UL
+ADEFS += -DF_USB=$(F_USB)UL

 ADEFS += -DBOARD=BOARD_$(BOARD)
 ADEFS += $(LUFA_OPTS)
 
 # Place -D or -U options here for C++ sources
 CPPDEFS  = -DF_CPU=$(F_CPU)UL
 ADEFS += -DBOARD=BOARD_$(BOARD)
 ADEFS += $(LUFA_OPTS)
 
 # Place -D or -U options here for C++ sources
 CPPDEFS  = -DF_CPU=$(F_CPU)UL

-CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CPPDEFS += -DF_USB=$(F_USB)UL

 CPPDEFS += -DBOARD=BOARD_$(BOARD)
 CPPDEFS += $(LUFA_OPTS)
 #CPPDEFS += -D__STDC_LIMIT_MACROS
 CPPDEFS += -DBOARD=BOARD_$(BOARD)
 CPPDEFS += $(LUFA_OPTS)
 #CPPDEFS += -D__STDC_LIMIT_MACROS


@@ -255,6 +260,7 @@ CFLAGS += -fno-inline-small-functions
 CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing

+CFLAGS += -fno-split-wide-types

 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
 #CFLAGS += -mshort-calls
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
 #CFLAGS += -mshort-calls


@@ -736,6 +742,15 @@ doxygen:
 clean_doxygen:
        rm -rf Documentation
 
 clean_doxygen:
        rm -rf Documentation
 

+checksource:
+       @for f in $(SRC) $(CPPSRC) $(ASRC); do \
+               if [ -f $$f ]; then \
+                       echo "Found Source File: $$f" ; \
+               else \
+                       echo "Source File Not Found: $$f" ; \
+               fi; done 
+
+

 # Create object files directory
 $(shell mkdir $(OBJDIR) 2>/dev/null)
 
 # Create object files directory
 $(shell mkdir $(OBJDIR) 2>/dev/null)
 


@@ -748,5 +763,4 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff doxygen clean          \
 clean_list clean_doxygen program dfu flip flip-ee dfu-ee      \
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff doxygen clean          \
 clean_list clean_doxygen program dfu flip flip-ee dfu-ee      \

-debug gdb-config
-
+debug gdb-config checksource