From 5da8a9261bb2dae721cafa37a0b98193ad46802a Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Fri, 6 Jan 2012 03:59:43 -0800 Subject: [PATCH] fixed so that it works for non IPv6 applications --- platform/native/contiki-conf.h | 5 +++++ platform/native/contiki-main.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index ddaca6a1e..9c1216425 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -48,6 +48,7 @@ struct select_callback { #define CC_CONF_VA_ARGS 1 /*#define CC_CONF_INLINE inline*/ + #define CCIF #define CLIF @@ -67,6 +68,10 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_LOGGING 0 #define UIP_CONF_UDP_CHECKSUMS 1 +#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 +#endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */ + #if UIP_CONF_IPV6 #define RIMEADDR_CONF_SIZE 8 diff --git a/platform/native/contiki-main.c b/platform/native/contiki-main.c index 3cd4c1170..563575638 100644 --- a/platform/native/contiki-main.c +++ b/platform/native/contiki-main.c @@ -61,7 +61,7 @@ PROCINIT(&etimer_process, &tcpip_process); SENSORS(&pir_sensor, &vib_sensor, &button_sensor); static uint8_t serial_id[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08}; - +static uint16_t node_id = 0x0102; /*---------------------------------------------------------------------------*/ static void set_rime_addr(void) @@ -98,7 +98,7 @@ char **contiki_argv; int main(int argc, char **argv) { - printf("Starting Contiki: IPV6:%d \n", UIP_CONF_IPV6); + printf("Starting Contiki:\n", UIP_CONF_IPV6); /* crappy way of remembering and accessing argc/v */ contiki_argc = argc;