From f03600d4e32b2fc1354159ec91f460f68a93f236 Mon Sep 17 00:00:00 2001
From: dak664 <dak664>
Date: Thu, 18 Mar 2010 14:36:00 +0000
Subject: [PATCH] update to uip-ds6.c

---
 platform/avr-ravenusb/contiki-raven-main.c |  5 -----
 platform/avr-ravenusb/fakeuip.c            | 12 +++++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/platform/avr-ravenusb/contiki-raven-main.c b/platform/avr-ravenusb/contiki-raven-main.c
index 7cf62b7d1..52cb65d97 100644
--- a/platform/avr-ravenusb/contiki-raven-main.c
+++ b/platform/avr-ravenusb/contiki-raven-main.c
@@ -50,11 +50,6 @@
 #if RF230BB           //radio driver using contiki core mac
 #include "radio/rf230bb/rf230bb.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
 #include <stdbool.h>
 #include "mac.h"
diff --git a/platform/avr-ravenusb/fakeuip.c b/platform/avr-ravenusb/fakeuip.c
index 932a27785..c82a9ed52 100644
--- a/platform/avr-ravenusb/fakeuip.c
+++ b/platform/avr-ravenusb/fakeuip.c
@@ -3,7 +3,7 @@
  * compile. Allows you to save needing to compile all of uIP in just
  * to get a few things */
 
-
+ 
 #include "uip.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);}
 
 
+#if THEOLDWAY
 /********** UIP_NETIF.c **********/
-
 void
 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
      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);
   ipaddr->u8[8] ^= 0x02;
 #else
+#error cannot build interface address when UIP_LLADDR_LEN is not 6 or 8
   /*
     UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER");
     UIP_LOG("THE STACK IS GOING TO SHUT DOWN");
     UIP_LOG("THE HOST WILL BE UNREACHABLE");
+    exit(-1);
   */
-  exit(-1);
 #endif
 }