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

update to uip-ds6.c

Browse source
This commit is contained in:
dak664 2010-03-18 14:36:00 +00:00
parent cfcb6c6b71
commit f03600d4e3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,11 +50,6 @@
#if RF230BB //radio driver using contiki core mac #if RF230BB //radio driver using contiki core mac
#include "radio/rf230bb/rf230bb.h" #include "radio/rf230bb/rf230bb.h"
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "net/sicslowpan.h"
#include "net/uip-netif.h"
#include "net/mac/lpp.h"
#include "net/mac/sicslowmac.h"
#include "net/mac/cxmac.h"
#else //radio driver using Atmel/Cisco 802.15.4'ish MAC #else //radio driver using Atmel/Cisco 802.15.4'ish MAC
#include <stdbool.h> #include <stdbool.h>
#include "mac.h" #include "mac.h"

12
platform/avr-ravenusb/fakeuip.c
View file

@ -3,7 +3,7 @@
* compile. Allows you to save needing to compile all of uIP in just * compile. Allows you to save needing to compile all of uIP in just
* to get a few things */ * to get a few things */
#include "uip.h" #include "uip.h"
#include <string.h> #include <string.h>
@ -32,10 +32,15 @@ void tcpip_set_outputfunc(u8_t (* f)(uip_lladdr_t *)) {
u16_t htons(u16_t val) { return HTONS(val);} u16_t htons(u16_t val) { return HTONS(val);}
#if THEOLDWAY
/********** UIP_NETIF.c **********/ /********** UIP_NETIF.c **********/
void void
uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
#else
/********** uip-ds6.c ************/
void
uip_ds6_set_addr_iid(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr)
#endif /* THEOLDWAY */
{ {
/* We consider only links with IEEE EUI-64 identifier or /* We consider only links with IEEE EUI-64 identifier or
IEEE 48-bit MAC addresses */ IEEE 48-bit MAC addresses */
@ -49,12 +54,13 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
memcpy(ipaddr->u8 + 13, lladdr + 3, 3); memcpy(ipaddr->u8 + 13, lladdr + 3, 3);
ipaddr->u8[8] ^= 0x02; ipaddr->u8[8] ^= 0x02;
#else #else
#error cannot build interface address when UIP_LLADDR_LEN is not 6 or 8
/* /*
UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER"); UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER");
UIP_LOG("THE STACK IS GOING TO SHUT DOWN"); UIP_LOG("THE STACK IS GOING TO SHUT DOWN");
UIP_LOG("THE HOST WILL BE UNREACHABLE"); UIP_LOG("THE HOST WILL BE UNREACHABLE");
exit(-1);
*/ */
exit(-1);
#endif #endif
} }