deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #239 from darconeous/pull-requests/avr-ravenusb-rpl

Browse source 
avr-ravenusb/cdc_task: Fix compile issues.
This commit is contained in:
Nicolas Tsiftes 2013-05-20 04:42:03 -07:00
parent 9b3c704be5 3e0666265d
commit 4b80ad9c89
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/ravenusbstick/Makefile
View file

@ -6,4 +6,4 @@ all:
clean: clean:
${MAKE} -f Makefile.ravenusbstick clean ${MAKE} -f Makefile.ravenusbstick clean
rm -rf obj_avr-ravenusb rm -rf obj_avr-ravenusb
rm symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex rm -rf symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex

2
examples/ravenusbstick/Makefile.ravenusbstick
View file

@ -6,6 +6,8 @@ all: ravenusbstick
CONTIKI_NO_NET=1 CONTIKI_NO_NET=1
#UIP_CONF_IPV6=1 #UIP_CONF_IPV6=1
CFLAGS=-DUIP_CONF_IPV6=0 -DUIP_CONF_IPV6_RPL=0
CONTIKI = ../.. CONTIKI = ../..
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

28
platform/avr-ravenusb/cdc_task.c
View file

@ -601,18 +601,17 @@ extern uip_ds6_netif_t uip_ds6_if;
} }
if (j) PRINTF_P(PSTR(" <none>")); if (j) PRINTF_P(PSTR(" <none>"));
PRINTF_P(PSTR("\n\rRoutes [%u max]\n\r"),UIP_DS6_ROUTE_NB); PRINTF_P(PSTR("\n\rRoutes [%u max]\n\r"),UIP_DS6_ROUTE_NB);
for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { uip_ds6_route_t *route;
if(uip_ds6_routing_table[i].isused) { for(route = uip_ds6_route_list_head(),j=1; route != NULL; route = list_item_next(route)) {
ipaddr_add(&uip_ds6_routing_table[i].ipaddr); ipaddr_add(&route->ipaddr);
PRINTF_P(PSTR("/%u (via "), uip_ds6_routing_table[i].length); PRINTF_P(PSTR("/%u (via "), route->length);
ipaddr_add(&uip_ds6_routing_table[i].nexthop); ipaddr_add(&route->nexthop);
if(uip_ds6_routing_table[i].state.lifetime < 600) { if(route->state.lifetime < 600) {
PRINTF_P(PSTR(") %lus\n\r"), uip_ds6_routing_table[i].state.lifetime); PRINTF_P(PSTR(") %lus\n\r"), route->state.lifetime);
} else { } else {
PRINTF_P(PSTR(")\n\r")); PRINTF_P(PSTR(")\n\r"));
}
j=0;
} }
j=0;
} }
if (j) PRINTF_P(PSTR(" <none>")); if (j) PRINTF_P(PSTR(" <none>"));
PRINTF_P(PSTR("\n\r---------\n\r")); PRINTF_P(PSTR("\n\r---------\n\r"));
@ -629,13 +628,8 @@ extern uip_ds6_netif_t uip_ds6_if;
break; break;
case 'Z': //zap the routing table case 'Z': //zap the routing table
{ uint8_t i; PRINTF_P(PSTR("Not implemented.\n\r"));
for (i = 0; i < UIP_DS6_ROUTE_NB; i++) {
uip_ds6_routing_table[i].isused=0;
}
PRINTF_P(PSTR("Routing table cleared!\n\r"));
break; break;
}
#endif #endif
case 'm': case 'm':

1
regression-tests/01-compile/Makefile
View file

@ -25,6 +25,7 @@ netperf/sky \
powertrace/sky \ powertrace/sky \
rime/sky \ rime/sky \
rime/z1 \ rime/z1 \
ravenusbstick/avr-ravenusb \
rest-example/sky \ rest-example/sky \
servreg-hack/sky \ servreg-hack/sky \
sky/sky \ sky/sky \