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

Debugged autoconf for ethernet

Browse source
This commit is contained in:
julienabeille 2008-10-14 16:50:11 +00:00
parent 30f545c397
commit 2238f2e7da
5 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/uip-netif.c
View file

@ -246,7 +246,7 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
memcpy(ipaddr->u8 + 8, lladdr, 3); memcpy(ipaddr->u8 + 8, lladdr, 3);
ipaddr->u8[11] = 0xff; ipaddr->u8[11] = 0xff;
ipaddr->u8[12] = 0xfe; ipaddr->u8[12] = 0xfe;
memcpy(ipaddr->u8 + 13, lladdr + 3, 3); memcpy(ipaddr->u8 + 13, (u8_t*)lladdr + 3, 3);
ipaddr->u8[8] ^= 0x02; ipaddr->u8[8] ^= 0x02;
#else #else
UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER"); UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER");

4
cpu/native/net/tapdev6.c
View file

@ -31,7 +31,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: tapdev6.c,v 1.2 2008/10/14 14:54:23 julienabeille Exp $ * $Id: tapdev6.c,v 1.3 2008/10/14 16:50:11 julienabeille Exp $
*/ */
@ -74,7 +74,7 @@ static unsigned long lasttime;
#define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
#define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#define DEBUG 1 #define DEBUG 0
#if DEBUG #if DEBUG
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15])

15
examples/webserver-ipv6/Makefile
View file

@ -1,9 +1,8 @@
all: all: webserver6
make -f Makefile.example TARGET=avr-raven webserver6.elf APPS=webserver
avr-objcopy -O ihex -R .eeprom webserver6.elf webserver6.hex DEFAULT_TARGET=minimal-net
avr-size -C webserver6.elf
clean: UIP_CONF_IPV6=1
make -f Makefile.example TARGET=avr-raven clean
rm symbols.c symbols.h webserver6.elf webserver6.hex CONTIKI = ../..
rm -rf obj_avr-raven include $(CONTIKI)/Makefile.include

8
examples/webserver-ipv6/Makefile.example
View file

@ -1,8 +0,0 @@
all: webserver6
APPS=webserver raven-lcd-interface
DEFAULT_TARGET=minimal-net
UIP_CONF_IPV6=1
CONTIKI = ../..
include $(CONTIKI)/Makefile.include

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

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-conf.h,v 1.7 2008/10/14 10:06:26 julienabeille Exp $ * @(#)$Id: contiki-conf.h,v 1.8 2008/10/14 16:50:11 julienabeille Exp $
*/ */
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
@ -59,8 +59,8 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_LOGGING 0 #define UIP_CONF_LOGGING 0
#define UIP_CONF_UDP_CHECKSUMS 0 #define UIP_CONF_UDP_CHECKSUMS 0
#define UIP_CONF_UDP 0 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 1
#define UIP_CONF_IPV6 1 #define UIP_CONF_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 1 #define UIP_CONF_IPV6_QUEUE_PKT 1
#define UIP_CONF_IPV6_CHECKS 1 #define UIP_CONF_IPV6_CHECKS 1