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

Remove cooja-ip64 compiler warnings

Browse Source
This commit is contained in:
Simon Duquennoy 2017-05-18 10:23:28 +02:00
parent ea09903d67
commit 2928e3e440
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/net/ipv6/uip-nd6.c
View File

@ -123,7 +123,7 @@ static uip_ds6_nbr_t *nbr; /** Pointer to a nbr cache entry*/
static uip_ds6_addr_t *addr; /** Pointer to an interface address */ static uip_ds6_addr_t *addr; /** Pointer to an interface address */
#endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */ #endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */
#if UIP_ND6_SEND_NS || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER #if UIP_ND6_SEND_NS || !UIP_CONF_ROUTER
static uip_ds6_defrt_t *defrt; /** Pointer to a router list entry */ static uip_ds6_defrt_t *defrt; /** Pointer to a router list entry */
#endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */ #endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */

9
drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
View File

@ -50,19 +50,24 @@
#include "lib/simEnvChange.h" #include "lib/simEnvChange.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/queuebuf.h"
#include "net/ip/uip-nameserver.h" #include "net/ip/uip-nameserver.h"
#include "net/ip/ip64-addr.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "dev/cooja-radio.h" #include "dev/cooja-radio.h"
#include "dev/button-sensor.h" #include "dev/button-sensor.h"
#include "dev/pir-sensor.h" #include "dev/pir-sensor.h"
#include "dev/vib-sensor.h" #include "dev/vib-sensor.h"
#include "dev/rs232.h"
#include "sys/node-id.h" #include "sys/node-id.h"
#include "ip64.h" #include "ip64.h"
#include "dev/slip.h" #include "dev/slip.h"
void log_set_putchar_with_slip(int with);
/* JNI-defined functions, depends on the environment variable CLASSNAME */ /* JNI-defined functions, depends on the environment variable CLASSNAME */
#ifndef CLASSNAME #ifndef CLASSNAME
#error CLASSNAME is undefined, required by contiki-cooja-main.c #error CLASSNAME is undefined, required by contiki-cooja-main.c
@ -112,8 +117,6 @@ long referenceVar;
static struct cooja_mt_thread rtimer_thread; static struct cooja_mt_thread rtimer_thread;
static struct cooja_mt_thread process_run_thread; static struct cooja_mt_thread process_run_thread;
#define MIN(a, b) ( (a)<(b) ? (a) : (b) )
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
print_processes(struct process * const processes[]) print_processes(struct process * const processes[])
@ -199,7 +202,7 @@ contiki_init(void)
addr[i + 1] = node_id & 0xff; addr[i + 1] = node_id & 0xff;
addr[i + 0] = node_id >> 8; addr[i + 0] = node_id >> 8;
} }
linkaddr_copy(addr, &linkaddr_node_addr); linkaddr_copy((linkaddr_t *)addr, &linkaddr_node_addr);
memcpy(&uip_lladdr.addr, addr, sizeof(uip_lladdr.addr)); memcpy(&uip_lladdr.addr, addr, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);

1
examples/ip64-router/ip64-router.c
View File

@ -2,6 +2,7 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "ip64.h" #include "ip64.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/rpl/rpl-dag-root.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(router_node_process, "Router node"); PROCESS(router_node_process, "Router node");

6
regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc
View File

@ -26,7 +26,8 @@
<identifier>mtype503</identifier> <identifier>mtype503</identifier>
<description>ip64-router/ip64-router.c TARGET=cooja-ip64</description> <description>ip64-router/ip64-router.c TARGET=cooja-ip64</description>
<source>[CONTIKI_DIR]/examples/ip64-router/ip64-router.c</source> <source>[CONTIKI_DIR]/examples/ip64-router/ip64-router.c</source>
<commands>make ip64-router.cooja-ip64 TARGET=cooja-ip64</commands> <commands>make TARGET=cooja-ip64 clean
make ip64-router.cooja-ip64 TARGET=cooja-ip64</commands>
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface> <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface> <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
<moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface> <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -50,7 +51,8 @@
<identifier>mtype555</identifier> <identifier>mtype555</identifier>
<description>examples/http-socket/http-example.c</description> <description>examples/http-socket/http-example.c</description>
<source>[CONTIKI_DIR]/examples/http-socket/http-example.c</source> <source>[CONTIKI_DIR]/examples/http-socket/http-example.c</source>
<commands>make http-example.cooja TARGET=cooja</commands> <commands>make TARGET=cooja clean
make http-example.cooja TARGET=cooja</commands>
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface> <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface> <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
<moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface> <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>