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

Use siimple ethernet address translation for RF230BB by default.

Browse source 
That gets pings and webserver working again for Vista and W7.
Hopefully it won't break something that already works...
This commit is contained in:
dak664 2010-05-08 17:17:17 +00:00
parent bf3ec8c452
commit 6909f291af
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,10 +52,11 @@
*/ */
//TODO: Should be able to always use this SIMPLE mode, hence can remove the 'complex' mode permanently //TODO: Should be able to always use this SIMPLE mode, hence can remove the 'complex' mode permanently
#if !RF230BB //TODO: RF230BB !SIMPLE works on XP, Ubuntu. SIMPLE works on Vista, W7. Find out why!
#if RF230BB
#define UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS 1 #define UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS 1
#else #else
#define UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS 0 #define UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS 1
#endif #endif
@ -380,9 +381,11 @@ void mac_ethernetToLowpan(uint8_t * ethHeader)
#if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS #if UIP_CONF_SIMPLE_JACKDAW_ADDR_TRANS
/* Simple Address Translation */ /* Simple Address Translation */
#if RF230BB
if(memcmp((uint8_t *)&rndis_ethernet_addr, &(((struct uip_eth_hdr *) ethHeader)->dest.addr[0]), 6) == 0) {
#else
if(memcmp_reverse((uint8_t *)&rndis_ethernet_addr, &(((struct uip_eth_hdr *) ethHeader)->dest.addr[0]), 6) == 0) { if(memcmp_reverse((uint8_t *)&rndis_ethernet_addr, &(((struct uip_eth_hdr *) ethHeader)->dest.addr[0]), 6) == 0) {
#endif
//Addressed to us: make 802.15.4 address from IPv6 Address //Addressed to us: make 802.15.4 address from IPv6 Address
destAddr.addr[0] = UIP_IP_BUF->destipaddr.u8[8] ^ 0x02; destAddr.addr[0] = UIP_IP_BUF->destipaddr.u8[8] ^ 0x02;
destAddr.addr[1] = UIP_IP_BUF->destipaddr.u8[9]; destAddr.addr[1] = UIP_IP_BUF->destipaddr.u8[9];
@ -905,7 +908,9 @@ uint8_t mac_createEthernetAddr(uint8_t * ethernet, uip_lladdr_t * lowpan)
uint8_t mac_createDefaultEthernetAddr(uint8_t * ethernet) uint8_t mac_createDefaultEthernetAddr(uint8_t * ethernet)
{ {
memcpy(ethernet, &rndis_ethernet_addr, 6); memcpy(ethernet, &rndis_ethernet_addr, 6);
#if !RF230BB
byte_reverse(ethernet, 6); byte_reverse(ethernet, 6);
#endif
return 1; return 1;
} }
#endif #endif