giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed so that it works for non IPv6 applications

Browse Source
This commit is contained in:
Joakim Eriksson 2012-01-06 03:59:43 -08:00
parent c3af79b795
commit 5da8a9261b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/native/contiki-conf.h
View File

@ -48,6 +48,7 @@ struct select_callback {
#define CC_CONF_VA_ARGS 1 #define CC_CONF_VA_ARGS 1
/*#define CC_CONF_INLINE inline*/ /*#define CC_CONF_INLINE inline*/
#define CCIF #define CCIF
#define CLIF #define CLIF
@ -67,6 +68,10 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_LOGGING 0 #define UIP_CONF_LOGGING 0
#define UIP_CONF_UDP_CHECKSUMS 1 #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 #if UIP_CONF_IPV6
#define RIMEADDR_CONF_SIZE 8 #define RIMEADDR_CONF_SIZE 8

4
platform/native/contiki-main.c
View File

@ -61,7 +61,7 @@ PROCINIT(&etimer_process, &tcpip_process);
SENSORS(&pir_sensor, &vib_sensor, &button_sensor); SENSORS(&pir_sensor, &vib_sensor, &button_sensor);
static uint8_t serial_id[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08}; static uint8_t serial_id[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08};
static uint16_t node_id = 0x0102;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
set_rime_addr(void) set_rime_addr(void)
@ -98,7 +98,7 @@ char **contiki_argv;
int int
main(int argc, char **argv) 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 */ /* crappy way of remembering and accessing argc/v */
contiki_argc = argc; contiki_argc = argc;