update for new contiki fetch

platform/osd-merkur/Makefile.osd-merkur

@@ -42,6 +42,7 @@ AVRDUDE_PORT=usb:00B000000D79
 # Additional avrdude options
 # Verify off
 AVRDUDE_OPTIONS=-V
+AVRDUDE_MCU=m128rfa1
 
 #debug
 # CFLAGS  += -save-temps

platform/osd-merkur/contiki-conf.h

@@ -99,10 +99,6 @@ typedef unsigned long off_t;
 /* Logging adds 200 bytes to program size. RS232 output slows down webserver. */
 //#define LOG_CONF_ENABLED         1
 
-/* Network Panid */
-#define IEEE802154_CONF_PANID   0xABCD
-#define PARAMS_PANID  IEEE802154_CONF_PANID
-
 /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
 /* It has less overhead than ENERGEST */
 #define RADIOSTATS                0
@@ -150,7 +146,7 @@ typedef unsigned short uip_stats_t;
 #define RIMEADDR_CONF_SIZE        8
 #define UIP_CONF_ICMP6            1
 #define UIP_CONF_UDP              1
-#define UIP_CONF_TCP              0
+//#define UIP_CONF_TCP              1
 #define NETSTACK_CONF_NETWORK     sicslowpan_driver
 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
 #else
@@ -161,6 +157,7 @@ typedef unsigned short uip_stats_t;
 
 #define UIP_CONF_LL_802154        1
 #define UIP_CONF_LLH_LEN          0
+#define UIP_CONF_BUFFER_SIZE      240
 
 /* 10 bytes per stateful address context - see sicslowpan.c */
 /* Default is 1 context with prefix aaaa::/64 */
@@ -229,7 +226,7 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_DS6_NBR_NBU      20
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_DS6_ROUTE_NBU    20
+#define UIP_CONF_MAX_ROUTES    20
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
@@ -249,7 +246,7 @@ typedef unsigned short uip_stats_t;
 /* Not tested much yet */
 #define WITH_PHASE_OPTIMIZATION                0
 #define CONTIKIMAC_CONF_COMPOWER               1
-#define RIMESTATS_CONF_ON                      1
+#define RIMESTATS_CONF_ENABLED                 1
 #define NETSTACK_CONF_FRAMER      framer_802154
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
@@ -274,7 +271,7 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_DS6_NBR_NBU      20
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_DS6_ROUTE_NBU    4
+#define UIP_CONF_MAX_ROUTES    4
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
@@ -310,7 +307,7 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_DS6_NBR_NBU      4
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_DS6_ROUTE_NBU    4
+#define UIP_CONF_MAX_ROUTES    4
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
@@ -346,6 +343,9 @@ typedef unsigned short uip_stats_t;
 
 #define CCIF
 #define CLIF
+#ifndef CC_CONF_INLINE
+#define CC_CONF_INLINE inline
+#endif
 
 /* include the project config */
 /* PROJECT_CONF_H might be defined in the project Makefile */

platform/osd-merkur/contiki-main.c

@@ -59,6 +59,7 @@
 #include "radio/rf230bb/rf230bb.h"
 #include "net/mac/frame802154.h"
 #include "net/mac/framer-802154.h"
+#include "net/sicslowpan.h"
 
 #include "contiki.h"
 #include "contiki-net.h"
@@ -449,7 +450,7 @@ main(void)
         PORTE&=~(1<<PE1);
 #endif
 #if defined(RAVEN_LCD_INTERFACE)&&0
-       // ledtimer can be set by received ping; ping the other way for testing
+       /* ledtimer can be set by received ping; ping the other way for testing */
        extern void raven_ping6(void);         
        raven_ping6();
 #endif
@@ -590,6 +591,7 @@ if ((clocktime%STACKMONITOR)==3) {
   } while (p<RAMEND-10);
 }
 #endif
+
     }
 #endif /* PERIODICPRINTS */
 

platform/osd-merkur/params.h

@@ -14,14 +14,14 @@
  */
 #define CONTIKI_CONF_RANDOM_MAC 0        //adds 78 bytes
 #define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
-#define BOOTLOADER_GET_MAC 0             // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
+#define BOOTLOADER_GET_MAC 1             // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
 
 #if CONTIKI_CONF_SETTINGS_MANAGER
 //#define PARAMETER_STORAGE 2
 #define PARAMETER_STORAGE 2
 #else
-#define PARAMETER_STORAGE 1
+//#define PARAMETER_STORAGE 1
-//#define PARAMETER_STORAGE 0           // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
+#define PARAMETER_STORAGE 0           // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
 #endif
 
 /* Include settings.h, then dummy out the write routines */
@@ -38,6 +38,7 @@ extern uint8_t eemem_mac_address[8];
 extern uint8_t eemem_server_name[16];
 extern uint8_t eemem_domain_name[30];
 #endif
+
 #ifdef SERVER_NAME
 #define PARAMS_SERVERNAME SERVER_NAME
 #else
@@ -58,6 +59,11 @@ extern uint8_t eemem_domain_name[30];
 #else
 #define PARAMS_CHANNEL 26
 #endif
+#ifdef IEEE802154_PANID
+#define PARAMS_PANID IEEE802154_PANID
+#else
+#define PARAMS_PANID 0xABCD
+#endif
 #ifdef IEEE802154_PANADDR
 #define PARAMS_PANADDR IEEE802154_PANADDR
 #else