From 987906be97215dc4b94967748540f818840f24e9 Mon Sep 17 00:00:00 2001
From: David Kopf <dak664@embarqmail.com>
Date: Wed, 1 Feb 2012 14:16:39 -0700
Subject: [PATCH] rf230bb updates: involves setting the 801.15.4 pending bit,
 0x800000 cpu clock, and a jtag reset bugfix

---
 cpu/avr/radio/rf230bb/at86rf230_registermap.h |  4 ++-
 cpu/avr/radio/rf230bb/hal.h                   |  5 +++
 cpu/avr/radio/rf230bb/rf230bb.c               | 32 ++++++++++---------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/cpu/avr/radio/rf230bb/at86rf230_registermap.h b/cpu/avr/radio/rf230bb/at86rf230_registermap.h
index fbadf2813..4a0fd8752 100644
--- a/cpu/avr/radio/rf230bb/at86rf230_registermap.h
+++ b/cpu/avr/radio/rf230bb/at86rf230_registermap.h
@@ -345,7 +345,9 @@
 #define RG_CSMA_BE                      0x2f
 /** Access parameters for sub-register MIN_BE in register @ref RG_CSMA_SEED_1 */
 #define SR_MIN_BE                    0x2e, 0xc0, 6
-#define SR_reserved_2e_2             0x2e, 0x30, 4
+/** Access parameters for AACK_SET_PD bit in register @ref RG_CSMA_SEED_1 */
+#define SR_AACK_SET_PD               0x2e, 0x20, 5
+//#define SR_reserved_2e_2             0x2e, 0x30, 4
 /** Access parameters for sub-register I_AM_COORD in register @ref RG_CSMA_SEED_1 */
 #define SR_I_AM_COORD                0x2e, 0x08, 3
 /** Access parameters for sub-register CSMA_SEED_1 in register @ref RG_CSMA_SEED_1 */
diff --git a/cpu/avr/radio/rf230bb/hal.h b/cpu/avr/radio/rf230bb/hal.h
index c50b9a513..1c0c77be7 100644
--- a/cpu/avr/radio/rf230bb/hal.h
+++ b/cpu/avr/radio/rf230bb/hal.h
@@ -410,6 +410,11 @@
     #define HAL_TCCR1B_CONFIG ( ( 1 << ICES1 ) | ( 1 << CS11 ) | ( 1 << CS10 ) )
     #define HAL_US_PER_SYMBOL ( 2 )
     #define HAL_SYMBOL_MASK   ( 0x7FFFffff )
+//#elif ( F_CPU == 7953408UL )
+#elif ( F_CPU == 7954432UL )
+    #define HAL_TCCR1B_CONFIG ( ( 1 << ICES1 ) | ( 1 << CS11 ) | ( 1 << CS10 ) )
+    #define HAL_US_PER_SYMBOL ( 2 )
+    #define HAL_SYMBOL_MASK   ( 0x7FFFffff )
 #elif ( F_CPU == 4000000UL )
     #define HAL_TCCR1B_CONFIG ( ( 1 << ICES1 ) | ( 1 << CS11 ) | ( 1 << CS10 ) )
     #define HAL_US_PER_SYMBOL ( 1 )
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index 503ac1fa2..5ec848a9c 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -594,6 +594,11 @@ set_txpower(uint8_t power)
     hal_subregister_write(SR_TX_PWR, power);
   }
 }
+void rf230_setpendingbit(uint8_t value)
+{
+  hal_subregister_write(SR_AACK_SET_PD, value);
+}
+#if 0
 /*----------------------------------------------------------------------------*/
 /**
     \brief Calibrate the internal RC oscillator
@@ -609,7 +614,6 @@ set_txpower(uint8_t power)
 void
 calibrate_rc_osc_32k(void)
 {
-#if 0
 
     /* Calibrate RC Oscillator: The calibration routine is done by clocking TIMER2
      * from the external 32kHz crystal while running an internal timer simultaneously.
@@ -699,31 +703,18 @@ calibrate_rc_osc_32k(void)
     //    PRR0 |= (1 << PRTIM2);/* |(1 << PRTIM1); */
 
     AVR_LEAVE_CRITICAL_REGION();
-#endif
 }
+#endif
 /*---------------------------------------------------------------------------*/
 int
 rf230_init(void)
 {
   uint8_t i;
   DEBUGFLOW('i');
-/* A jtag or brownout reset of the mcu tristates the RF230 control pins while
- * it is in operation, which can result in a mulfunctioning condition when the
- * radio is later re-initialized.
- * This manifests as an incorrectly computed hardware FCS checksum.
- * Setting up the pins before the poweron time delay seems to fix this.
- */
-#if 1  //this works after a brownout or jtag reset
-  /* Initialize Hardware Abstraction Layer */
-  hal_init();
-  /* Wait in case VCC just applied */
-  delay_us(TIME_TO_ENTER_P_ON);
-#else  //this gives FCS errors 5 out of 6 times
   /* Wait in case VCC just applied */
   delay_us(TIME_TO_ENTER_P_ON);
   /* Initialize Hardware Abstraction Layer */
   hal_init();
-#endif
  
   /* Calibrate oscillator */
  // printf_P(PSTR("\nBefore calibration OSCCAL=%x\n"),OSCCAL);
@@ -737,7 +728,18 @@ rf230_init(void)
   /* Do full rf230 Reset */
   hal_set_rst_low();
   hal_set_slptr_low();
+#if 1
+  /* On powerup a TIME_RESET delay is needed here, however on some other MCU reset
+   * (JTAG, WDT, Brownout) the radio may be sleeping. It can enter an uncertain
+   * state (sending wrong hardware FCS for example) unless the full wakeup delay
+   * is done.
+   * Wake time depends on board capacitance; use 2x the nominal delay for safety.
+   * See www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&t=78725
+   */
+  delay_us(2*TIME_SLEEP_TO_TRX_OFF);
+#else
   delay_us(TIME_RESET);
+#endif
   hal_set_rst_high();
 
   /* Force transition to TRX_OFF */