Merge tag '2.6' into update_to_2.6

Version 2.6

Conflicts:
	.gitignore
	core/loader/elfloader-avr.c
	cpu/avr/dev/clock-avr.h
	cpu/avr/dev/rs232.c
	cpu/avr/dev/rs232.h
	cpu/avr/mtarch.c
	cpu/avr/rtimer-arch.c
	tools/cygwin/cygwin1.dll
	tools/stm32w/stm32w_flasher/FTD2XX.dll
	tools/stm32w/stm32w_flasher/python26.dll
	tools/stm32w/stm32w_flasher/pywintypes26.dll
	tools/stm32w/stm32w_flasher/stm32w_flasher.exe
	tools/stm32w/stm32w_flasher/w9xpopen.exe
	tools/stm32w/wpcapslip6/wpcapslip6.exe

Author: PIlin

.gitignore

@@ -1,12 +1,13 @@
 *.a
+*.bin
 *.map
-*.hex
-*.arduino
-*.native
-*.core
+*.png
+*.log
+*.elf
+*.ihex
 obj_*
-<<<<<<< HEAD
-examples/*/symbols.c
-examples/*/symbols.h
-=======
->>>>>>> fa83a9d43fb19dda97b0a4f4591c22c95ce98e64
+symbols.*
+Makefile.target
+doc/html
+patches-*
+tools/tunslip6

Makefile.include

@@ -1,3 +1,5 @@
+# -*- makefile -*-
+
 ifndef CONTIKI
   ${error CONTIKI not defined! You must specify where CONTIKI resides}
 endif
@@ -19,11 +21,21 @@ ifeq ($(DEFINES),)
   endif
 endif
 
+ifndef HOST_OS
+  ifeq ($(OS),Windows_NT)
+  ## TODO: detect more specific Windows set-ups,
+  ## e.g. CygWin, MingW, VisualC, Watcom, Interix
+    HOST_OS := Windows
+  else
+    HOST_OS := $(shell uname)
+  endif
+endif
+
 usage:
 	@echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]"
 
 targets:
-	@ls -1 $(CONTIKI)/platform | grep -v CVS
+	@ls -1 $(CONTIKI)/platform $(TARGETDIRS) | grep -v CVS
 
 savetarget:
 	-@rm -f Makefile.target
@@ -36,13 +48,10 @@ savedefines:
 	@echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)"
 
 OBJECTDIR = obj_$(TARGET)
-ifeq (${wildcard $(OBJECTDIR)},)
-  DUMMY := ${shell mkdir $(OBJECTDIR)}
-endif
 
 LOWERCASE = -abcdefghijklmnopqrstuvwxyz
 UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
-TARGET_UPPERCASE := ${shell echo $(TARGET) | sed 'y!$(LOWERCASE)!$(UPPERCASE)!'}
+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
@@ -58,14 +67,17 @@ NET     = netstack.c uip-debug.c packetbuf.c queuebuf.c packetqueue.c
 ifdef UIP_CONF_IPV6
   CFLAGS += -DUIP_CONF_IPV6=1
   UIP   = uip6.c tcpip.c psock.c uip-udp-packet.c uip-split.c \
-          resolv.c tcpdump.c uiplib.c
+          resolv.c tcpdump.c uiplib.c simple-udp.c
   NET   += $(UIP) uip-icmp6.c uip-nd6.c uip-packetqueue.c \
           sicslowpan.c neighbor-attr.c neighbor-info.c uip-ds6.c
-  include $(CONTIKI)/core/net/rpl/Makefile.rpl
+  ifneq ($(UIP_CONF_RPL),0)
+    CFLAGS += -DUIP_CONF_IPV6_RPL=1
+    include $(CONTIKI)/core/net/rpl/Makefile.rpl
+  endif # UIP_CONF_RPL
 else # UIP_CONF_IPV6
   UIP   = uip.c uiplib.c resolv.c tcpip.c psock.c hc.c uip-split.c uip-fw.c \
           uip-fw-drv.c uip_arp.c tcpdump.c uip-neighbor.c uip-udp-packet.c \
-          uip-over-mesh.c dhcpc.c #rawpacket-udp.c
+          uip-over-mesh.c dhcpc.c simple-udp.c
   NET   += $(UIP) uaodv.c uaodv-rt.c
 endif # UIP_CONF_IPV6
 
@@ -93,12 +105,9 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
 
 ifdef APPS
   APPDIRS += ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
-                ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
-		${addprefix , $(APPS)}}
-  APPINCLUDES = ${foreach APP, $(APPS), ${wildcard \
-                 $(CONTIKI)/apps/$(APP)/Makefile.$(APP) \
-                 $(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP) \
-	         $(APP)/Makefile.$(APP)}}
+	     ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
+	     $(APPS)}
+  APPINCLUDES = ${foreach APP, $(APPS), ${wildcard ${foreach DIR, $(APPDIRS), $(DIR)/Makefile.$(APP)}}}
   -include $(APPINCLUDES)
   APP_SOURCES = ${foreach APP, $(APPS), $($(APP)_src)}
   DSC_SOURCES = ${foreach APP, $(APPS), $($(APP)_dsc)}
@@ -107,13 +116,19 @@ endif
 
 ### Include target makefile (TODO Unsafe?)
 
-target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET))
+target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET) ${foreach TDIR, $(TARGETDIRS), $(TDIR)/$(TARGET)/Makefile.$(TARGET)})
 
-# Check if the target makefile exists
+# Check if the target makefile exists, and create the object directory if necessary.
 ifeq ($(strip $(target_makefile)),)
   ${error The target platform "$(TARGET)" does not exist (maybe it was misspelled?)}
 else
-  include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)
+  ifeq (${wildcard $(OBJECTDIR)},)
+    DUMMY := ${shell mkdir $(OBJECTDIR)}
+  endif
+  ifneq (1, ${words $(target_makefile)})
+    ${error More than one TARGET Makefile found: $(target_makefile)}
+  endif
+  include $(target_makefile)
 endif
 
 ### Forward comma-separated list of arbitrary defines to the compiler
@@ -123,19 +138,27 @@ CFLAGS += ${addprefix -D,${subst $(COMMA), ,$(DEFINES)}}
 
 ### Setup directory search path for source and header files
 
-CONTIKI_TARGET_DIRS_CONCAT = ${addprefix $(CONTIKI)/platform/$(TARGET)/, \
+CONTIKI_TARGET_DIRS_CONCAT = ${addprefix ${dir $(target_makefile)}, \
                                $(CONTIKI_TARGET_DIRS)}
 CONTIKI_CPU_DIRS_CONCAT    = ${addprefix $(CONTIKI_CPU)/, \
                                $(CONTIKI_CPU_DIRS)}
 
 SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
-             $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDIRS)
+             $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDIRS) ${dir $(target_makefile)}
 
 vpath %.c $(SOURCEDIRS)
 vpath %.S $(SOURCEDIRS)
 
 CFLAGS += ${addprefix -I,$(SOURCEDIRS)}
 
+### Check for a git repo and pass version if found
+### git.exe in Windows cmd shells may require no stderr redirection
+#RELSTR=${shell git describe --tags}
+RELSTR=${shell git describe --tags 2>/dev/null}
+ifneq ($(RELSTR),)
+CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
+endif
+
 ### Automatic dependency generation
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -152,7 +175,7 @@ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 rm -f $(@:.o=.$$$$)
 endef
 
-clean:
+ clean:
 	rm -f *~ *core core *.srec \
 	*.lst *.map \
         *.cprg *.bin *.data contiki*.a *.firmware core-labels.S *.ihex *.ini \
@@ -204,6 +227,12 @@ ifndef CUSTOM_RULE_LINK
 	$(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
 endif
 
+%.ramprof: %.$(TARGET)
+	nm -S -td --size-sort $< | grep -i " [abdrw] " | cut -d' ' -f2,4
+
+%.flashprof: %.$(TARGET)
+	nm -S -td --size-sort $< | grep -i " [t] " | cut -d' ' -f2,4
+
 # Don't treat %.$(TARGET) as an intermediate file because it is
 # in fact the primary target.
 .PRECIOUS: %.$(TARGET)

README

@@ -1,33 +1,16 @@
-Contiki is an open source, highly portable, multi-tasking operating
-system for memory-constrained networked embedded systems written by
-Adam Dunkels at the Networked Embedded Systems group at the Swedish
-Institute of Computer Science.
+The Contiki Operating System
 
-Contiki is designed for embedded systems with small amounts of
-memory. A typical Contiki configuration is 2 kilobytes of RAM and 40
-kilobytes of ROM. Contiki consists of an event-driven kernel on top of
-which application programs are dynamically loaded and unloaded at
-runtime. Contiki processes use light-weight protothreads that provide
-a linear, thread-like programming style on top of the event-driven
-kernel. Contiki also supports per-process optional preemptive
-multi-threading, interprocess communication using message passing
-through events, as well as an optional GUI subsystem with either
-direct graphic support for locally connected terminals or networked
-virtual display with VNC or over Telnet.
+Contiki is an open source operating system that runs on tiny low-power
+microcontrollers and makes it possible to develop applications that
+make efficient use of the hardware while providing standardized
+low-power wireless communication for a range of hardware platforms.
 
-Contiki contains two communication stacks: uIP and Rime. uIP is a
-small RFC-compliant TCP/IP stack that makes it possible for Contiki to
-communicate over the Internet. Rime is a lightweight communication
-stack designed for low-power radios. Rime provides a wide range of
-communication primitives, from best-effort local area broadcast, to
-reliable multi-hop bulk data flooding.
+Contiki is used in numerous commercial and non-commercial systems,
+such as city sound monitoring, street lights, networked electrical
+power meters, industrial monitoring, radiation monitoring,
+construction site monitoring, alarm systems, remote house monitoring,
+and so on.
 
-Contiki runs on a variety of platform ranging from embedded
-microcontrollers such as the MSP430 and the AVR to old
-homecomputers. Code footprint is on the order of kilobytes and memory
-usage can be configured to be as low as tens of bytes.
+For more information, see the Contiki website:
 
-Contiki is written in the C programming language and is freely
-available as open source under a BSD-style license. More information
-about Contiki can be found at the Contiki home page:
-http://www.sics.se/contiki/
+http://www.contiki-os.org/

apps/antelope/Makefile.antelope

@@ -0,0 +1,4 @@
+antelope_src = antelope.c aql-adt.c aql-exec.c aql-lexer.c aql-parser.c \
+        index.c index-inline.c index-maxheap.c lvm.c relation.c \
+        result.c storage-cfs.c
+antelope_dsc = 

apps/antelope/antelope.c

@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2010, Swedish Institute of Computer Science
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *	Main functions for Antelope, a DBMS for sensor devices.
+ *
+ *      Antelope is described and evaluated in the paper A Database in
+ *      Every Sensor, N. Tsiftes and A. Dunkels, in Proceedings of
+ *      ACM SenSys 2011.
+ * \author
+ * 	Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#include <stdio.h>
+
+#include "antelope.h"
+
+static db_output_function_t output = printf;
+
+void
+db_init(void)
+{
+  relation_init();
+  index_init();
+}
+
+void
+db_set_output_function(db_output_function_t f)
+{
+  output = f;
+}
+
+const char *
+db_get_result_message(db_result_t code)
+{
+  switch(code) {
+  case DB_FINISHED:
+    return "Iteration finished";
+  case DB_OK:
+    return "Operation succeeded";
+  case DB_LIMIT_ERROR:
+    return "Limit reached";
+  case DB_ALLOCATION_ERROR:
+    return "Allocation error";
+  case DB_STORAGE_ERROR:
+    return "Storage error";
+  case DB_PARSING_ERROR:
+    return "Parsing error";
+  case DB_NAME_ERROR:
+    return "Invalid name";
+  case DB_RELATIONAL_ERROR:
+    return "Semantic error";
+  case DB_TYPE_ERROR:
+    return "Type error";
+  case DB_IMPLEMENTATION_ERROR:
+    return "Implementation error";
+  case DB_INDEX_ERROR:
+    return "Index error";
+  case DB_BUSY_ERROR:
+    return "Busy with processing";
+  case DB_INCONSISTENCY_ERROR:
+    return "Inconsistent handle";
+  case DB_ARGUMENT_ERROR:
+    return "Invalid argument";
+  default:
+    return "Unknown result code";
+  };
+}
+
+db_result_t
+db_print_header(db_handle_t *handle)
+{
+  int column;
+  attribute_t *attr;
+
+  output("[relation = %s, attributes = (", handle->result_rel->name);
+  attr = list_head(handle->result_rel->attributes);
+  for(column = 0; column < handle->ncolumns; column++) {
+    if(attr == NULL) {
+      return DB_IMPLEMENTATION_ERROR;
+    } else if(attr->flags & ATTRIBUTE_FLAG_NO_STORE) {
+      continue;
+    }
+    output("%s%s", column > 0 ? ", " : "", attr->name);
+    attr = attr->next;
+  }
+  output(")]\n");
+  return DB_OK;
+}
+
+db_result_t
+db_print_tuple(db_handle_t *handle)
+{
+  int column;
+  attribute_value_t value;
+  db_result_t result;
+
+  output("Row %lu:\t", (unsigned long)handle->current_row);
+
+  for(column = 0; column < handle->ncolumns; column++) {
+    result = db_get_value(&value, handle, column);
+    if(DB_ERROR(result)) {
+      output("Unable to get the value for row %lu, column %u: %s\n",
+             (unsigned long)handle->current_row, column,
+             db_get_result_message(result));
+      break;
+    }
+
+    switch(value.domain) {
+    case DOMAIN_STRING:
+      output("\"%s\"\t", VALUE_STRING(&value));
+      break;
+    case DOMAIN_INT:
+      output("%d\t", (int)VALUE_INT(&value));
+      break;
+    case DOMAIN_LONG:
+      output("%ld\t", (long)VALUE_LONG(&value));
+      break;
+    default:
+      output("\nUnrecognized domain: %d\n", value.domain);
+      return DB_IMPLEMENTATION_ERROR;
+    }
+  }
+  output("\n");
+
+  return DB_OK;
+}
+
+int
+db_processing(db_handle_t *handle)
+{
+  return handle->flags & DB_HANDLE_FLAG_PROCESSING;
+}