Merge branch 'release/2.6-20131107'

.gitignore

@@ -16,11 +16,12 @@
 *.wismote
 *.esb
 *.avr-raven
+*.inga
 *.exp5438
 *.mbxxx
 *.win32
 *.apple2enh
-*.atari
+*.atarixl
 *.c128
 *.c64
 *.cc2538dk
@@ -29,6 +30,8 @@ summary
 *.summary
 *.faillog
 *.orig
+*.difference
+*.swp
 *~
 .DS_Store
 obj_*

.travis.yml

@@ -57,7 +57,8 @@ env:
 #  - BUILD_TYPE='netperf' MAKE_TARGETS='cooja'
   - BUILD_TYPE='shell'
   - BUILD_TYPE='elfloader'
-  - BUILD_TYPE='ipv4'
+# Tests under the ipv4 dir are individually disabled. Thus the entire job can be off
+#  - BUILD_TYPE='ipv4'
   - 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'

Makefile.include

@@ -54,6 +54,8 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
 TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1 
 
+include $(CONTIKI)/core/cfs/Makefile.cfs
+
 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 \
@@ -62,7 +64,6 @@ 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
-PROFILE	= profiling.c sprofiling.c
 
 include $(CONTIKI)/core/net/Makefile.uip
 

README.md

@@ -1,10 +1,12 @@
 The INGA sensor platform on Contiki-OS.
 =======================================
 
+[![Build Status](http://jenkins.ibr.cs.tu-bs.de:8080/buildStatus/icon?job=inga--develop--compile)](http://jenkins.ibr.cs.tu-bs.de:8080/view/INGA/job/inga--develop--compile/)
+
 INGA is an Open Source Wireless Sensor Node for many different applications. 
 INGA was developed at IBR as Inexpensive Node for General Applications and became part of many projects.
 
-Current release version: 2.6-20131014
+Current release version: 2.6-20131107
 
 For more information see the INGA project website:
 

apps/rest-common/static-routing.h

@@ -51,7 +51,7 @@ do{\
   uip_ipaddr_t ipaddr_local, ipaddr_global;\
   NODE_IP(node_global, GLOBAL, &ipaddr_global);\
   NODE_IP(node_local, LOCAL, &ipaddr_local);\
-  uip_ds6_route_add(&ipaddr_global, 128, &ipaddr_local, 0);\
+  uip_ds6_route_add(&ipaddr_global, 128, &ipaddr_local);\
 }while(0)
 
 void set_global_address(void);

apps/webserver/httpd-cgi.c

@@ -244,8 +244,6 @@ static const char httpd_cgi_addrh[] HTTPD_STRING_ATTR = "<code>";
 static const char httpd_cgi_addrf[] HTTPD_STRING_ATTR = "</code>[Room for %u more]";
 static const char httpd_cgi_addrb[] HTTPD_STRING_ATTR = "<br>";
 static const char httpd_cgi_addrn[] HTTPD_STRING_ATTR = "(none)<br>";
-extern uip_ds6_nbr_t uip_ds6_nbr_cache[];
-extern uip_ds6_route_t uip_ds6_routing_table[];
 extern uip_ds6_netif_t uip_ds6_if;
 
 static unsigned short
@@ -282,15 +280,16 @@ make_neighbors(void *p)
 uint8_t i,j=0;
 uint16_t numprinted;
   numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(),httpd_cgi_addrh);
-  for (i=0; i<UIP_DS6_NBR_NB;i++) {
-    if (uip_ds6_nbr_cache[i].isused) {
-      j++;
-      numprinted += httpd_cgi_sprint_ip6(uip_ds6_nbr_cache[i].ipaddr, uip_appdata + numprinted);
-      numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb); 
-    }
+  uip_ds6_nbr_t *nbr;
+  for(nbr = nbr_table_head(ds6_neighbors);
+      nbr != NULL;
+      nbr = nbr_table_next(ds6_neighbors, nbr)) {
+    j++;
+    numprinted += httpd_cgi_sprint_ip6(nbr->ipaddr, uip_appdata + numprinted);
+    numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
   }
 //if (j==0) numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrn);
-  numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_NBR_NB-j);
+  numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,NBR_TABLE_MAX_NEIGHBORS-j);
   return numprinted;
 }
 /*---------------------------------------------------------------------------*/
@@ -315,13 +314,13 @@ make_routes(void *p)
   uip_ds6_route_t *r;
 
   numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(),httpd_cgi_addrh);
-  for(r = uip_ds6_route_list_head();
+  for(r = uip_ds6_route_head();
       r != NULL;
-      r = list_item_next(r)) {
+      r = uip_ds6_route_next(r)) {
     j++;
     numprinted += httpd_cgi_sprint_ip6(r->ipaddr, uip_appdata + numprinted);
     numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes1, r->length);
-    numprinted += httpd_cgi_sprint_ip6(r->nexthop, uip_appdata + numprinted);
+    numprinted += httpd_cgi_sprint_ip6(uip_ds6_route_nexthop(r), uip_appdata + numprinted);
     if(r->state.lifetime < 3600) {
       numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes2, r->state.lifetime);
     } else {

core/cfs/Makefile.cfs

@@ -0,0 +1,35 @@
+# Allows to simply add file system source
+# by setting CFS variable in makefile:
+#
+#     CFS=<fat/fat-coop/coffee/posix>
+#
+
+FAT_FS = cfs-fat.c fat_mkfs.c
+FAT_COOP = fat_coop.c
+DISKIO = diskio.c mbr.c
+
+ifndef CFS
+  CFS=coffee
+endif
+
+ifeq ($(CFS),fat)
+  CFS_FILES = $(FAT_FS) \
+	       $(DISKIO)
+  CFS_DEFS = -DCFS_FAT=1
+else ifeq ($(CFS),fat-coop)
+  CFS_FILES = $(FAT_FS) \
+	       $(FAT_COOP) \
+	       $(DISKIO)
+  CFS_DEFS = -DCFS_FAT=1
+  CFS_DEFS += -DFAT_CONF_COOPERATIVE=1
+else ifeq ($(CFS),coffee)
+  CFS_FILES = cfs-coffee.c 
+  CFS_DEFS=-DCFS_COFFEE=1
+else ifeq ($(CFS),posix)
+  CFS_FILE = cfs-posix.c
+  CFS_DEFS = -DCFS_POSIX=1
+endif
+
+CONTIKI_SOURCEFILES += $(CFS_FILES)
+CFLAGS += $(CFS_DEFS)
+

core/cfs/cfs.h

@@ -59,7 +59,15 @@
 #define __CFS_H__
 
 #include "contiki.h"
+
+/* Include cfs arch header to have CFS_CONF_OFFSET_TYPE defined properly */
+#ifdef CFS_NONE
+#elif defined CFS_POSIX
+#elif defined CFS_COFFEE
 #include "cfs-coffee-arch.h"
+#elif defined CFS_FAT
+#include "diskio-arch.h"
+#endif
 
 #ifndef CFS_CONF_OFFSET_TYPE
 typedef int cfs_offset_t;

core/cfs/fat/cfs-fat.c

@@ -892,9 +892,9 @@ cfs_open(const char *name, int flags)
     PRINTF("\nfat.c: cfs_open(): No free FileDescriptors available!");
     return fd;
   }
-#else
+#else /* !FAT_COOPERATIVE */
   fd = queue[queue_start].ret_value;
-#endif
+#endif /* !FAT_COOPERATIVE */
 
   /* Reset entry for overwriting */
   if (flags & CFS_WRITE) {
@@ -941,10 +941,12 @@ void
 cfs_close(int fd)
 {
   if (fd < 0 || fd >= FAT_FD_POOL_SIZE) {
+    PRINTF("\nfat.c: cfs_close: Invalid fd");
     return;
   }
 
   if (fat_fd_pool[fd].file == NULL) {
+    PRINTF("\nfat.c: cfs_close: file not found\n");
     return;
   }