diff --git a/examples/ravenusbstick/Makefile b/examples/ravenusbstick/Makefile index 3e150441e..0825aa9b8 100644 --- a/examples/ravenusbstick/Makefile +++ b/examples/ravenusbstick/Makefile @@ -6,4 +6,4 @@ all: clean: ${MAKE} -f Makefile.ravenusbstick clean rm -rf obj_avr-ravenusb - rm symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex + rm -rf symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex diff --git a/examples/ravenusbstick/Makefile.ravenusbstick b/examples/ravenusbstick/Makefile.ravenusbstick index d00f907aa..70f160a3c 100644 --- a/examples/ravenusbstick/Makefile.ravenusbstick +++ b/examples/ravenusbstick/Makefile.ravenusbstick @@ -6,6 +6,8 @@ all: ravenusbstick CONTIKI_NO_NET=1 #UIP_CONF_IPV6=1 +CFLAGS=-DUIP_CONF_IPV6=0 -DUIP_CONF_IPV6_RPL=0 + CONTIKI = ../.. include $(CONTIKI)/Makefile.include diff --git a/platform/avr-ravenusb/cdc_task.c b/platform/avr-ravenusb/cdc_task.c index c39e6bf27..e7a402997 100644 --- a/platform/avr-ravenusb/cdc_task.c +++ b/platform/avr-ravenusb/cdc_task.c @@ -601,18 +601,17 @@ extern uip_ds6_netif_t uip_ds6_if; } if (j) PRINTF_P(PSTR(" ")); PRINTF_P(PSTR("\n\rRoutes [%u max]\n\r"),UIP_DS6_ROUTE_NB); - for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { - if(uip_ds6_routing_table[i].isused) { - ipaddr_add(&uip_ds6_routing_table[i].ipaddr); - PRINTF_P(PSTR("/%u (via "), uip_ds6_routing_table[i].length); - ipaddr_add(&uip_ds6_routing_table[i].nexthop); - if(uip_ds6_routing_table[i].state.lifetime < 600) { - PRINTF_P(PSTR(") %lus\n\r"), uip_ds6_routing_table[i].state.lifetime); - } else { - PRINTF_P(PSTR(")\n\r")); - } - j=0; + uip_ds6_route_t *route; + for(route = uip_ds6_route_list_head(),j=1; route != NULL; route = list_item_next(route)) { + ipaddr_add(&route->ipaddr); + PRINTF_P(PSTR("/%u (via "), route->length); + ipaddr_add(&route->nexthop); + if(route->state.lifetime < 600) { + PRINTF_P(PSTR(") %lus\n\r"), route->state.lifetime); + } else { + PRINTF_P(PSTR(")\n\r")); } + j=0; } if (j) PRINTF_P(PSTR(" ")); PRINTF_P(PSTR("\n\r---------\n\r")); @@ -629,13 +628,8 @@ extern uip_ds6_netif_t uip_ds6_if; break; case 'Z': //zap the routing table - { uint8_t i; - for (i = 0; i < UIP_DS6_ROUTE_NB; i++) { - uip_ds6_routing_table[i].isused=0; - } - PRINTF_P(PSTR("Routing table cleared!\n\r")); + PRINTF_P(PSTR("Not implemented.\n\r")); break; - } #endif case 'm': diff --git a/regression-tests/01-compile/Makefile b/regression-tests/01-compile/Makefile index ddaf72566..3b4c92335 100644 --- a/regression-tests/01-compile/Makefile +++ b/regression-tests/01-compile/Makefile @@ -25,6 +25,7 @@ netperf/sky \ powertrace/sky \ rime/sky \ rime/z1 \ +ravenusbstick/avr-ravenusb \ rest-example/sky \ servreg-hack/sky \ sky/sky \