Skip to content

Commit

Permalink
Merge 8935e35 into c1bcf61
Browse files Browse the repository at this point in the history
  • Loading branch information
@jelledevleeschouwer
jelledevleeschouwer committed May 16, 2015
2 parents c1bcf61 + 8935e35 commit c752645
Show file tree
Hide file tree
Showing 147 changed files with 14,225 additions and 5,817 deletions.
2 changes: 1 addition & 1 deletion COPYING
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PicoTCP. Copyright (c) 2012-2015 Altran Intelligent Systems.
PicoTCP. Copyright (c) 2013 TASS Belgium NV.

Released under the GNU General Public License, version 2.
See LICENSE for details.
Expand Down
134 changes: 88 additions & 46 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
-include ../../config.mk
-include ../../tools/kconfig/.config

CC:=$(CROSS_COMPILE)gcc
LD:=$(CROSS_COMPILE)ld
AR:=$(CROSS_COMPILE)ar
Expand All @@ -18,7 +15,6 @@ ENDIAN?=little
STRIP?=0
RTOS?=0
CHECKSUMFUN?=young
ADDRESS_SANITIZER?=0

# Default compiled-in protocols
#
Expand All @@ -36,13 +32,13 @@ DHCP_CLIENT?=1
DHCP_SERVER?=1
DNS_CLIENT?=1
MDNS?=1
DNS_SD?=1
SNTP_CLIENT?=1
IPFILTER?=1
CRC?=1
OLSR?=0
SLAACV4?=1
TFTP?=1
AODV?=1
MEMORY_MANAGER?=0
MEMORY_MANAGER_PROFILING?=0
TUN?=0
Expand All @@ -52,7 +48,6 @@ TAP?=0
IPV6?=1

EXTRA_CFLAGS+=-DPICO_COMPILE_TIME=`date +%s`
EXTRA_CFLAGS+=$(PLATFORM_CFLAGS)

CFLAGS=-I$(PREFIX)/include -Iinclude -Imodules -Wall -Wdeclaration-after-statement -W -Wextra -Wshadow -Wcast-qual -Wwrite-strings -Wmissing-field-initializers -Wunused-variable -Wundef -Wunused-function $(EXTRA_CFLAGS)
# extra flags recommanded by TIOBE TICS framework to score an A on compiler warnings
Expand All @@ -63,11 +58,11 @@ CFLAGS+= -Wcast-align
ifeq ($(DEBUG),1)
CFLAGS+=-ggdb
else
ifeq ($(PERF), 1)
CFLAGS+=-O3
else
CFLAGS+=-Os
endif
ifeq ($(PERF), 1)
CFLAGS+=-O3
else
CFLAGS+=-Os
endif
endif

ifeq ($(PROFILE),1)
Expand All @@ -79,11 +74,6 @@ ifeq ($(TFTP),1)
OPTIONS+=-DPICO_SUPPORT_TFTP
endif

ifeq ($(AODV),1)
MOD_OBJ+=$(LIBBASE)modules/pico_aodv.o
OPTIONS+=-DPICO_SUPPORT_AODV
endif


ifneq ($(ENDIAN),little)
CFLAGS+=-DPICO_BIGENDIAN
Expand All @@ -97,25 +87,22 @@ ifneq ($(RTOS),0)
OPTIONS+=-DPICO_SUPPORT_RTOS
endif

ifeq ($(ARCH),cortexm4-hardfloat)
CFLAGS+=-DCORTEX_M4_HARDFLOAT -mcpu=cortex-m4 -mthumb -mlittle-endian -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb-interwork -fsingle-precision-constant
endif

ifeq ($(ARCH),cortexm4-softfloat)
CFLAGS+=-DCORTEX_M4_SOFTFLOAT -mcpu=cortex-m4 -mthumb -mlittle-endian -mfloat-abi=soft -mthumb-interwork
endif

ifeq ($(ARCH),cortexm3)
CFLAGS+=-DCORTEX_M3 -mcpu=cortex-m3 -mthumb -mlittle-endian -mthumb-interwork
ifeq ($(ARCH),stm32f4xx)
CFLAGS+=-mcpu=cortex-m4 \
-mthumb -mlittle-endian -mfpu=fpv4-sp-d16 \
-mfloat-abi=hard -mthumb-interwork -fsingle-precision-constant -DSTM32
endif

ifeq ($(ARCH),arm9)
CFLAGS+=-DARM9 -mcpu=arm9e -march=armv5te -gdwarf-2 -Wall -marm -mthumb-interwork -fpack-struct
ifeq ($(ARCH),stm32)
CFLAGS+=-mcpu=cortex-m4 \
-mthumb -mlittle-endian -mfpu=fpv4-sp-d16 \
-mfloat-abi=hard -mthumb-interwork -fsingle-precision-constant -DSTM32
endif

ifeq ($(ADDRESS_SANITIZER),1)
CFLAGS+=-fsanitize=address -fno-omit-frame-pointer -m32
TEST_LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -m32
ifeq ($(ARCH),stm32_gc)
CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16
CFLAGS_CORTEX_M4 += -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
CFLAGS+= $(CFLAGS_CORTEX_M4) -mlittle-endian -DSTM32_GC
endif

ifeq ($(ARCH),faulty)
Expand All @@ -125,12 +112,59 @@ ifeq ($(ARCH),faulty)
DUMMY_EXTRA+=test/pico_faulty.o
endif

ifeq ($(ARCH),stm32-softfloat)
CFLAGS+=-mcpu=cortex-m3 \
-mthumb -mlittle-endian \
-mfloat-abi=soft -mthumb-interwork \
-DSTM32
endif


ifeq ($(ARCH),stm32f1xx)
CFLAGS+=-mcpu=cortex-m3 \
-mthumb -mlittle-endian \
-mthumb-interwork \
-DSTM32F1
endif


ifeq ($(ARCH),msp430)
CFLAGS+=-DMSP430
endif

ifeq ($(ARCH),esp8266)
CFLAGS+=-DESP8266 -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals
CFLAGS += -DESP8266 \
-g \
-Wpointer-arith \
-Wundef \
-Wl,-EL \
-fno-inline-functions \
-nostdlib \
-mlongcalls \
-mtext-section-literals
endif

ifeq ($(ARCH),stellaris)
CFLAGS+=-mthumb -DSTELLARIS
endif

ifeq ($(ARCH),lpc)
CFLAGS+=-fmessage-length=0 -fno-builtin \
-ffunction-sections -fdata-sections -mlittle-endian \
-mcpu=cortex-m3 -mthumb -MMD -MP -DLPC
endif

ifeq ($(ARCH),lpc18xx)
CFLAGS+=-fmessage-length=0 -fno-builtin \
-ffunction-sections -fdata-sections -mlittle-endian \
-mcpu=cortex-m3 -mthumb -MMD -MP -DLPC18XX
endif

ifeq ($(ARCH),lpc43xx)
CFLAGS+=-fmessage-length=0 -fno-builtin \
-ffunction-sections -fdata-sections -mlittle-endian \
-mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-fsingle-precision-constant -mthumb -MMD -MP -DLPC43XX
endif

ifeq ($(ARCH),pic24)
Expand All @@ -139,7 +173,11 @@ ifeq ($(ARCH),pic24)
endif

ifeq ($(ARCH),atmega128)
CFLAGS+=-Wall -mmcu=atmega128 -DAVR
CFLAGS+=-Wall -mmcu=atmega128 -DAVR
endif

ifeq ($(ARCH),str9)
CFLAGS+=-DSTR9 -mcpu=arm9e -march=armv5te -gdwarf-2 -Wall -marm -mthumb-interwork -fpack-struct
endif

ifeq ($(ARCH),none)
Expand All @@ -150,23 +188,23 @@ ifeq ($(ARCH),shared)
CFLAGS+=-fPIC
endif

%.o:%.c deps
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<

CORE_OBJ= stack/pico_stack.o \
stack/pico_frame.o \
stack/pico_device.o \
stack/pico_protocol.o \
stack/pico_socket.o \
stack/pico_socket_multicast.o \
stack/pico_tree.o
stack/pico_socket_multicast.o \
stack/pico_tree.o

POSIX_OBJ+= modules/pico_dev_vde.o \
modules/pico_dev_tun.o \
modules/pico_dev_tap.o \
modules/pico_dev_mock.o \
POSIX_OBJ+= modules/pico_dev_vde.o \
modules/pico_dev_tun.o \
modules/pico_dev_tap.o \
modules/pico_dev_mock.o \
modules/pico_dev_pcap.o \
modules/ptsocket/pico_ptsocket.o
modules/ptsocket/pico_ptsocket.o

ifneq ($(ETH),0)
include rules/eth.mk
Expand Down Expand Up @@ -208,6 +246,9 @@ endif
ifneq ($(MDNS),0)
include rules/mdns.mk
endif
ifneq ($(DNS_SD),0)
include rules/dns_sd.mk
endif
ifneq ($(IPFILTER),0)
include rules/ipfilter.mk
endif
Expand Down Expand Up @@ -241,11 +282,11 @@ endif

all: mod core lib

core: $(CORE_OBJ)
core: deps $(CORE_OBJ)
@mkdir -p $(PREFIX)/lib
@mv stack/*.o $(PREFIX)/lib

mod: $(MOD_OBJ)
mod: deps $(MOD_OBJ)
@mkdir -p $(PREFIX)/modules
@mv modules/*.o $(PREFIX)/modules || echo

Expand All @@ -270,7 +311,7 @@ test: posix

tst: test

$(PREFIX)/include/pico_defines.h:
$(PREFIX)/include/pico_defines.h: FORCE
@mkdir -p $(PREFIX)/lib
@mkdir -p $(PREFIX)/include
@bash ./mkdeps.sh $(PREFIX) $(OPTIONS)
Expand Down Expand Up @@ -306,20 +347,21 @@ units: mod core lib $(UNITS_OBJ) $(MOD_OBJ)
@echo -e "\t[CC] units.o"
@$(CC) -c -o $(PREFIX)/test/units.o test/units.c $(CFLAGS) -I stack -I modules -I includes -I test/unit -DUNIT_TEST
@echo -e "\t[LD] $(PREFIX)/test/units"
@$(CC) -o $(PREFIX)/test/units $(CFLAGS) $(PREFIX)/test/units.o -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/modules/pico_aodv.o
@$(CC) -o $(PREFIX)/test/units $(CFLAGS) $(PREFIX)/test/units.o -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_pico_protocol.elf $(CFLAGS) -I. test/unit/modunit_pico_protocol.c stack/pico_tree.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_pico_frame.elf $(CFLAGS) -I. test/unit/modunit_pico_frame.c stack/pico_tree.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_seq.elf $(CFLAGS) -I. test/unit/modunit_seq.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_tcp.elf $(CFLAGS) -I. test/unit/modunit_pico_tcp.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_dns_client.elf $(CFLAGS) -I. test/unit/modunit_pico_dns_client.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_dns_common.elf $(CFLAGS) -I. test/unit/modunit_pico_dns_common.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_mdns.elf $(CFLAGS) -I. test/unit/modunit_pico_mdns.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_dns_sd.elf $(CFLAGS) -I. test/unit/modunit_pico_dns_sd.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_dev_loop.elf $(CFLAGS) -I. test/unit/modunit_pico_dev_loop.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_ipv6_nd.elf $(CFLAGS) -I. test/unit/modunit_pico_ipv6_nd.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_pico_stack.elf $(CFLAGS) -I. test/unit/modunit_pico_stack.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_tftp.elf $(CFLAGS) -I. test/unit/modunit_pico_tftp.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_sntp_client.elf $(CFLAGS) -I. test/unit/modunit_pico_sntp_client.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_ipfilter.elf $(CFLAGS) -I. test/unit/modunit_pico_ipfilter.c stack/pico_tree.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)
@$(CC) -o $(PREFIX)/test/modunit_aodv.elf $(CFLAGS) -I. test/unit/modunit_pico_aodv.c -lcheck -lm -pthread -lrt $(UNITS_OBJ) $(PREFIX)/lib/libpicotcp.a
@$(CC) -o $(PREFIX)/test/modunit_queue.elf $(CFLAGS) -I. test/unit/modunit_queue.c -lcheck -lm -pthread -lrt $(UNITS_OBJ)

devunits: mod core lib
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
picoTCP
picoTCP - dns-sd

---------------

Welcome to the one and only <font color=ff00f0>picoTCP repository</font>.

picoTCP is a TCP/IP stack designed for embedded systems developed by *[Altran Intelligent Systems](http://intelligent-systems.altran.com/)*
picoTCP is a TCP/IP stack designed for embedded systems developed by *[Altran ISY](http://intelligent-systems.altran.com/)*

This code is released under the terms of GNU GPL v2 only. Some rights reserved.
Other licenses may apply at the sole discretion of the copyright holders.
Expand All @@ -13,24 +13,24 @@ The getting started guide can be found on the GitHub wiki (https://github.com/ta

For more information, visit [the project's website](http://www.picotcp.com)

[Check our code quality](http://95.138.172.54:42506/TIOBEPortal/TICS/treeviewer?)
[Check our code quality](http://tics.picotcp.com:42506/TIOBEPortal/TICS/treeviewer?)


---------------

Continuous integration

Jenkins Functional tests:
[![Jenkins autotest](http://162.13.84.104:8080/buildStatus/icon?job=PicoTCP_rel_autotest)](http://162.13.84.104:8080/job/PicoTCP_rel_autotest)
[![Jenkins autotest](http://jenkins.picotcp.com:8080/buildStatus/icon?job=PicoTCP_rel_autotest)](http://jenkins.picotcp.com:8080/job/PicoTCP_rel_autotest)

Jenkins Unit tests :
[![Jenkins unit tests](http://162.13.84.104:8080/buildStatus/icon?job=PicoTCP_rel_unit_tests)](http://162.13.84.104:8080/job/PicoTCP_rel_unit_tests)
[![Jenkins unit tests](http://jenkins.picotcp.com:8080/buildStatus/icon?job=PicoTCP_rel_unit_tests)](http://jenkins.picotcp.com:8080/job/PicoTCP_rel_unit_tests)

Jenkins RFC compliance :
[![Jenkins RFC Compliance](http://162.13.84.104:8080/buildStatus/icon?job=PicoTCP_rel_RF_mbed)](http://162.13.84.104:8080/job/PicoTCP_rel_RF_mbed)
[![Jenkins RFC Compliance](http://jenkins.picotcp.com:8080/buildStatus/icon?job=PicoTCP_rel_RF_mbed)](http://jenkins.picotcp.com:8080/job/PicoTCP_rel_RF_mbed)

Jenkins TICS quality :
[![Jenkins TICS](http://162.13.84.104:8080/buildStatus/icon?job=PicoTCP_rel_TICS)](http://162.13.84.104:8080/job/PicoTCP_rel_TICS/)
[![Jenkins TICS](http://jenkins.picotcp.com:8080/buildStatus/icon?job=PicoTCP_rel_TICS)](http://jenkins.picotcp.com:8080/job/PicoTCP_rel_TICS/)

Travis:
[![Travis CI build status](https://api.travis-ci.org/tass-belgium/picotcp.svg)](https://travis-ci.org/tass-belgium/picotcp)
Expand Down
42 changes: 0 additions & 42 deletions docs/user_manual/chap_api_aodv.tex
View file

This file was deleted.

0 comments on commit c752645

Please sign in to comment.