From deb75d3d9746a9e42c90693e57eeb4e8856bd7d9 Mon Sep 17 00:00:00 2001
From: David Kopf <dak664@embarqmail.com>
Date: Tue, 21 Feb 2012 11:14:52 -0500
Subject: [PATCH] Several bugfixes

---
 cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h | 1 +
 cpu/avr/radio/rf230bb/rf230bb.c                   | 3 ---
 platform/avr-ravenusb/contiki-conf.h              | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
index 986001f6d..2a86c547d 100644
--- a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
+++ b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
@@ -81,6 +81,7 @@
 #define SR_CCA_REQUEST         0x08, 0x80, 7
 #define SR_CCA_DONE            0x01, 0x80, 7
 #define SR_CCA_STATUS          0x01, 0x40, 6
+#define SR_AACK_SET_PD         0x2e, 0x20, 5
 
 
 /* RF230 register assignments, for reference */
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index 5ec848a9c..477c561fe 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -855,9 +855,6 @@ rf230_transmit(unsigned short payload_len)
   /* This automatically does the PLL calibrations */
   if (hal_get_slptr()) {
 #if defined(__AVR_ATmega128RFA1__)
-	if (radiowason) DEBUGFLOW('e');
-	radiowason=0;
-//	DEBUGFLOW('j');
 	ENERGEST_ON(ENERGEST_TYPE_LED_RED);
 #if RF230BB_CONF_LEDONPORTE1
     PORTE|=(1<<PE1); //ledon
diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
index e00c99d38..127ef8ac0 100644
--- a/platform/avr-ravenusb/contiki-conf.h
+++ b/platform/avr-ravenusb/contiki-conf.h
@@ -392,7 +392,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
 #define RF230_MAX_TX_POWER 15
 #define RF230_MIN_RX_POWER 30
  */
-
+#define RPL_CONF_ADJUST_LLH_LEN     1
 #define UIP_CONF_ROUTER             1
 #define UIP_CONF_ND6_SEND_RA        0
 #define UIP_CONF_ND6_REACHABLE_TIME 600000