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

Merge branch 'contiki' into osd

Browse source
This commit is contained in:
Harald Pichler 2014-12-07 15:24:00 +01:00
commit a02be51f08
274 changed files with 1159 additions and 1285 deletions
Download patch file Download diff file Expand all files Collapse all files

1
platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1
View file

@ -31,3 +31,4 @@ AVRDUDE_MCU=m128rfa1
include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac

4
platform/avr-atmega128rfa1/apps/raven-webserver/webserver-nogui.c
View file

@ -68,7 +68,7 @@ webserver_log_file(uip_ipaddr_t *requester, char *file)
{
/* Print out IP address of requesting host. */
#if LOG_CONF_ENABLED
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
char buf[48];
uint8_t j;
j=httpd_cgi_sprint_ip6((uip_ip6addr_t)*requester, buf);
@ -77,7 +77,7 @@ webserver_log_file(uip_ipaddr_t *requester, char *file)
char buf[20];
sprintf(buf, "%d.%d.%d.%d: ", requester->u8[0], requester->u8[1],
requester->u8[2], requester->u8[3]);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
log_message(buf, file);
#endif /* LOG_CONF_ENABLED */

10
platform/avr-atmega128rfa1/contiki-conf.h
View file

@ -142,7 +142,7 @@ typedef unsigned short uip_stats_t;
/* Allow MCU sleeping between channel checks */
#define RDC_CONF_MCU_SLEEP 1
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
@ -243,7 +243,13 @@ typedef unsigned short uip_stats_t;
#define WITH_PHASE_OPTIMIZATION 0
#define CONTIKIMAC_CONF_COMPOWER 1
#define RIMESTATS_CONF_ENABLED 1
#define NETSTACK_CONF_FRAMER framer_802154
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer802154
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_RADIO rf230_driver
#define CHANNEL_802_15_4 26
/* The radio needs to interrupt during an rtimer interrupt */

16
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -264,7 +264,7 @@ uint8_t i;
PRINTA("Random EUI64 address generated\n");
}
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
@ -278,7 +278,7 @@ uint8_t i;
rf230_set_channel(params_get_channel());
rf230_set_txpower(params_get_txpower());
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]);
#else
PRINTA("MAC address ");
@ -308,7 +308,9 @@ uint8_t i;
#endif /* ANNOUNCE_BOOT */
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#ifdef RAVEN_LCD_INTERFACE
process_start(&raven_lcd_process, NULL);
@ -391,7 +393,7 @@ uint8_t i;
#endif
}
#if ROUTES && UIP_CONF_IPV6
#if ROUTES && NETSTACK_CONF_WITH_IPV6
static void
ipaddr_add(const uip_ipaddr_t *addr)
{
@ -419,9 +421,9 @@ ipaddr_add(const uip_ipaddr_t *addr)
int
main(void)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
uip_ds6_nbr_t *nbr;
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
initialize();
while(1) {
@ -506,7 +508,7 @@ extern volatile unsigned long radioontime;
clocktime+=1;
#endif
#if PINGS && UIP_CONF_IPV6
#if PINGS && NETSTACK_CONF_WITH_IPV6
extern void raven_ping6(void);
if ((clocktime%PINGS)==1) {
PRINTF("**Ping\n");
@ -514,7 +516,7 @@ if ((clocktime%PINGS)==1) {
}
#endif
#if ROUTES && UIP_CONF_IPV6
#if ROUTES && NETSTACK_CONF_WITH_IPV6
if ((clocktime%ROUTES)==2) {
extern uip_ds6_netif_t uip_ds6_if;

2
platform/avr-raven/Makefile.avr-raven
View file

@ -35,5 +35,5 @@ AVRDUDE_MCU=m1284p
include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/ipv6 core/net/ipv4 core/net/ip core/net/mac core/net core/net/rime core/net/mac/sicslowmac \
MODULES += core/net/mac core/net core/net/mac/sicslowmac \
core/net/llsec

4
platform/avr-raven/apps/raven-webserver/webserver-nogui.c
View file

@ -68,7 +68,7 @@ webserver_log_file(uip_ipaddr_t *requester, char *file)
{
/* Print out IP address of requesting host. */
#if LOG_CONF_ENABLED
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
char buf[48];
uint8_t j;
j=httpd_cgi_sprint_ip6((uip_ip6addr_t)*requester, buf);
@ -77,7 +77,7 @@ webserver_log_file(uip_ipaddr_t *requester, char *file)
char buf[20];
sprintf(buf, "%d.%d.%d.%d: ", requester->u8[0], requester->u8[1],
requester->u8[2], requester->u8[3]);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
log_message(buf, file);
#endif /* LOG_CONF_ENABLED */

13
platform/avr-raven/contiki-conf.h
View file

@ -157,19 +157,18 @@ typedef unsigned short uip_stats_t;
#define PACKETBUF_CONF_HDR_SIZE 0 //RF230 combined driver/mac handles headers internally
#endif /*RF230BB */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1
//#define UIP_CONF_IPV6_RPL 0
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else
/* ip4 should build but is largely untested */
#define LINKADDR_CONF_SIZE 2
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_LL_802154 1
#define UIP_CONF_LLH_LEN 0
@ -259,7 +258,13 @@ typedef unsigned short uip_stats_t;
#define WITH_PHASE_OPTIMIZATION 0
#define CONTIKIMAC_CONF_COMPOWER 1
#define RIMESTATS_CONF_ENABLED 1
#define NETSTACK_CONF_FRAMER framer_802154
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer802154
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_RADIO rf230_driver
#define CHANNEL_802_15_4 26
/* The radio needs to interrupt during an rtimer interrupt */

18
platform/avr-raven/contiki-raven-main.c
View file

@ -265,7 +265,7 @@ uint8_t i;
PRINTA("Random EUI64 address generated\n");
}
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
linkaddr_set_node_addr(&addr);
rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
@ -284,7 +284,7 @@ uint8_t i;
rf230_set_channel(params_get_channel());
rf230_set_txpower(params_get_txpower());
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]);
#else
PRINTA("MAC address ");
@ -316,13 +316,17 @@ uint8_t i;
// rime_init(rime_udp_init(NULL));
// uip_router_register(&rimeroute);
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#else /* !RF230BB */
/* Original RF230 combined mac/radio driver */
/* mac process must be started before tcpip process! */
process_start(&mac_process, NULL);
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#endif /* RF230BB */
#ifdef RAVEN_LCD_INTERFACE
@ -401,7 +405,7 @@ uint8_t i;
}
}
#if ROUTES && UIP_CONF_IPV6
#if ROUTES && NETSTACK_CONF_WITH_IPV6
static void
ipaddr_add(const uip_ipaddr_t *addr)
{
@ -429,9 +433,9 @@ ipaddr_add(const uip_ipaddr_t *addr)
int
main(void)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
uip_ds6_nbr_t *nbr;
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
initialize();
while(1) {
@ -502,7 +506,7 @@ extern volatile unsigned long radioontime;
clocktime+=1;
#endif
#if PINGS && UIP_CONF_IPV6
#if PINGS && NETSTACK_CONF_WITH_IPV6
extern void raven_ping6(void);
if ((clocktime%PINGS)==1) {
PRINTF("**Ping\n");
@ -510,7 +514,7 @@ if ((clocktime%PINGS)==1) {
}
#endif
#if ROUTES && UIP_CONF_IPV6
#if ROUTES && NETSTACK_CONF_WITH_IPV6
if ((clocktime%ROUTES)==2) {
extern uip_ds6_netif_t uip_ds6_if;

5
platform/avr-ravenusb/Makefile.avr-ravenusb
View file

@ -42,7 +42,7 @@ CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAVRGCC -DAUTO_CRC_PADDING=2 -DJACKDAW=1
#The no-net build using fakeuip.c is always ipv6
CFLAGS += -I$(CONTIKI)/core/net/ipv6 -I$(CONTIKI)/core/net/ip -I$(CONTIKI)/core/net/ipv4
ifdef CONTIKI_NO_NET
CONTIKI_PLAT_DEFS+= -DUIP_CONF_IPV6=1
CONTIKI_PLAT_DEFS+= -DNETSTACK_CONF_WITH_IPV6=1
endif
@ -67,8 +67,7 @@ include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio
ifndef CONTIKI_NO_NET
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 \
core/net/rime core/net/mac core/net/mac/sicslowmac \
MODULES+=core/net/mac core/net/mac/sicslowmac \
core/net/llsec
else
vpath %.c $(CONTIKI)/core/net/ipv6

16
platform/avr-ravenusb/contiki-conf.h
View file

@ -217,19 +217,18 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
#define PACKETBUF_CONF_HDR_SIZE 0 //RF230 combined driver/mac handles headers internally
#endif /*RF230BB */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 0
//#define UIP_CONF_IPV6_RPL 0
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else
/* ip4 should build but is thoroughly untested */
#define LINKADDR_CONF_SIZE 2
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* See uip-ds6.h */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 2
@ -312,7 +311,13 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_MAC nullmac_driver
//#define NETSTACK_CONF_MAC csma_driver
#define NETSTACK_CONF_RDC contikimac_driver
#define NETSTACK_CONF_FRAMER framer_802154
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer802154
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_RADIO rf230_driver
#define CHANNEL_802_15_4 26
/* Enable extended mode with autoack, but no csma/autoretry */
@ -374,13 +379,12 @@ typedef unsigned short uip_stats_t;
//#pragma mark RPL Settings
/* ************************************************************************** */
#define UIP_CONF_IPV6_RPL 0
#if UIP_CONF_IPV6_RPL
/* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */
/* Dropping the NS on other OSs is more complicated, see http://www.sics.se/~adam/wiki/index.php/Jackdaw_RNDIS_RPL_border_router */
/* RPL requires the uip stack. Change #CONTIKI_NO_NET=1 to UIP_CONF_IPV6=1 in the examples makefile,
/* RPL requires the uip stack. Change #CONTIKI_NO_NET=1 to NETSTACK_CONF_WITH_IPV6=1 in the examples makefile,
or include the needed source files in /plaftorm/avr-ravenusb/Makefile.avr-ravenusb */
/* For the present the buffer_length calcs in rpl-icmp6.c will need adjustment by the length difference
between 6lowpan (0) and ethernet (14) link-layer headers:

4
platform/avr-ravenusb/contiki-raven-main.c
View file

@ -500,7 +500,7 @@ uint16_t p=(uint16_t)&__bss_end;
//Fix MAC address
init_net();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &tmp_addr.u8, 8);
#endif
@ -552,7 +552,9 @@ uint16_t p=(uint16_t)&__bss_end;
#else /* RF230BB */
/* The order of starting these is important! */
process_start(&mac_process, NULL);
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#endif /* RF230BB */
/* Start ethernet network and storage process */

6
platform/avr-ravenusb/httpd-simple-avr.c
View file

@ -253,7 +253,7 @@ PT_THREAD(generate_routes(struct httpd_state *s))
PSOCK_GENERATOR_SEND(&s->sout, generate_string_P, (char *) TOP1);
PSOCK_GENERATOR_SEND(&s->sout, generate_string_P, (char *) TOP2);
#if UIP_CONF_IPV6 //allow ip4 builds
#if NETSTACK_CONF_WITH_IPV6 //allow ip4 builds
blen = 0;
ADD("<h2>Neighbors [%u max]</h2>",NBR_TABLE_CONF_MAX_NEIGHBORS);
PSOCK_GENERATOR_SEND(&s->sout, generate_string, buf);
@ -296,11 +296,11 @@ PT_THREAD(generate_routes(struct httpd_state *s))
PSOCK_GENERATOR_SEND(&s->sout, generate_string, buf);
blen = 0;
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
blen = 0;i++;
ADD("<h2>Hey, you got ip4 working!</h2>");
PSOCK_GENERATOR_SEND(&s->sout, generate_string, buf);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
PSOCK_GENERATOR_SEND(&s->sout, generate_string_P, (char *) BOTTOM);

21
platform/avr-ravenusb/sicslow_ethernet.c
View file

@ -381,7 +381,7 @@ void mac_ethernetToLowpan(uint8_t * ethHeader)
/* Simple Address Translation */
if(memcmp((uint8_t *)&simple_trans_ethernet_addr, &(((struct uip_eth_hdr *) ethHeader)->dest.addr[0]), 6) == 0) {
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
//Addressed to us: make 802.15.4 address from IPv6 Address
destAddr.addr[0] = UIP_IP_BUF->destipaddr.u8[8] ^ 0x02;
destAddr.addr[1] = UIP_IP_BUF->destipaddr.u8[9];
@ -445,7 +445,7 @@ void mac_ethernetToLowpan(uint8_t * ethHeader)
#endif
}
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* Send the packet to the uip6 stack if it exists, else send to 6lowpan */
#if UIP_CONF_IPV6_RPL
/* Save the destination address, to trap ponging it back to the interface */
@ -456,9 +456,9 @@ void mac_ethernetToLowpan(uint8_t * ethHeader)
// PRINTF("Output to %x %x %x %x %x %x %x %x\n",destAddr.addr[0],destAddr.addr[1],destAddr.addr[2],destAddr.addr[3],destAddr.addr[4],destAddr.addr[5],destAddr.addr[6],destAddr.addr[7]);
tcpip_output(destAddrPtr);
#endif
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
tcpip_output(); //Allow non-ipv6 builds (Hello World)
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !RF230BB
usb_eth_stat.txok++;
@ -481,11 +481,8 @@ void mac_LowpanToEthernet(void)
//Setup generic ethernet stuff
ETHBUF(uip_buf)->type = uip_htons(UIP_ETHTYPE_IPV6);
//Check for broadcast message
#if RF230BB
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &linkaddr_null)) {
// if(linkaddr_cmp((const linkaddr_t *)destAddr, &linkaddr_null)) {
if(packetbuf_holds_broadcast()) {
#else
if( ( parsed_frame->fcf->destAddrMode == SHORTADDRMODE) &&
( parsed_frame->dest_addr->addr16 == 0xffff) ) {
@ -493,7 +490,7 @@ void mac_LowpanToEthernet(void)
ETHBUF(uip_buf)->dest.addr[0] = 0x33;
ETHBUF(uip_buf)->dest.addr[1] = 0x33;
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
ETHBUF(uip_buf)->dest.addr[2] = UIP_IP_BUF->destipaddr.u8[12];
ETHBUF(uip_buf)->dest.addr[3] = UIP_IP_BUF->destipaddr.u8[13];
ETHBUF(uip_buf)->dest.addr[4] = UIP_IP_BUF->destipaddr.u8[14];
@ -712,7 +709,7 @@ int8_t mac_translateIcmpLinkLayer(lltype_t target)
//We broke ICMP checksum, be sure to fix that
UIP_ICMP_BUF->icmpchksum = 0;
#if UIP_CONF_IPV6 //allow non ipv6 builds
#if NETSTACK_CONF_WITH_IPV6 //allow non ipv6 builds
UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum();
#endif
@ -977,7 +974,7 @@ mac_log_802_15_4_tx(const uint8_t* buffer, size_t total_len) {
ETHBUF(raw_buf)->type = uip_htons(0x809A); //UIP_ETHTYPE_802154 0x809A
/* Check for broadcast message */
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &linkaddr_null)) {
if(packetbuf_holds_broadcast()) {
ETHBUF(raw_buf)->dest.addr[0] = 0x33;
ETHBUF(raw_buf)->dest.addr[1] = 0x33;
ETHBUF(raw_buf)->dest.addr[2] = 0x00;
@ -1018,7 +1015,7 @@ mac_log_802_15_4_rx(const uint8_t* buf, size_t len) {
ETHBUF(raw_buf)->type = uip_htons(0x809A); //UIP_ETHTYPE_802154 0x809A
/* Check for broadcast message */
if(linkaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &linkaddr_null)) {
if(packetbuf_holds_broadcast()) {
ETHBUF(raw_buf)->dest.addr[0] = 0x33;
ETHBUF(raw_buf)->dest.addr[1] = 0x33;
ETHBUF(raw_buf)->dest.addr[2] = 0x00;

4
platform/avr-rcb/contiki-conf.h
View file

@ -92,7 +92,7 @@ void clock_adjust_ticks(clock_time_t howmany);
#define CCIF
#define CLIF
//#define UIP_CONF_IPV6 1 //Let makefile determine this so ipv4 hello-world will compile
//#define NETSTACK_CONF_WITH_IPV6 1 //Let makefile determine this so ipv4 hello-world will compile
#define LINKADDR_CONF_SIZE 8
#define PACKETBUF_CONF_HDR_SIZE 0
@ -124,7 +124,7 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_DEFROUTERS 2
#if UIP_CONF_IPV6 //tcpip.c error on ipv4 build if UIP_CONF_ICMP6 defined
#if NETSTACK_CONF_WITH_IPV6 //tcpip.c error on ipv4 build if UIP_CONF_ICMP6 defined
#define UIP_CONF_ICMP6 1
#endif

10
platform/avr-rcb/contiki-rcb-main.c
View file

@ -74,9 +74,17 @@ FUSES =
PROCESS(rcb_leds, "RCB leds process");
#if RF230BB
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &tcpip_process, &rcb_leds);
#else
PROCINIT(&etimer_process, &rcb_leds);
#endif
#else
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &mac_process, &tcpip_process, &rcb_leds);
#else
PROCINIT(&etimer_process, &mac_process, &rcb_leds);
#endif
#endif
/* Put default MAC address in EEPROM */
@ -115,7 +123,7 @@ PROCESS_THREAD(rcb_leds, ev, data)
while(1) {
PROCESS_YIELD();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
if (ev == ICMP6_ECHO_REQUEST) {
#else
if (1) {

16
platform/avr-zigbit/contiki-avr-zigbit-main.c
View file

@ -82,9 +82,17 @@ FUSES =
};
#if RF230BB
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
//PROCINIT(&etimer_process, &tcpip_process );
#else
//PROCINIT(&etimer_process );
#endif
#else
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &mac_process, &tcpip_process );
#else
PROCINIT(&etimer_process, &mac_process );
#endif
#endif
/* Put default MAC address in EEPROM */
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
@ -124,7 +132,7 @@ init_lowlevel(void)
memset(&addr, 0, sizeof(linkaddr_t));
eeprom_read_block ((void *)&addr.u8, &mac_address, 8);
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, 8);
#endif
rf230_set_pan_addr(IEEE802154_PANID, 0, (uint8_t *)&addr.u8);
@ -162,13 +170,15 @@ init_lowlevel(void)
rime_init(rime_udp_init(NULL));
uip_router_register(&rimeroute);
#endif
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#else
/* mac process must be started before tcpip process! */
process_start(&mac_process, NULL);
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#endif /*RF230BB*/
}

6
platform/avr-zigbit/contiki-conf.h
View file

@ -98,8 +98,8 @@ void clock_adjust_ticks(clock_time_t howmany);
#define LINKADDR_CONF_SIZE 8
#define PACKETBUF_CONF_HDR_SIZE 0
//define UIP_CONF_IPV6 1 //Let the makefile do this, allows hello-world to compile
#if UIP_CONF_IPV6
//define NETSTACK_CONF_WITH_IPV6 1 //Let the makefile do this, allows hello-world to compile
#if NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1
@ -113,7 +113,7 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_LLH_LEN 0
/* No radio cycling */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#else
#define NETSTACK_CONF_NETWORK rime_driver

4
platform/cc2530dk/Makefile.cc2530dk
View file

@ -19,7 +19,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.cc2530dk
ifeq ($(UIP_CONF_IPV6),1)
ifeq ($(CONTIKI_WITH_IPV6),1)
CONTIKI_TARGET_SOURCEFILES += viztool.c
endif
@ -47,5 +47,5 @@ CONTIKI_CPU=$(CONTIKI)/cpu/cc253x
include $(CONTIKI_CPU)/Makefile.cc253x
# Default modules
MODULES += core/net/ip core/net/ipv6 core/net/rime core/net core/net/mac core/net/rpl \
MODULES += core/net core/net/mac \
core/net/llsec

14
platform/cc2530dk/contiki-conf.h
View file

@ -157,19 +157,19 @@
#endif
/* Viztool on by default for IPv6 builds */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#ifndef VIZTOOL_CONF_ON
#define VIZTOOL_CONF_ON 1
#endif /* VIZTOOL_CONF_ON */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Network Stack */
#ifndef NETSTACK_CONF_NETWORK
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#else
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_NETWORK */
#ifndef NETSTACK_CONF_MAC
@ -203,7 +203,7 @@
#define CC2530_RF_CONF_AUTOACK 1
#endif /* CC2530_CONF_AUTOACK */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* Addresses, Sizes and Interfaces */
/* 8-byte addresses here, 2 otherwise */
#define LINKADDR_CONF_SIZE 8
@ -267,13 +267,13 @@
#define QUEUEBUF_CONF_NUM 6
#endif
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define QUEUEBUF_CONF_NUM 8
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER

4
platform/cc2530dk/contiki-main.c
View file

@ -260,11 +260,11 @@ main(void) CC_NON_BANKED
ADC_SENSOR_ACTIVATE();
#endif
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr));
queuebuf_init();
process_start(&tcpip_process, NULL);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if VIZTOOL_CONF_ON
process_start(&viztool_process, NULL);

6
platform/cc2530dk/uip-debug.c
View file

@ -43,7 +43,7 @@
void
uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
uint16_t a;
unsigned int i;
int f;
@ -63,9 +63,9 @@ uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
puthex(a & 0xFF);
}
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
PRINTA("%u.%u.%u.%u", addr->u8[0], addr->u8[1], addr->u8[2], addr->u8[3]);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
}
/*---------------------------------------------------------------------------*/
void

4
platform/cc2538dk/Makefile.cc2538dk
View file

@ -27,8 +27,8 @@ endif
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/ipv6 core/net/mac core/net/ip \
core/net/rpl core/net/rime core/net/mac/contikimac \
MODULES += core/net core/net/mac \
core/net/mac/contikimac \
core/net/llsec
BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py

24
platform/cc2538dk/contiki-conf.h
View file

@ -288,11 +288,11 @@ typedef uint32_t rtimer_clock_t;
* @{
*/
#ifndef NETSTACK_CONF_NETWORK
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#else
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_NETWORK */
#ifndef NETSTACK_CONF_MAC
@ -316,8 +316,12 @@ typedef uint32_t rtimer_clock_t;
#endif
#ifndef NETSTACK_CONF_FRAMER
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer_802154
#endif
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_FRAMER */
#define NETSTACK_CONF_RADIO cc2538_rf_driver
/** @} */
@ -413,11 +417,11 @@ typedef uint32_t rtimer_clock_t;
*/
/* Don't let contiki-default-conf.h decide if we are an IPv6 build */
#ifndef UIP_CONF_IPV6
#define UIP_CONF_IPV6 0
#ifndef NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_WITH_IPV6 0
#endif
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* Addresses, Sizes and Interfaces */
/* 8-byte addresses here, 2 otherwise */
#define LINKADDR_CONF_SIZE 8
@ -441,10 +445,6 @@ typedef uint32_t rtimer_clock_t;
#define UIP_CONF_ROUTER 1
#endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_IP_FORWARD 0
#define RPL_CONF_STATS 0
@ -498,7 +498,7 @@ typedef uint32_t rtimer_clock_t;
#define QUEUEBUF_CONF_NUM 8
#endif
/*---------------------------------------------------------------------------*/
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define UIP_CONF_IP_FORWARD 1
@ -512,7 +512,7 @@ typedef uint32_t rtimer_clock_t;
#define QUEUEBUF_CONF_NUM 8
#endif
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/** @} */
/*---------------------------------------------------------------------------*/

4
platform/cc2538dk/contiki-main.c
View file

@ -202,11 +202,11 @@ main(void)
set_rf_params();
netstack_init();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr));
queuebuf_init();
process_start(&tcpip_process, NULL);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
process_start(&sensors_process, NULL);

38
platform/cooja/Makefile.cooja
View file

@ -74,21 +74,29 @@ CONTIKI_CPU=$(CONTIKI)/cpu/x86
CFLAGSNO = $(EXTRA_CC_ARGS) -Wall -g -I/usr/local/include -DCLASSNAME=$(CLASSNAME)
CFLAGS += $(CFLAGSNO)
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
ifdef WITH_UIP
CFLAGS += -DWITH_UIP=1
endif
MODULES += core/net core/net/mac \
core/net/llsec
## Copied from Makefile.include, since Cooja overrides CFLAGS et al
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
ifneq ($(UIP_CONF_RPL),0)
CFLAGS += -DUIP_CONF_IPV6_RPL=1
endif # UIP_CONF_RPL
endif # UIP_CONF_IPV6
HAS_STACK = 0
ifeq ($(CONTIKI_WITH_IPV4),1)
HAS_STACK = 1
CFLAGS += -DNETSTACK_CONF_WITH_IPV4=1
endif
MODULES += core/net core/net/ip core/net/ipv4 \
core/net/ipv6 core/net/mac core/net/rime core/net/rpl \
core/net/llsec
ifeq ($(CONTIKI_WITH_RIME),1)
HAS_STACK = 1
CFLAGS += -DNETSTACK_CONF_WITH_RIME=1
endif
# Make IPv6 the default stack
ifeq ($(HAS_STACK),0)
CONTIKI_WITH_IPV6 = 1
endif
ifeq ($(CONTIKI_WITH_IPV6),1)
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
ifneq ($(CONTIKI_WITH_RPL),0)
CFLAGS += -DUIP_CONF_IPV6_RPL=1
endif
endif

35
platform/cooja/contiki-conf.h
View file

@ -47,11 +47,11 @@
#define w_memcpy memcpy
#if WITH_UIP
#if WITH_UIP6
#error WITH_UIP && WITH_IP6: Bad configuration
#endif /* WITH_UIP6 */
#endif /* WITH_UIP */
#if NETSTACK_CONF_WITH_IPV4
#if NETSTACK_CONF_WITH_IPV6
#error NETSTACK_CONF_WITH_IPV4 && NETSTACK_CONF_WITH_IPV6: Bad configuration
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#ifdef NETSTACK_CONF_H
@ -63,7 +63,7 @@
#else /* NETSTACK_CONF_H */
/* Default network config */
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#define NULLRDC_CONF_802154_AUTOACK 1
#define NULLRDC_CONF_SEND_802154_ACK 1
@ -78,9 +78,9 @@
#define NETSTACK_CONF_RADIO cooja_radio_driver
#define NETSTACK_CONF_FRAMER framer_802154
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
/* Network setup for IPv4 */
#define NETSTACK_CONF_NETWORK rime_driver /* NOTE: uip_over_mesh. else: uip_driver */
@ -89,7 +89,7 @@
#define NETSTACK_CONF_RADIO cooja_radio_driver
#define UIP_CONF_IP_FORWARD 1
#else /* WITH_UIP */
#else /* NETSTACK_CONF_WITH_IPV4 */
/* Network setup for Rime */
#define NETSTACK_CONF_NETWORK rime_driver
@ -98,15 +98,15 @@
#define NETSTACK_CONF_RADIO cooja_radio_driver
/*#define NETSTACK_CONF_FRAMER framer_nullmac*/
#endif /* WITH_UIP */
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_H */
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
/* Default network config */
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
@ -116,7 +116,7 @@
#define NETSTACK_CONF_RDC nullrdc_driver
#define NETSTACK_CONF_RADIO cooja_radio_driver
#define NETSTACK_CONF_FRAMER framer_802154
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define LINKADDR_CONF_SIZE 8
@ -124,9 +124,6 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
@ -174,7 +171,7 @@
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 8
#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -232,8 +229,8 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_TCP_SPLIT 0
#if UIP_CONF_IPV6
#endif /* UIP_CONF_IPV6 */
#if NETSTACK_CONF_WITH_IPV6
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Turn off example-provided putchars */
#define SLIP_BRIDGE_CONF_NO_PUTCHAR 1

34
platform/cooja/contiki-cooja-main.c
View file

@ -75,10 +75,10 @@
#define Java_org_contikios_cooja_corecomm_CLASSNAME_tick COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_tick)
#define Java_org_contikios_cooja_corecomm_CLASSNAME_setReferenceAddress COOJA__QUOTEME(COOJA_JNI_PATH,CLASSNAME,_setReferenceAddress)
#ifndef WITH_UIP
#define WITH_UIP 0
#ifndef NETSTACK_CONF_WITH_IPV4
#define NETSTACK_CONF_WITH_IPV4 0
#endif
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
#include "dev/rs232.h"
#include "dev/slip.h"
#include "net/ip/uip.h"
@ -92,16 +92,16 @@ static struct uip_fw_netif meshif =
#define UIP_OVER_MESH_CHANNEL 8
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#ifndef WITH_UIP6
#define WITH_UIP6 0
#ifndef NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_WITH_IPV6 0
#endif
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ip/uip.h"
#include "net/ipv6/uip-ds6.h"
#define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Simulation mote interfaces */
SIM_INTERFACE_NAME(moteid_interface);
@ -139,7 +139,7 @@ static struct cooja_mt_thread process_run_thread;
#define MIN(a, b) ( (a)<(b) ? (a) : (b) )
/*---------------------------------------------------------------------------*/
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -153,7 +153,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
static void
print_processes(struct process * const processes[])
@ -186,15 +186,15 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
for(i = 0; i < sizeof(uip_lladdr.addr); i += 2) {
addr.u8[i + 1] = node_id & 0xff;
addr.u8[i + 0] = node_id >> 8;
}
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
addr.u8[0] = node_id & 0xff;
addr.u8[1] = node_id >> 8;
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
linkaddr_set_node_addr(&addr);
printf("Rime started with address ");
for(i = 0; i < sizeof(addr.u8) - 1; i++) {
@ -246,7 +246,7 @@ contiki_init()
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval()));
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
/* IPv4 CONFIGURATION */
{
uip_ipaddr_t hostaddr, netmask;
@ -273,9 +273,9 @@ contiki_init()
rs232_set_input(slip_input_byte);
printf("IPv4 address: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&hostaddr));
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* IPv6 CONFIGURATION */
{
int i;
@ -317,7 +317,7 @@ contiki_init()
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
}
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Initialize eeprom */
eeprom_init();

16
platform/cooja/dev/ip.c
View file

@ -37,31 +37,31 @@ const struct simInterface ip_interface;
// COOJA variables
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
char simIPChanged;
char simIP[16];
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
char simIPChanged;
char simIP[4];
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*-----------------------------------------------------------------------------------*/
static void
doInterfaceActionsBeforeTick(void)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* check if IPv6 address should change */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
/* check if IPv4 address should change */
/*
@ -73,7 +73,7 @@ doInterfaceActionsBeforeTick(void)
}
*/
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
}
/*-----------------------------------------------------------------------------------*/
static void

6
platform/cooja/sys/log.c
View file

@ -36,13 +36,13 @@
#define IMPLEMENT_PRINTF 1
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
/* uIP packets via SLIP */
#include "uip.h"
#define MAX_LOG_LENGTH (2*UIP_BUFSIZE)
#else /* WITH_UIP */
#else /* NETSTACK_CONF_WITH_IPV4 */
#define MAX_LOG_LENGTH 1024
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#if MAX_LOG_LENGTH < 1024
#undef MAX_LOG_LENGTH

8
platform/econotag/Makefile.econotag
View file

@ -14,12 +14,8 @@ CONTIKI_PLAT_DEFS =
MCU=arm7tdmi-s
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
include $(CONTIKIMC1322X)/Makefile.mc1322x
MODULES+=core/net/ip core/net/ipv4 core/net core/net/rpl \
core/net/ipv6 core/net/rime core/net/mac \
MODULES+=core/net \
core/net/mac \
core/net/llsec

18
platform/econotag/contiki-conf.h
View file

@ -108,7 +108,7 @@
#define LINKADDR_CONF_SIZE 8
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define NETSTACK_CONF_MAC nullmac_driver
@ -121,7 +121,7 @@
#define CXMAC_CONF_ANNOUNCEMENTS 0
#define XMAC_CONF_ANNOUNCEMENTS 0
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define NETSTACK_CONF_NETWORK rime_driver
@ -144,7 +144,7 @@
#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 32
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define QUEUEBUF_CONF_NUM 16
@ -169,7 +169,7 @@
#define PROCESS_CONF_NUMEVENTS 8
#define PROCESS_CONF_STATS 1
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -180,10 +180,6 @@
#define UIP_CONF_ROUTER 1
#endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30
@ -191,7 +187,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -213,10 +209,10 @@
#endif /* SICSLOWPAN_CONF_FRAG */
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 1300
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

4
platform/econotag/main.c
View file

@ -124,7 +124,7 @@ int main(void) {
/* configure address on maca hardware and RIME */
contiki_maca_set_mac_address(mc1322x_config.eui);
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &linkaddr_node_addr.u8, sizeof(uip_lladdr.addr));
queuebuf_init();
NETSTACK_RDC.init();
@ -137,7 +137,7 @@ int main(void) {
#if DEBUG_ANNOTATE
print_lladdrs();
#endif
#endif /* endif WITH_UIP6 */
#endif /* endif NETSTACK_CONF_WITH_IPV6 */
process_start(&sensors_process, NULL);

9
platform/ev-aducrf101mkxz/Makefile.ev-aducrf101mkxz
View file

@ -48,19 +48,10 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CONTIKI_PLAT_DEFS =
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
include $(CONTIKI)/cpu/arm/aducrf101/Makefile.aducrf101
MODULES += \
core/net \
core/net/rpl \
core/net/ip \
core/net/ipv4 \
core/net/ipv6 \
core/net/rime \
core/net/mac \
core/net/mac/sicslowmac \
core/net/llsec

18
platform/ev-aducrf101mkxz/contiki-conf.h
View file

@ -55,7 +55,7 @@
#define LINKADDR_CONF_SIZE 8
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define NETSTACK_CONF_MAC nullmac_driver
@ -68,7 +68,7 @@
#define CXMAC_CONF_ANNOUNCEMENTS 0
#define XMAC_CONF_ANNOUNCEMENTS 0
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define NETSTACK_CONF_NETWORK rime_driver
@ -91,7 +91,7 @@
#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 16
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define QUEUEBUF_CONF_NUM 4
@ -116,7 +116,7 @@
#define PROCESS_CONF_NUMEVENTS 8
#define PROCESS_CONF_STATS 1
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -127,10 +127,6 @@
#define UIP_CONF_ROUTER 1
#endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 16
#define UIP_CONF_MAX_ROUTES 16
@ -138,7 +134,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -160,10 +156,10 @@
#endif /* SICSLOWPAN_CONF_FRAG */
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 140
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

12
platform/ev-aducrf101mkxz/contiki-main.c
View file

@ -49,9 +49,9 @@
#include "dev/button-sensor.h"
#include "dev/leds.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
@ -75,7 +75,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -115,7 +115,7 @@ main(int argc, char **argv)
uart_init(115200);
clock_init();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#if UIP_CONF_IPV6_RPL
printf(CONTIKI_VERSION_STRING " started with IPV6, RPL\n");
#else
@ -142,7 +142,7 @@ main(int argc, char **argv)
printf("MAC %s RDC %s NETWORK %s\n",
NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name);
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL);
@ -159,7 +159,7 @@ main(int argc, char **argv)
/* make it hardcoded... */
lladdr->state = ADDR_AUTOCONF;
}
#else
#elif NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif

8
platform/eval-adf7xxxmb4z/Makefile.eval-adf7xxxmb4z
View file

@ -51,10 +51,6 @@ CONTIKIBOARD = .
CONTIKI_PLAT_DEFS =
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
include $(CONTIKIRL78)/Makefile.rl78
PROG_UART ?= /dev/ttyUSB1
@ -62,6 +58,6 @@ PROG_UART ?= /dev/ttyUSB1
run: $(CONTIKI_PROJECT).$(TARGET).srec
~/adi-contiki/github/rl78flash/rl78flash -vv -i -m3 $(PROG_UART) -b500000 -a $<
MODULES+=core/net/ip core/net/ipv4 core/net core/net/rpl \
core/net/ipv6 core/net/rime core/net/mac core/net/mac/sicslowmac \
MODULES+=core/net \
core/net/mac core/net/mac/sicslowmac \
core/net/llsec

18
platform/eval-adf7xxxmb4z/contiki-conf.h
View file

@ -58,7 +58,7 @@
#define LINKADDR_CONF_SIZE 8
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define NETSTACK_CONF_MAC nullmac_driver
@ -71,7 +71,7 @@
#define CXMAC_CONF_ANNOUNCEMENTS 0
#define XMAC_CONF_ANNOUNCEMENTS 0
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define NETSTACK_CONF_NETWORK rime_driver
@ -94,7 +94,7 @@
#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 32
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define QUEUEBUF_CONF_NUM 16
@ -119,7 +119,7 @@
#define PROCESS_CONF_NUMEVENTS 8
#define PROCESS_CONF_STATS 1
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -130,10 +130,6 @@
#define UIP_CONF_ROUTER 1
#endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30
@ -141,7 +137,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -163,10 +159,10 @@
#endif /* SICSLOWPAN_CONF_FRAG */
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 1300
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

12
platform/eval-adf7xxxmb4z/contiki-main.c
View file

@ -45,9 +45,9 @@
#include "dev/button-sensor.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
#include "uart0.h"
@ -76,7 +76,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -158,7 +158,7 @@ main(int argc, char **argv)
PM3 &= ~BIT(0); /* LED7 */
PM5 &= ~BIT(0); /* LED8 */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#if UIP_CONF_IPV6_RPL
printf(CONTIKI_VERSION_STRING " started with IPV6, RPL" NEWLINE);
#else
@ -183,7 +183,7 @@ main(int argc, char **argv)
netstack_init();
printf("MAC %s RDC %s NETWORK %s" NEWLINE, NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name);
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL);
@ -201,7 +201,7 @@ main(int argc, char **argv)
printf("%02x%02x" NEWLINE, lladdr->ipaddr.u8[14], lladdr->ipaddr.u8[15]);
}
#else
#elif NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif

8
platform/exp5438/Makefile.exp5438
View file

@ -1,8 +1,8 @@
# $Id: Makefile.z1,v 1.4 2010/11/07 08:40:24 enricmcalvo Exp $
# msp430flasher -n msp430x5437 -w "Firmware.txt" -v -z [VCC]
MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 \
core/net/mac core/net/rpl core/net/rime core/net/mac/contikimac \
MODULES += core/net \
core/net/mac core/net/mac/contikimac \
core/net/llsec dev/cc2420
ifdef IAR
@ -44,10 +44,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-exp5438-main.c
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS)
ifdef IAR

21
platform/exp5438/contiki-conf.h
View file

@ -26,7 +26,11 @@
#endif /* NETSTACK_CONF_RADIO */
#ifndef NETSTACK_CONF_FRAMER
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer_802154
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_FRAMER */
#ifndef CC2420_CONF_AUTOACK
@ -35,7 +39,7 @@
#define NULLRDC_CONF_802154_AUTOACK 1
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
@ -52,7 +56,7 @@
#define QUEUEBUF_CONF_NUM 8
#endif
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
@ -85,7 +89,7 @@
#define CC2420_CONF_SFD_TIMESTAMPS 1
#endif /* TIMESYNCH_CONF_ENABLED */
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -131,7 +135,7 @@
#define PROCESS_CONF_STATS 1
/*#define PROCESS_CONF_FASTPOLL 4*/
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -139,9 +143,6 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
@ -155,7 +156,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#ifndef UIP_CONF_IPV6_QUEUE_PKT
#define UIP_CONF_IPV6_QUEUE_PKT 0
#endif /* UIP_CONF_IPV6_QUEUE_PKT */
@ -182,10 +183,10 @@
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

18
platform/exp5438/contiki-exp5438-main.c
View file

@ -53,9 +53,9 @@
#include "lcd.h"
#include "duty-cycle-scroller.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define DEBUG 1
@ -77,7 +77,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, node_mac, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -122,9 +122,9 @@ main(int argc, char **argv)
leds_on(LEDS_RED);
uart1_init(BAUD2UBR(115200)); /* Must come before first printf */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
slip_arch_init(BAUD2UBR(115200));
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
leds_on(LEDS_GREEN);
/* xmem_init(); */
@ -203,7 +203,7 @@ main(int argc, char **argv)
PRINTF("Node id not set.\n");
}
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, node_mac, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
@ -248,7 +248,7 @@ main(int argc, char **argv)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -259,9 +259,9 @@ main(int argc, char **argv)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !WITH_UIP6
#if !NETSTACK_CONF_WITH_IPV6
uart1_set_input(serial_line_input_byte);
serial_line_init();
#endif

4
platform/exp5438/uart1x.c
View file

@ -72,8 +72,8 @@ uart1_writeb(unsigned char c)
UCA1TXBUF = c;
}
/*---------------------------------------------------------------------------*/
#if ! WITH_UIP /* If WITH_UIP is defined, putchar() is defined by the SLIP driver */
#endif /* ! WITH_UIP */
#if ! NETSTACK_CONF_WITH_IPV4 /* If NETSTACK_CONF_WITH_IPV4 is defined, putchar() is defined by the SLIP driver */
#endif /* ! NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
/**
* Initalize the RS232 port.

8
platform/mbxxx/Makefile.mbxxx
View file

@ -6,10 +6,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-main.c board.c
endif
ifdef UIP_CONF_IPV6
CFLAGS += -DWITH_UIP6=1
endif
CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(CONTIKI_TARGET_MAIN)
MCU=STM32W108
@ -21,6 +17,6 @@ ifeq ($(HOST_OS),Windows)
SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
endif
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 \
core/net/rpl core/net/rime core/net/mac core/net/mac/contikimac \
MODULES+=core/net \
core/net/mac core/net/mac/contikimac \
core/net/llsec

9
platform/mbxxx/contiki-conf.h
View file

@ -115,7 +115,7 @@
#define RPL_CONF_MAX_DAG_PER_INSTANCE 1
#define PROCESS_CONF_NUMEVENTS 16
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
@ -135,10 +135,9 @@
#endif /* WITH_COAP */
#define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -161,12 +160,12 @@
#define SICSLOWPAN_CONF_MAXAGE 2
#endif /* SICSLOWPAN_CONF_MAXAGE */
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H

4
platform/mbxxx/contiki-init-net.c
View file

@ -46,7 +46,7 @@
#include "contiki-net.h"
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define DEBUG 1
#if DEBUG
@ -136,5 +136,5 @@ void set_net_address(void)
#endif /* FIXED_GLOBAL_ADDRESS */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/** @} */

14
platform/mbxxx/contiki-main.c
View file

@ -72,9 +72,9 @@
#include "net/rime/rime.h"
#include "net/ip/uip.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define DEBUG 1
#if DEBUG
@ -89,7 +89,7 @@
#endif
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
PROCINIT(&tcpip_process, &sensors_process);
#else
PROCINIT(&sensors_process);
@ -121,11 +121,11 @@ set_rime_addr(void)
}
}
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &eui64, sizeof(uip_lladdr.addr));
#endif
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
linkaddr_set_node_addr((linkaddr_t *)&eui64);
#else
linkaddr_set_node_addr((linkaddr_t *)&eui64.u8[8 - LINKADDR_SIZE]);
@ -207,7 +207,7 @@ main(void)
ST_RadioSetEdCcaThreshold(DEFAULT_RADIO_CCA_THRESHOLD);
autostart_start(autostart_processes);
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
printf("Tentative link-local IPv6 address ");
{
uip_ds6_addr_t *lladdr;
@ -235,7 +235,7 @@ main(void)
printf("%02x%02x\n",
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
watchdog_start();

4
platform/micaz/Makefile.micaz
View file

@ -45,6 +45,6 @@ ifneq ($(strip $(HAVE_PRGBOARD_FILE)), )
include $(PRGBOARD_FILE)
endif
MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/rime \
core/net/mac core/net/rpl core/net/mac/cxmac \
MODULES += core/net \
core/net/mac core/net/mac/cxmac core/net/mac/sicslowmac \
core/net/llsec dev/cc2420

24
platform/micaz/contiki-conf.h
View file

@ -48,10 +48,10 @@
#include "platform-conf.h"
#if UIP_CONF_IPV6
#define WITH_UIP6 1
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_WITH_IPV6 1
#endif
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
//#define NETSTACK_CONF_MAC csma_driver
@ -65,7 +65,7 @@
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define CXMAC_CONF_ANNOUNCEMENTS 0
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
@ -86,7 +86,7 @@
#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 32
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -115,7 +115,7 @@
#define PROCESS_CONF_NUMEVENTS 8
#define PROCESS_CONF_STATS 1
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -123,20 +123,18 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 0
#define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 5
#define UIP_CONF_MAX_ROUTES 5
#define RPL_CONF_MAX_PARENTS 4
#define NBR_TABLE_CONF_MAX_NEIGHBORS 8
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -156,17 +154,17 @@
#endif /* SICSLOWPAN_CONF_FRAG */
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 128
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1
#if !WITH_UIP && !WITH_UIP6
#if !NETSTACK_CONF_WITH_IPV4 && !NETSTACK_CONF_WITH_IPV6
#define QUEUEBUF_CONF_NUM 8
#else
#define QUEUEBUF_CONF_NUM 4
#define QUEUEBUF_CONF_NUM 2
#endif
#define TIMESYNCH_CONF_ENABLED 1

4
platform/micaz/contiki-micaz-main.c
View file

@ -63,12 +63,12 @@ init_usart(void)
rs232_init(RS232_PORT_0, USART_BAUD_115200,
USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
#if WITH_UIP || WITH_UIP6
#if NETSTACK_CONF_WITH_IPV4 || NETSTACK_CONF_WITH_IPV6
// slip_arch_init(USART_BAUD_115200);
rs232_redirect_stdout(RS232_PORT_0);
#else
rs232_redirect_stdout(RS232_PORT_0);
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 || NETSTACK_CONF_WITH_IPV6*/
}
/*---------------------------------------------------------------------------*/

24
platform/micaz/init-net.c
View file

@ -54,11 +54,11 @@
#include "dev/ds2401.h"
#include "sys/node-id.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h"
@ -70,7 +70,7 @@ static struct uip_fw_netif meshif =
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
@ -82,7 +82,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, ds2401_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -103,7 +103,7 @@ set_rime_addr(void)
}
/*--------------------------------------------------------------------------*/
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -118,7 +118,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
void
init_net(void)
@ -141,7 +141,7 @@ init_net(void)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, ds2401_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
@ -188,7 +188,7 @@ init_net(void)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -199,10 +199,10 @@ init_net(void)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
uip_ipaddr_t hostaddr, netmask;
uip_init();
@ -236,7 +236,7 @@ init_net(void)
uip_over_mesh_init(UIP_OVER_MESH_CHANNEL);
printf_P(PSTR("uIP started with IP address %d.%d.%d.%d\n"),
uip_ipaddr_to_quad(&hostaddr));
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */

2
platform/minimal-net/Makefile.minimal-net
View file

@ -29,4 +29,4 @@ endif
CONTIKI_CPU=$(CONTIKI)/cpu/native
include $(CONTIKI)/cpu/native/Makefile.native
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime
MODULES+=core/net

7
platform/minimal-net/contiki-conf.h
View file

@ -57,7 +57,7 @@ typedef int32_t s32_t;
typedef unsigned short uip_stats_t;
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* The Windows build uses wpcap to connect to a host interface. It finds the interface by scanning for
* an address, which can be specified here and overridden with the command line.
* An ip4 or ip6 address can be used; this allows turning off the ip4 protocol on the interface.
@ -89,7 +89,6 @@ typedef unsigned short uip_stats_t;
#define WEBSERVER_CONF_STATUSPAGE 1
/* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */
//#define UIP_CONF_IPV6_RPL 0
//#define RPL_BORDER_ROUTER 0
#endif
@ -155,7 +154,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_IPV6_QUEUE_PKT 1
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 1
@ -169,7 +168,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_ADDR_NBU 10
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
typedef unsigned long clock_time_t;
#define CLOCK_CONF_SECOND 1000

24
platform/minimal-net/contiki-main.c
View file

@ -54,9 +54,17 @@
#endif /* __CYGWIN__ */
#ifdef __CYGWIN__
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &tcpip_process, &wpcap_process, &serial_line_process);
#else
PROCINIT(&etimer_process, &wpcap_process, &serial_line_process);
#endif
#else /* __CYGWIN__ */
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &tapdev_process, &tcpip_process, &serial_line_process);
#else
PROCINIT(&etimer_process, &tapdev_process, &serial_line_process);
#endif
#endif /* __CYGWIN__ */
#if RPL_BORDER_ROUTER
@ -135,7 +143,7 @@ PROCESS_THREAD(border_router_process, ev, data)
}
#endif /* RPL_BORDER_ROUTER */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/*---------------------------------------------------------------------------*/
static void
sprint_ip6(uip_ip6addr_t addr)
@ -174,7 +182,7 @@ sprint_ip6(uip_ip6addr_t addr)
*result=0;
printf("%s", thestring);
}
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/*---------------------------------------------------------------------------*/
int contiki_argc = 0;
char **contiki_argv;
@ -198,7 +206,7 @@ main(int argc, char **argv)
#endif
clock_init();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* A hard coded address overrides the stack default MAC address to
allow multiple instances. uip6.c defines it as
{0x00,0x06,0x98,0x00,0x02,0x32} giving an ipv6 address of
@ -229,7 +237,7 @@ main(int argc, char **argv)
}
}
#endif /* HARD_CODED_ADDRESS */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
process_init();
/* procinit_init initializes RPL which sets a ctimer for the first DIS */
@ -248,7 +256,7 @@ main(int argc, char **argv)
autostart_start(autostart_processes);
/* Set default IP addresses if not specified */
#if !UIP_CONF_IPV6
#if !NETSTACK_CONF_WITH_IPV6
{
uip_ipaddr_t addr;
@ -273,7 +281,7 @@ main(int argc, char **argv)
}
printf("Def. Router: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#if !UIP_CONF_IPV6_RPL
{
@ -305,7 +313,7 @@ main(int argc, char **argv)
}
#endif /* !UIP_CONF_IPV6_RPL */
#endif /* !UIP_CONF_IPV6 */
#endif /* !NETSTACK_CONF_WITH_IPV6 */
// procinit_init();
// autostart_start(autostart_processes);
@ -315,7 +323,7 @@ main(int argc, char **argv)
printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING);
#if UIP_CONF_IPV6 && !RPL_BORDER_ROUTER /* Border router process prints addresses later */
#if NETSTACK_CONF_WITH_IPV6 && !RPL_BORDER_ROUTER /* Border router process prints addresses later */
{
int i = 0;
int interface_count = 0;

9
platform/native/Makefile.native
View file

@ -6,10 +6,6 @@ ifeq ($(HOST_OS),Darwin)
AROPTS = rc
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
CONTIKI_TARGET_DIRS = . dev ctk
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
@ -23,7 +19,7 @@ TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
else
CONTIKI_TARGET_SOURCEFILES += tapdev-drv.c
#math
ifneq ($(UIP_CONF_IPV6),1)
ifneq ($(CONTIKI_WITH_IPV6),1)
CONTIKI_TARGET_SOURCEFILES += tapdev.c
else
CONTIKI_TARGET_SOURCEFILES += tapdev6.c
@ -46,5 +42,4 @@ CURSES_LIBS ?= -lncurses
TARGET_LIBFILES += $(CURSES_LIBS)
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime \
core/net/mac core/net/rpl core/ctk core/net/llsec
MODULES+=core/net core/net/mac core/ctk core/net/llsec

7
platform/native/contiki-conf.h
View file

@ -79,7 +79,7 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -102,9 +102,6 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0
#define SICSLOWPAN_CONF_COMPRESSION_HC1 1
@ -165,7 +162,7 @@ typedef unsigned short uip_stats_t;
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include <ctype.h>
#define ctk_arch_isprint isprint

12
platform/native/contiki-main.c
View file

@ -66,9 +66,9 @@
#include "dev/pir-sensor.h"
#include "dev/vib-sensor.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
@ -145,7 +145,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -173,7 +173,7 @@ char **contiki_argv;
int
main(int argc, char **argv)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#if UIP_CONF_IPV6_RPL
printf(CONTIKI_VERSION_STRING " started with IPV6, RPL\n");
#else
@ -213,7 +213,7 @@ main(int argc, char **argv)
netstack_init();
printf("MAC %s RDC %s NETWORK %s\n", NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name);
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
queuebuf_init();
memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr));
@ -236,7 +236,7 @@ main(int argc, char **argv)
printf("%02x%02x\n", lladdr->ipaddr.u8[14], lladdr->ipaddr.u8[15]);
}
#else
#elif NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif

7
platform/seedeye/Makefile.seedeye
View file

@ -6,10 +6,6 @@ ifdef SEEDEYE_ID
CFLAGS += -DSEEDEYE_ID=${SEEDEYE_ID}
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
CONTIKI_TARGET_DIRS = . dev dev/mrf24j40 apps net
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
@ -63,3 +59,6 @@ CONTIKI_TARGET_SOURCEFILES += $(CONTIKI_CORE_SOURCEFILES)
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
include $(CONTIKI)/cpu/pic32/Makefile.pic32
MODULES += core/net core/net/mac core/net/rime core/net/llsec

9
platform/seedeye/contiki-conf.h
View file

@ -69,7 +69,7 @@ typedef uint32_t rtimer_clock_t;
#define ENERGEST_CONF_ON 1
#endif /* ENERGEST_CONF_ON */
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define NETSTACK_CONF_FRAMER framer_802154
#define NETSTACK_CONF_MAC nullmac_driver
@ -87,14 +87,11 @@ typedef uint32_t rtimer_clock_t;
#define RDC_CONF_HARDWARE_CSMA 1
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* IPv6 configuration options */
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define NBR_TABLE_CONF_MAX_NEIGHBORS 20 /* number of neighbors */
#define UIP_CONF_DS6_ROUTE_NBU 20 /* number of routes */
#define UIP_CONF_ND6_SEND_RA 0

6
platform/seedeye/init-net.c
View file

@ -73,7 +73,7 @@ init_net(uint8_t node_id)
uint16_t shortaddr;
uint64_t longaddr;
linkaddr_t addr;
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
uip_ds6_addr_t *lladdr;
uip_ipaddr_t ipaddr;
#endif
@ -135,7 +135,7 @@ init_net(uint8_t node_id)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 :
NETSTACK_RDC.channel_check_interval()), RF_CHANNEL);
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#if LINKADDR_CONF_SIZE == 2
memset(&uip_lladdr.addr, 0, sizeof(uip_lladdr.addr));
@ -146,7 +146,9 @@ init_net(uint8_t node_id)
memcpy(&uip_lladdr.addr, &longaddr, sizeof(uip_lladdr.addr));
#endif
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
lladdr = uip_ds6_get_link_local(-1);

4
platform/sensinode/Makefile.sensinode
View file

@ -46,7 +46,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.sensinode
ifeq ($(UIP_CONF_IPV6),1)
ifeq ($(CONTIKI_WITH_IPV6),1)
ifeq ($(OFFSET_FIRMWARE),1)
CFLAGS += -DDISCO_ENABLED=1
CONTIKI_TARGET_SOURCEFILES += disco.c
@ -88,5 +88,5 @@ include $(CONTIKI)/cpu/cc2430/Makefile.cc2430
contiki-$(TARGET).a:# $(addprefix $(OBJECTDIR)/,symbols.rel)
MODULES += core/net/ipv6 core/net/ip core/net/rime core/net core/net/mac core/net/rpl \
MODULES += core/net core/net/mac \
core/net/llsec

14
platform/sensinode/contiki-conf.h
View file

@ -146,11 +146,11 @@
/* Sensinode-Specific Tools and APPs */
/* Viztool on by default for IPv6 builds */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#ifndef VIZTOOL_CONF_ON
#define VIZTOOL_CONF_ON 1
#endif /* VIZTOOL_CONF_ON */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* BatMon off by default unless we build with APPS += batmon */
#ifndef BATMON_CONF_ON
@ -159,11 +159,11 @@
/* Network Stack */
#ifndef NETSTACK_CONF_NETWORK
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#else
#define NETSTACK_CONF_NETWORK rime_driver
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_NETWORK */
#ifndef NETSTACK_CONF_MAC
@ -201,7 +201,7 @@
#define CC2430_RF_CONF_AUTOACK 1
#endif /* CC2430_CONF_AUTOACK */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* Addresses, Sizes and Interfaces */
/* 8-byte addresses here, 2 otherwise */
#define LINKADDR_CONF_SIZE 8
@ -270,13 +270,13 @@
#define QUEUEBUF_CONF_NUM 6
#endif
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define QUEUEBUF_CONF_NUM 8
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER

4
platform/sensinode/contiki-sensinode-main.c
View file

@ -245,7 +245,7 @@ main(void)
sensinode_sensors_activate();
#endif
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr));
queuebuf_init();
process_start(&tcpip_process, NULL);
@ -267,7 +267,7 @@ main(void)
uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
}
#endif /* UIP_CONF_IPV6_RPL */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/*
* Acknowledge the UART1 RX interrupt

6
platform/sensinode/uip-debug.c
View file

@ -43,7 +43,7 @@
void
uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
{
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
uint16_t a;
unsigned int i;
int f;
@ -63,9 +63,9 @@ uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
puthex(a & 0xFF);
}
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
PRINTA("%u.%u.%u.%u", addr->u8[0], addr->u8[1], addr->u8[2], addr->u8[3]);
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
}
/*---------------------------------------------------------------------------*/
void

4
platform/sky/Makefile.common
View file

@ -10,10 +10,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-sky-main.c
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
ifdef IAR
CFLAGS += -D__MSP430F1611__=1 -e --vla -Ohz --multiplier=16s --core=430 --double=32
CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430fn.h" $(CFLAGSWERROR)

4
platform/sky/Makefile.sky
View file

@ -10,8 +10,8 @@ endif
include $(CONTIKI)/platform/sky/Makefile.common
MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac \
core/net core/net/ip core/net/rpl \
MODULES += core/net/mac \
core/net \
core/net/mac/contikimac core/net/mac/cxmac \
core/net/llsec core/net/llsec/noncoresec \
dev/cc2420 dev/sht11 dev/ds2411

21
platform/sky/contiki-conf.h
View file

@ -26,7 +26,11 @@
#endif /* NETSTACK_CONF_RADIO */
#ifndef NETSTACK_CONF_FRAMER
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_FRAMER framer_802154
#else /* NETSTACK_CONF_WITH_IPV6 */
#define NETSTACK_CONF_FRAMER contikimac_framer
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* NETSTACK_CONF_FRAMER */
#ifndef CC2420_CONF_AUTOACK
@ -39,7 +43,7 @@
#define XMAC_CONF_COMPOWER 1
#define CXMAC_CONF_COMPOWER 1
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
@ -56,7 +60,7 @@
#define QUEUEBUF_CONF_NUM 8
#endif
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
@ -85,7 +89,7 @@
#define CC2420_CONF_SFD_TIMESTAMPS 1
#endif /* TIMESYNCH_CONF_ENABLED */
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -131,7 +135,7 @@
#define PROCESS_CONF_STATS 1
/*#define PROCESS_CONF_FASTPOLL 4*/
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -139,9 +143,6 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
@ -156,7 +157,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#ifndef UIP_CONF_IPV6_QUEUE_PKT
#define UIP_CONF_IPV6_QUEUE_PKT 0
#endif /* UIP_CONF_IPV6_QUEUE_PKT */
@ -183,10 +184,10 @@
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

48
platform/sky/contiki-sky-main.c
View file

@ -43,9 +43,9 @@
#include "net/netstack.h"
#include "net/mac/frame802154.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
@ -72,11 +72,11 @@ static struct timer mgt_timer;
#endif
extern int msp430_dco_required;
#ifndef WITH_UIP
#define WITH_UIP 0
#ifndef NETSTACK_CONF_WITH_IPV4
#define NETSTACK_CONF_WITH_IPV4 0
#endif
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/ipv4/uip-fw-drv.h"
@ -86,12 +86,12 @@ static struct uip_fw_netif slipif =
static struct uip_fw_netif meshif =
{UIP_FW_NETIF(172,16,0,0, 255,255,0,0, uip_over_mesh_send)};
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#ifdef EXPERIMENT_SETUP
#include "experiment-setup.h"
@ -138,7 +138,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, ds2411_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -172,7 +172,7 @@ print_processes(struct process * const processes[])
}
#endif /* !PROCESS_CONF_NO_PROCESS_NAMES */
/*--------------------------------------------------------------------------*/
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -187,7 +187,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
static void
start_autostart_processes()
@ -198,7 +198,7 @@ start_autostart_processes()
autostart_start(autostart_processes);
}
/*---------------------------------------------------------------------------*/
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
static void
start_uip6()
{
@ -235,16 +235,16 @@ start_uip6()
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
}
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/*---------------------------------------------------------------------------*/
static void
start_network_layer()
{
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
start_uip6();
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
start_autostart_processes();
/* To support link layer security in combination with WITH_UIP and
/* To support link layer security in combination with NETSTACK_CONF_WITH_IPV4 and
* TIMESYNCH_CONF_ENABLED further things may need to be moved here */
}
/*---------------------------------------------------------------------------*/
@ -315,9 +315,9 @@ main(int argc, char **argv)
ctimer_init();
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
slip_arch_init(BAUD2UBR(115200));
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
init_platform();
@ -350,7 +350,7 @@ main(int argc, char **argv)
ds2411_id[0], ds2411_id[1], ds2411_id[2], ds2411_id[3],
ds2411_id[4], ds2411_id[5], ds2411_id[6], ds2411_id[7]);*/
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, ds2411_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
@ -368,7 +368,7 @@ main(int argc, char **argv)
CC2420_CONF_CHANNEL,
CC2420_CONF_CCA_THRESH);
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -379,9 +379,9 @@ main(int argc, char **argv)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !WITH_UIP && !WITH_UIP6
#if !NETSTACK_CONF_WITH_IPV4 && !NETSTACK_CONF_WITH_IPV6
uart1_set_input(serial_line_input_byte);
serial_line_init();
#endif
@ -393,7 +393,7 @@ main(int argc, char **argv)
timesynch_set_authority_level((linkaddr_node_addr.u8[0] << 4) + 16);
#endif /* TIMESYNCH_CONF_ENABLED */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
process_start(&uip_fw_process, NULL); /* Start IP output */
process_start(&slip_process, NULL);
@ -420,7 +420,7 @@ main(int argc, char **argv)
PRINTF("uIP started with IP address %d.%d.%d.%d\n",
uip_ipaddr_to_quad(&hostaddr));
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
watchdog_start();

2
platform/stm32test/contiki-conf.h
View file

@ -6,7 +6,7 @@
#define CCIF
#define CLIF
#define WITH_UIP 1
#define NETSTACK_CONF_WITH_IPV4 1
#define WITH_ASCII 1
#define CLOCK_CONF_SECOND 100

2
platform/win32/Makefile.win32
View file

@ -41,7 +41,7 @@ CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c cfs-win32-dir.c ctk-console.
CONTIKI_SOURCEFILES += $(CTK) cfs-posix.c ctk-conio.c wpcap.c wpcap-drv.c \
$(CONTIKI_TARGET_SOURCEFILES)
MODULES += core/ctk core/net/ip core/net/ipv4 core/net/ipv6
MODULES += core/ctk
# Define the CPU directory

2
platform/win32/contiki-conf.h
View file

@ -64,7 +64,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_TCP_SPLIT 1
#define UIP_CONF_LOGGING 1
#define UIP_CONF_UDP_CHECKSUMS 1
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_IP_FORWARD 0
#define NBR_TABLE_CONF_MAX_NEIGHBORS 100
#define UIP_CONF_DS6_DEFRT_NBU 2

4
platform/win32/contiki-main.c
View file

@ -124,7 +124,7 @@ main(int argc, char **argv)
autostart_start(autostart_processes);
#if !UIP_CONF_IPV6
#if !NETSTACK_CONF_WITH_IPV6
{
uip_ipaddr_t addr;
uip_ipaddr(&addr, 192,168,0,111);
@ -144,7 +144,7 @@ main(int argc, char **argv)
log_message("DNS Server: ", inet_ntoa(*(struct in_addr*)&addr));
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#if !UIP_CONF_IPV6_RPL
#ifdef HARD_CODED_ADDRESS

8
platform/wismote/Makefile.wismote
View file

@ -18,10 +18,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-wismote-main.c
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
ifdef IAR
CFLAGS += -D__MSP430F5437__=1 -e --vla -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X --double=32
else
@ -54,7 +50,7 @@ contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
%.upload-clean: %.hex
msp430flasher -n msp430x5437 -w $< -v -z [VCC]
MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/mac \
core/net/rime core/net/mac/contikimac core/net/rpl \
MODULES += core/net core/net/mac \
core/net/mac/contikimac \
core/net/llsec \
dev/cc2520 dev/sht11

17
platform/wismote/contiki-conf.h
View file

@ -33,7 +33,7 @@
#define NULLRDC_CONF_802154_AUTOACK 1
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
@ -50,7 +50,7 @@
#define QUEUEBUF_CONF_NUM 8
#endif
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
@ -83,7 +83,7 @@
#define CC2520_CONF_SFD_TIMESTAMPS 1
#endif /* TIMESYNCH_CONF_ENABLED */
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -119,7 +119,7 @@
#define PROCESS_CONF_STATS 1
/*#define PROCESS_CONF_FASTPOLL 4*/
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -127,9 +127,6 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
@ -143,7 +140,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#ifndef UIP_CONF_IPV6_QUEUE_PKT
#define UIP_CONF_IPV6_QUEUE_PKT 0
#endif /* UIP_CONF_IPV6_QUEUE_PKT */
@ -170,10 +167,10 @@
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

38
platform/wismote/contiki-wismote-main.c
View file

@ -44,9 +44,9 @@
#include "net/netstack.h"
#include "net/mac/frame802154.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
@ -66,11 +66,11 @@
extern const struct uip_router UIP_ROUTER_MODULE;
#endif /* UIP_CONF_ROUTER */
#ifndef WITH_UIP
#define WITH_UIP 0
#ifndef NETSTACK_CONF_WITH_IPV4
#define NETSTACK_CONF_WITH_IPV4 0
#endif
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h"
@ -80,12 +80,12 @@ static struct uip_fw_netif slipif =
static struct uip_fw_netif meshif =
{UIP_FW_NETIF(172,16,0,0, 255,255,0,0, uip_over_mesh_send)};
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#ifdef EXPERIMENT_SETUP
#include "experiment-setup.h"
@ -133,7 +133,7 @@ set_rime_addr(void)
memset(&n_addr, 0, sizeof(linkaddr_t));
// Set node address
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
//memcpy(addr.u8, ds2411_id, sizeof(addr.u8));
n_addr.u8[7] = node_id & 0xff;
n_addr.u8[6] = node_id >> 8;
@ -172,7 +172,7 @@ print_processes(struct process * const processes[])
}
#endif /* !PROCESS_CONF_NO_PROCESS_NAMES */
/*--------------------------------------------------------------------------*/
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -187,7 +187,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
int
main(int argc, char **argv)
@ -206,9 +206,9 @@ main(int argc, char **argv)
uart1_init(115200); /* Must come before first printf */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
slip_arch_init(115200);
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
clock_wait(1);
@ -283,7 +283,7 @@ main(int argc, char **argv)
printf("Node id is not set.\n");
}
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* memcpy(&uip_lladdr.addr, ds2411_id, sizeof(uip_lladdr.addr)); */
memcpy(&uip_lladdr.addr, linkaddr_node_addr.u8,
UIP_LLADDR_LEN > LINKADDR_SIZE ? LINKADDR_SIZE : UIP_LLADDR_LEN);
@ -333,7 +333,7 @@ main(int argc, char **argv)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -344,9 +344,9 @@ main(int argc, char **argv)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
RF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !WITH_UIP && !WITH_UIP6
#if !NETSTACK_CONF_WITH_IPV4 && !NETSTACK_CONF_WITH_IPV6
uart1_set_input(serial_line_input_byte);
serial_line_init();
#endif
@ -358,7 +358,7 @@ main(int argc, char **argv)
timesynch_set_authority_level((linkaddr_node_addr.u8[0] << 4) + 16);
#endif /* TIMESYNCH_CONF_ENABLED */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
process_start(&uip_fw_process, NULL); /* Start IP output */
process_start(&slip_process, NULL);
@ -385,7 +385,7 @@ main(int argc, char **argv)
printf("uIP started with IP address %d.%d.%d.%d\n",
uip_ipaddr_to_quad(&hostaddr));
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
energest_init();
ENERGEST_ON(ENERGEST_TYPE_CPU);

4
platform/z1/Makefile.common
View file

@ -26,10 +26,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-z1-main.c
endif
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DWITH_UIP6=1
endif
ifdef nodemac
CFLAGS += -DMACID=$(nodemac)
endif

4
platform/z1/Makefile.z1
View file

@ -9,7 +9,7 @@ ifeq ($(ZOLERTIA_Z1SP),1)
include $(CONTIKI)/platform/z1/Makefile.z1sp
endif
MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/rpl \
core/net/rime core/net/mac core/net/mac/contikimac \
MODULES += core/net \
core/net/mac core/net/mac/contikimac \
core/net/llsec \
dev/cc2420 dev/sht11

17
platform/z1/contiki-conf.h
View file

@ -37,7 +37,7 @@
#define XMAC_CONF_COMPOWER 1
#define CXMAC_CONF_COMPOWER 1
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
/* Network setup for IPv6 */
#define NETSTACK_CONF_NETWORK sicslowpan_driver
@ -61,7 +61,7 @@
#define QUEUEBUF_CONF_NUM 4
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
/* Network setup for non-IPv6 (rime). */
@ -69,7 +69,7 @@
#define NETSTACK_CONF_MAC csma_driver
#define NETSTACK_CONF_RDC contikimac_driver
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define NETSTACK_CONF_FRAMER framer_802154
#define NETSTACK_CONF_FRAMER contikimac_framer
#define CC2420_CONF_AUTOACK 1
@ -87,7 +87,7 @@
#define QUEUEBUF_CONF_NUM 8
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define PACKETBUF_CONF_ATTRS_INLINE 1
@ -130,7 +130,7 @@
#define UART0_CONF_TX_WITH_INTERRUPT 0 // So far, printfs without interrupt.
#ifdef WITH_UIP6
#ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8
@ -138,7 +138,6 @@
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
/* Handle 10 neighbors */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 15
@ -149,7 +148,7 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
#define UIP_CONF_IPV6 1
#define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0
@ -169,10 +168,10 @@
#endif /* SICSLOWPAN_CONF_FRAG */
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1
#define UIP_CONF_BUFFER_SIZE 108
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1

38
platform/z1/contiki-z1-main.c
View file

@ -47,9 +47,9 @@
#include "dev/adxl345.h"
#include "sys/clock.h"
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
@ -70,11 +70,11 @@ extern unsigned char node_mac[8];
static struct timer mgt_timer;
#endif
#ifndef WITH_UIP
#define WITH_UIP 0
#ifndef NETSTACK_CONF_WITH_IPV4
#define NETSTACK_CONF_WITH_IPV4 0
#endif
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h"
@ -84,12 +84,12 @@ static struct uip_fw_netif slipif =
static struct uip_fw_netif meshif =
{ UIP_FW_NETIF(172, 16, 0, 0, 255, 255, 0, 0, uip_over_mesh_send) };
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
#ifdef EXPERIMENT_SETUP
#include "experiment-setup.h"
@ -140,7 +140,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, node_mac, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -172,7 +172,7 @@ print_processes(struct process *const processes[])
putchar('\n');
}
/*--------------------------------------------------------------------------*/
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
static void
set_gateway(void)
{
@ -187,7 +187,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
/*---------------------------------------------------------------------------*/
int
main(int argc, char **argv)
@ -203,9 +203,9 @@ main(int argc, char **argv)
clock_wait(100);
uart0_init(BAUD2UBR(115200)); /* Must come before first printf */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
slip_arch_init(BAUD2UBR(115200));
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
xmem_init();
@ -308,7 +308,7 @@ main(int argc, char **argv)
PRINTF("Node id not set\n");
}
#if WITH_UIP6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, node_mac, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
@ -356,7 +356,7 @@ main(int argc, char **argv)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* WITH_UIP6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -367,9 +367,9 @@ main(int argc, char **argv)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 :
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !WITH_UIP && !WITH_UIP6
#if !NETSTACK_CONF_WITH_IPV4 && !NETSTACK_CONF_WITH_IPV6
uart0_set_input(serial_line_input_byte);
serial_line_init();
#endif
@ -381,7 +381,7 @@ main(int argc, char **argv)
timesynch_set_authority_level(linkaddr_node_addr.u8[0]);
#endif /* TIMESYNCH_CONF_ENABLED */
#if WITH_UIP
#if NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
process_start(&uip_fw_process, NULL); /* Start IP output */
process_start(&slip_process, NULL);
@ -408,7 +408,7 @@ main(int argc, char **argv)
printf("uIP started with IP address %d.%d.%d.%d\n",
uip_ipaddr_to_quad(&hostaddr));
}
#endif /* WITH_UIP */
#endif /* NETSTACK_CONF_WITH_IPV4 */
energest_init();
ENERGEST_ON(ENERGEST_TYPE_CPU);