Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents b51929b + a1cd642 commit 53115e6e9d474362afdf626754b02ce001e0643c @vedderb committed Feb 16, 2014
Showing 2,203 changed files with 137,227 additions and 164,056 deletions.
View
@@ -20,7 +20,7 @@
*.mbxxx
*.win32
*.apple2enh
-*.atari
+*.atarixl
*.c128
*.c64
*.cc2538dk
@@ -83,3 +83,7 @@ contiki-cc2530dk.lib
#regression tests artifacts
*.testlog
+
+# rl78 build artifacts
+*.eval-adf7xxxmb4z
+*.eval-adf7xxxmb4z.srec
View
@@ -0,0 +1,3 @@
+[submodule "tools/mspsim"]
+ path = tools/mspsim
+ url = https://github.com/contiki-os/mspsim.git
View
@@ -16,14 +16,25 @@ before_script:
https://raw.github.com/wiki/malvira/libmc1322x/files/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \
| tar xjf - -C /tmp/ && sudo cp -f -r /tmp/arm-2008q3/* /usr/ && rm -rf /tmp/arm-2008q3 && arm-none-eabi-gcc --version || true"
+ ## Install RL78 GCC chain (following the instructions in platform/eval-adf7xxxmb4z/README.md)
+ - "sudo apt-get install git make gcc libc-dev multiarch-support libncurses5:i386 zlib1g:i386"
+ - "wget https://dl.dropboxusercontent.com/u/60522916/gnurl78-v13.02-elf_1-2_i386.deb"
+ - "sudo dpkg -i gnurl78*.deb"
+
## Install SDCC from a purpose-built bundle
- "[ ${BUILD_ARCH:-0} = 8051 ] && curl -s \
https://raw.github.com/wiki/g-oikonomou/contiki-sensinode/files/sdcc.tar.gz \
| tar xzf - -C /tmp/ && sudo cp -f -r /tmp/sdcc/* /usr/local/ && rm -rf /tmp/sdcc && sdcc --version || true"
- "[ ${BUILD_ARCH:-0} = 8051 ] && sudo apt-get -qq install srecord || true"
+ ## Clone and build cc65 when testing 6502 ports
+ - "[ ${BUILD_ARCH:-0} = 6502 ] && git clone \
+ https://github.com/oliverschmidt/cc65 /tmp/cc65 && \
+ make -C /tmp/cc65 bin apple2enh atarixl c64 c128 && sudo make -C /tmp/cc65 avail && \
+ export CC65_HOME=/tmp/cc65/ && cc65 --version || true"
+
## Compile cooja.jar only when it's going to be needed
- - "[ ${BUILD_CATEGORY:-sim} = sim ] && java -version && ant -q -f tools/cooja/build.xml jar || true"
+ - "[ ${BUILD_CATEGORY:-sim} = sim ] && java -version && ant -q -f tools/cooja/build.xml jar && sudo java -Xshare:dump -version || true"
## IMPORTANT: The commands here have to end with `|| true`,
## because it would make the test fail if BUILD_TYPE test fails
@@ -62,3 +73,5 @@ env:
- BUILD_TYPE='ipv6-apps'
- BUILD_TYPE='compile-8051-ports' BUILD_CATEGORY='compile' BUILD_ARCH='8051'
- BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm'
+ - BUILD_TYPE='compile-6502-ports' BUILD_CATEGORY='compile' BUILD_ARCH='6502'
+ - BUILD_TYPE='slip-radio' MAKE_TARGETS='cooja'
View
@@ -14,6 +14,10 @@ ifeq ($(TARGET),)
endif
endif
+ifeq ($(UIP_CONF_IPV6),1)
+ CFLAGS += -DUIP_CONF_IPV6=1
+endif
+
ifeq ($(DEFINES),)
-include Makefile.$(TARGET).defines
ifneq ($(DEFINES),)
@@ -54,26 +58,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
-include $(CONTIKI)/core/net/rime/Makefile.rime
-include $(CONTIKI)/core/net/mac/Makefile.mac
-SYSTEM = process.c procinit.c autostart.c elfloader.c profile.c \
- timetable.c timetable-aggregate.c compower.c serial-line.c
-THREADS = mt.c
-LIBS = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c trickle-timer.c \
- print-stats.c ifft.c crc16.c random.c checkpoint.c ringbuf.c settings.c
-DEV = nullradio.c
-
-include $(CONTIKI)/core/net/Makefile.uip
-include $(CONTIKI)/core/net/rpl/Makefile.rpl
-
-CTK = ctk.c
-CTKVNC = $(CTK) ctk-vncserver.c libconio.c vnc-server.c vnc-out.c ctk-vncfont.c
-
-ifndef CONTIKI_NO_NET
- CONTIKIFILES = $(SYSTEM) $(LIBS) $(NET) $(THREADS) $(DHCP) $(DEV)
-else
- CONTIKIFILES = $(SYSTEM) $(LIBS) $(THREADS) $(DEV) sicslowpan.c fakeuip.c
-endif
+MODULES += core/sys core/dev core/lib
CONTIKI_SOURCEFILES += $(CONTIKIFILES)
@@ -90,6 +75,8 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
$(OBJECTDIR):
mkdir $@
+uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
+
### Include application makefiles
ifdef APPS
@@ -121,17 +108,13 @@ else
include $(target_makefile)
endif
-ifdef PLATFORMAPPS
- PLATFORMAPPDS = ${wildcard ${foreach DIR, $(APPDIRS), ${addprefix $(DIR)/, $(PLATFORMAPPS)}}} \
- ${wildcard ${addprefix $(CONTIKI)/apps/, $(PLATFORMAPPS)} \
- ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(PLATFORMAPPS)} \
- $(PLATFORMAPPS)}
- PLATFORMAPPINCLUDES = ${foreach APP, $(PLATFORMAPPS), \
- ${wildcard ${foreach DIR, $(PLATFORMAPPDS), $(DIR)/Makefile.$(APP)}}}
- -include $(PLATFORMAPPINCLUDES)
- PLATFORMAPP_SOURCES = ${foreach APP, $(PLATFORMAPPS), $($(APP)_src)}
- CONTIKI_SOURCEFILES += $(PLATFORMAPP_SOURCES)
- APPDS += $(PLATFORMAPPDS)
+ifdef MODULES
+ UNIQUEMODULES = $(call uniq,$(MODULES))
+ MODULESSUBST = ${subst /,-,$(UNIQUEMODULES)}
+ MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(UNIQUEMODULES)}}
+ MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}}
+ CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
+ APPDS += $(MODULEDIRS)
endif
### Verbosity control. Use make V=1 to get verbose builds.
@@ -168,7 +151,7 @@ SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
vpath %.c $(SOURCEDIRS)
vpath %.S $(SOURCEDIRS)
-CFLAGS += ${addprefix -I,$(SOURCEDIRS)}
+CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection
@@ -195,7 +178,7 @@ rm -f $(@:.o=.$$$$)
endef
clean:
- rm -f *~ *core core *.srec \
+ -rm -f *~ *core core *.srec \
*.lst *.map \
*.cprg *.bin *.data contiki*.a *.firmware core-labels.S *.ihex *.ini \
*.ce *.co
@@ -205,6 +188,8 @@ clean:
distclean: clean
-rm -rf $(CONTIKI_PROJECT).$(TARGET)
+-include $(CONTIKI)/platform/$(TARGET)/Makefile.customrules-$(TARGET)
+
ifndef CUSTOM_RULE_C_TO_CE
%.ce: %.c
$(TRACE_CC)
@@ -31,11 +31,11 @@
*
*
*/
-#ifndef __ABOUT_DSC_H__
-#define __ABOUT_DSC_H__
+#ifndef ABOUT_DSC_H_
+#define ABOUT_DSC_H_
#include "sys/dsc.h"
DSC_HEADER(about_dsc);
-#endif /* __ABOUT_DSC_H__ */
+#endif /* ABOUT_DSC_H_ */
@@ -42,7 +42,7 @@
#include "aql.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW];
static uint8_t next_free_offset;
@@ -42,7 +42,7 @@
#include <string.h>
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#include "index.h"
#include "relation.h"
@@ -48,7 +48,7 @@
#include "storage.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
struct search_handle {
index_t *index;
@@ -64,7 +64,7 @@
#include "storage.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#define BRANCH_FACTOR 2
#define BUCKET_SIZE 128
@@ -42,7 +42,7 @@
#include "index.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
static db_result_t create(index_t *);
static db_result_t destroy(index_t *);
@@ -40,7 +40,7 @@
#include "lib/list.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#include "antelope.h"
#include "attribute.h"
@@ -42,7 +42,7 @@
#include "lib/memb.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#include "db-options.h"
#include "index.h"
@@ -37,7 +37,7 @@
#include <string.h>
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#include "result.h"
#include "storage.h"
@@ -43,7 +43,7 @@
#include "lib/random.h"
#define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
#include "db-options.h"
#include "storage.h"
@@ -31,11 +31,11 @@
*
*
*/
-#ifndef __CALC_DSC_H__
-#define __CALC_DSC_H__
+#ifndef CALC_DSC_H_
+#define CALC_DSC_H_
#include "sys/dsc.h"
DSC_HEADER(calc_dsc);
-#endif /* __CALC_DSC_H__ */
+#endif /* CALC_DSC_H_ */
View
@@ -1,8 +1,8 @@
-#ifndef __CMDD_H__
-#define __CMDD_H__
+#ifndef CMDD_H_
+#define CMDD_H_
#include "contiki.h"
PROCESS_NAME(cmdd_process);
-#endif /* __CMDD_H__ */
+#endif /* CMDD_H_ */
@@ -29,8 +29,8 @@
* This file is part of the Contiki operating system.
*
*/
-#ifndef __CODEPROP_H__
-#define __CODEPROP_H__
+#ifndef CODEPROP_H_
+#define CODEPROP_H_
#include "contiki.h"
@@ -43,4 +43,4 @@ void codeprop_start_broadcast(unsigned int len);
void codeprop_exit_program(void);
int codeprop_start_program(void);
-#endif /* __CODEPROP_H__ */
+#endif /* CODEPROP_H_ */
@@ -71,7 +71,7 @@
#include "sys/clock.h"
#include "loader/elfloader.h"
-#include "net/tcpip.h"
+#include "net/ip/tcpip.h"
#include "dev/eeprom.h"
#include "dev/leds.h"
@@ -29,8 +29,8 @@
* This file is part of the Contiki operating system.
*
*/
-#ifndef __CODEPROP_H__
-#define __CODEPROP_H__
+#ifndef CODEPROP_H_
+#define CODEPROP_H_
#include "contiki.h"
@@ -50,4 +50,4 @@ void codeprop_set_rate(clock_time_t time);
void codeprop_start_broadcast(unsigned int len);
void codeprop_start_program(void);
-#endif /* __CODEPROP_H__ */
+#endif /* CODEPROP_H_ */
@@ -37,7 +37,7 @@
#include "sys/etimer.h"
#include "loader/elfloader_compat.h"
-#include "net/uip.h"
+#include "net/ip/uip.h"
#include "dev/xmem.h"
@@ -39,7 +39,7 @@
#include "loader/cle.h"
#include "loader/cmod.h"
-#include "net/uip.h"
+#include "net/ip/uip.h"
#include "dev/xmem.h"
@@ -1,9 +1,9 @@
#include "collect-view.h"
-#include "dev/cc2420.h"
+#include "cc2420.h"
#include "dev/leds.h"
#include "dev/light-sensor.h"
#include "dev/battery-sensor.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
#include "collect-view-sky.h"
@@ -1,5 +1,5 @@
#include "collect-view.h"
-#include "dev/cc2420.h"
+#include "cc2420.h"
#include "dev/leds.h"
#include "dev/i2cmaster.h"
#include "dev/tmp102.h"
@@ -39,7 +39,7 @@
#include "contiki.h"
#include "net/rime/collect-neighbor.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
#include "net/rime/timesynch.h"
#include "collect-view.h"
@@ -48,7 +48,7 @@
/*---------------------------------------------------------------------------*/
void
collect_view_construct_message(struct collect_view_data_msg *msg,
- const rimeaddr_t *parent,
+ const linkaddr_t *parent,
uint16_t parent_etx,
uint16_t current_rtmetric,
uint16_t num_neighbors,
@@ -93,7 +93,7 @@ collect_view_construct_message(struct collect_view_data_msg *msg,
last_transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT);
last_listen = energest_type_time(ENERGEST_TYPE_LISTEN);
- memcpy(&msg->parent, &parent->u8[RIMEADDR_SIZE - 2], 2);
+ memcpy(&msg->parent, &parent->u8[LINKADDR_SIZE - 2], 2);
msg->parent_etx = parent_etx;
msg->current_rtmetric = current_rtmetric;
msg->num_neighbors = num_neighbors;
Oops, something went wrong.

0 comments on commit 53115e6

Please sign in to comment.