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

Fixing more possible out of date files.

Browse source
This commit is contained in:
c_oflynn 2008-10-14 18:37:28 +00:00
parent 15ba03fea5
commit a73ed65dac
7 changed files with 88 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/radio/rf230/at86rf230_registermap.h
View file

@ -1,7 +1,7 @@
/** /**
* @file * @file
* @brief This file contains the register definitions for the AT86RF230. * @brief This file contains the register definitions for the AT86RF230.
* $Id: at86rf230_registermap.h,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: at86rf230_registermap.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
/* Copyright (c) 2008, Swedish Institute of Computer Science /* Copyright (c) 2008, Swedish Institute of Computer Science
All rights reserved. All rights reserved.

4
cpu/avr/radio/rf230/frame.c
View file

@ -39,7 +39,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: frame.c,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: frame.c,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
/* /*
* \brief This file is where the main functions that relate to frame * \brief This file is where the main functions that relate to frame
@ -77,7 +77,7 @@
#include "radio.h" #include "radio.h"
#include "frame.h" #include "frame.h"
//#include "mac_event.h" //#include "mac_event.h"
#include "mac.h" #include "zmac.h"
#include "process.h" #include "process.h"
#include "sicslowmac.h" #include "sicslowmac.h"

24
cpu/avr/radio/rf230/frame.h
View file

@ -49,7 +49,7 @@
* This file converts to and from a structure to a packed 802.15.4 * This file converts to and from a structure to a packed 802.15.4
* frame. * frame.
* *
* $Id: frame.h,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: frame.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
@ -173,28 +173,6 @@ typedef struct{
} frame_create_params_t; } frame_create_params_t;
/**
* \brief 802.15.4 frame structure, including the LQI, RSSI, and frame time
* fields.
*/
/* typedef struct{ */
/* fcf_t fcf; /\**< The FCF of the frame. *\/ */
/* uint8_t seqNum; /\**< The sequence number of the frame. *\/ */
/* uint16_t dest_pid; /\**< Destination PAN ID. *\/ */
/* addr_t dest_addr; /\**< Destination address. *\/ */
/* uint16_t src_pid; /\**< PAN ID *\/ */
/* addr_t src_addr; /\**< Source address *\/ */
/* uint8_t aux_sec_hdr[14]; /\**< 802.15.4 Aux security header *\/ */
/* uint8_t payload_length; /\**< Length of payload section of frame *\/ */
/* uint8_t payload[118]; /\**< Frame payload *\/ */
/* uint8_t lqi; /\**< Link quality indication value *\/ */
/* uint8_t rssi; /\**< Received signal strength indication value *\/ */
/* uint32_t time; /\**< Time stamp of received frame *\/ */
/* bool fcs:1; /\**< True if checksum has passed *\/ */
/* bool in_use:1; /\**< Is this frame struct being used? *\/ */
/* }FRAME_t; */
typedef struct{ typedef struct{
fcf_t * fcf; /**< The FCF of the frame. */ fcf_t * fcf; /**< The FCF of the frame. */
uint8_t * seqNum; /**< The sequence number of the frame. */ uint8_t * seqNum; /**< The sequence number of the frame. */

2
cpu/avr/radio/rf230/hal.c
View file

@ -37,7 +37,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: hal.c,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: hal.c,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
/** /**

2
cpu/avr/radio/rf230/hal.h
View file

@ -47,7 +47,7 @@
* \file * \file
* \brief This file contains low-level radio driver code. * \brief This file contains low-level radio driver code.
* *
* $Id: hal.h,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: hal.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
#ifndef HAL_AVR_H #ifndef HAL_AVR_H

141
cpu/avr/radio/rf230/radio.c
View file

@ -2,12 +2,12 @@
* All rights reserved. * All rights reserved.
* *
* Additional fixes for AVR contributed by: * Additional fixes for AVR contributed by:
* Colin O'Flynn coflynn@newae.com * Colin O'Flynn coflynn@newae.com
* Eric Gnoske egnoske@gmail.com * Eric Gnoske egnoske@gmail.com
* Blake Leverett bleverett@gmail.com * Blake Leverett bleverett@gmail.com
* Mike Vidales mavida404@gmail.com * Mike Vidales mavida404@gmail.com
* Kevin Brown kbrown3@uccs.edu * Kevin Brown kbrown3@uccs.edu
* Nate Bohlmann nate@elfwerks.com * Nate Bohlmann nate@elfwerks.com
* *
* All rights reserved. * All rights reserved.
* *
@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: radio.c,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: radio.c,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
/** /**
@ -113,8 +113,7 @@ static uint8_t rssi_val;
static uint8_t rx_mode; static uint8_t rx_mode;
uint8_t rxMode = RX_AACK_ON; uint8_t rxMode = RX_AACK_ON;
static hal_rx_frame_t rx_frame; static hal_rx_frame_t rx_frame;
parsed_frame_t parsed_frame; static parsed_frame_t parsed_frame;
/*============================ PROTOTYPES ====================================*/ /*============================ PROTOTYPES ====================================*/
bool radio_is_sleeping(void); bool radio_is_sleeping(void);
@ -185,8 +184,8 @@ radio_init(bool cal_rc_osc,
else { else {
if (hal_register_read(RG_MAN_ID_0) != SUPPORTED_MANUFACTURER_ID) if (hal_register_read(RG_MAN_ID_0) != SUPPORTED_MANUFACTURER_ID)
init_status = RADIO_UNSUPPORTED_DEVICE; init_status = RADIO_UNSUPPORTED_DEVICE;
else else
hal_register_write(RG_IRQ_MASK, RF230_SUPPORTED_INTERRUPT_MASK); hal_register_write(RG_IRQ_MASK, RF230_SUPPORTED_INTERRUPT_MASK);
} }
} }
@ -202,6 +201,19 @@ radio_init(bool cal_rc_osc,
return init_status; return init_status;
} }
/*---------------------------------------------------------------------------*/
uint8_t *
radio_frame_data(void)
{
return rx_frame.data;
}
uint8_t
radio_frame_length(void)
{
return rx_frame.length;
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
radio_rx_start_event(uint32_t const isr_timestamp, uint8_t const frame_length) radio_rx_start_event(uint32_t const isr_timestamp, uint8_t const frame_length)
@ -236,10 +248,10 @@ radio_trx_end_event(uint32_t const isr_timestamp)
/* radio has received frame, store it away */ /* radio has received frame, store it away */
parsed_frame.time = isr_timestamp; parsed_frame.time = isr_timestamp;
parsed_frame.rssi = rssi_val; parsed_frame.rssi = rssi_val;
hal_frame_read(&rx_frame, NULL); hal_frame_read(&rx_frame, NULL);
rx_frame_parse(&rx_frame, &parsed_frame); rx_frame_parse(&rx_frame, &parsed_frame);
} }
if (!rx_mode){ if (!rx_mode){
/* Put radio back into receive mode. */ /* Put radio back into receive mode. */
@ -594,23 +606,23 @@ radio_get_clock_speed(void)
radio_status_t radio_status_t
radio_set_clock_speed(bool direct, uint8_t clock_speed) radio_set_clock_speed(bool direct, uint8_t clock_speed)
{ {
/*Check function parameter and current clock speed.*/ /*Check function parameter and current clock speed.*/
if (clock_speed > CLKM_16MHZ){ if (clock_speed > CLKM_16MHZ){
return RADIO_INVALID_ARGUMENT; return RADIO_INVALID_ARGUMENT;
} }
if (radio_get_clock_speed() == clock_speed){ if (radio_get_clock_speed() == clock_speed){
return RADIO_SUCCESS; return RADIO_SUCCESS;
} }
/*Select to change the CLKM frequency directly or after returning from SLEEP.*/ /*Select to change the CLKM frequency directly or after returning from SLEEP.*/
if (direct == false){ if (direct == false){
hal_subregister_write(SR_CLKM_SHA_SEL, 1); hal_subregister_write(SR_CLKM_SHA_SEL, 1);
} else { } else {
hal_subregister_write(SR_CLKM_SHA_SEL, 0); hal_subregister_write(SR_CLKM_SHA_SEL, 0);
} }
hal_subregister_write(SR_CLKM_CTRL, clock_speed); hal_subregister_write(SR_CLKM_CTRL, clock_speed);
return RADIO_SUCCESS; return RADIO_SUCCESS;
} }
@ -776,6 +788,8 @@ bool radio_is_sleeping(void)
radio_status_t radio_status_t
radio_set_trx_state(uint8_t new_state) radio_set_trx_state(uint8_t new_state)
{ {
uint8_t original_state;
/*Check function paramter and current state of the radio transceiver.*/ /*Check function paramter and current state of the radio transceiver.*/
if (!((new_state == TRX_OFF) || if (!((new_state == TRX_OFF) ||
(new_state == RX_ON) || (new_state == RX_ON) ||
@ -789,19 +803,22 @@ radio_set_trx_state(uint8_t new_state)
return RADIO_WRONG_STATE; return RADIO_WRONG_STATE;
} }
uint8_t original_state = radio_get_trx_state(); // Wait for radio to finish previous operation
for(;;)
if ((original_state == BUSY_RX) || {
(original_state == BUSY_TX) || original_state = radio_get_trx_state();
(original_state == BUSY_RX_AACK) || if (original_state != BUSY_TX_ARET &&
(original_state == BUSY_TX_ARET)){ original_state != BUSY_RX_AACK &&
return RADIO_BUSY_STATE; original_state != BUSY_RX &&
original_state != BUSY_TX)
break;
} }
if (new_state == original_state){ if (new_state == original_state){
return RADIO_SUCCESS; return RADIO_SUCCESS;
} }
/* At this point it is clear that the requested new_state is: */ /* At this point it is clear that the requested new_state is: */
/* TRX_OFF, RX_ON, PLL_ON, RX_AACK_ON or TX_ARET_ON. */ /* TRX_OFF, RX_ON, PLL_ON, RX_AACK_ON or TX_ARET_ON. */
@ -849,7 +866,7 @@ radio_set_trx_state(uint8_t new_state)
rx_mode = true; rx_mode = true;
} else { } else {
rx_mode = false; rx_mode = false;
} }
} }
return set_state_status; return set_state_status;
@ -1190,7 +1207,7 @@ radio_configure_csma(uint8_t seed0, uint8_t be_csma_seed1)
bool bool
calibrate_rc_osc_clkm(void) calibrate_rc_osc_clkm(void)
{ {
bool success = false; bool success = false;
/* Use the 1 MHz CLK_M from the AT86RF230. */ /* Use the 1 MHz CLK_M from the AT86RF230. */
uint16_t temp, counter; uint16_t temp, counter;
@ -1204,72 +1221,72 @@ calibrate_rc_osc_clkm(void)
#define TARGETVAL ((1000000ULL * 256 * 32) / F_CPU) #define TARGETVAL ((1000000ULL * 256 * 32) / F_CPU)
osccal_saved = OSCCAL; osccal_saved = OSCCAL;
cli(); cli();
radio_set_clock_speed(true, CLKM_1MHz); radio_set_clock_speed(true, CLKM_1MHz);
/* Save current values of timer status. */ /* Save current values of timer status. */
tccr2b = TCCR2B; tccr2b = TCCR2B;
tccr1b = TCCR1B; tccr1b = TCCR1B;
tccr1a = TCCR1A; tccr1a = TCCR1A;
/* Stop timers 1 and 2. */ /* Stop timers 1 and 2. */
/* Set timer 1 to normal mode (no CTC, no PWM, just count). */ /* Set timer 1 to normal mode (no CTC, no PWM, just count). */
TCCR2B = 0; TCCR2B = 0;
TCCR1B = 0; TCCR1B = 0;
TCCR1A = 0; TCCR1A = 0;
for (counter = 0; counter < 1000; counter++){ for (counter = 0; counter < 1000; counter++){
/* Delete pending timer 1 and 2 interrupts, and clear the */ /* Delete pending timer 1 and 2 interrupts, and clear the */
/* counters. */ /* counters. */
TIFR1 = 0xFF; TIFR1 = 0xFF;
TIFR2 = 0xFF; TIFR2 = 0xFF;
TCNT2 = 0; TCNT2 = 0;
TCNT1 = 0; TCNT1 = 0;
/* Timer 2 driven from clock divided by 32 */ /* Timer 2 driven from clock divided by 32 */
TCCR2B = (1 << CS21) | (1 << CS20); TCCR2B = (1 << CS21) | (1 << CS20);
/* Timer 1 driven with external clock */ /* Timer 1 driven with external clock */
TCCR1B = (1 << CS12) | (1 << CS11); TCCR1B = (1 << CS12) | (1 << CS11);
/* Wait for timer 2 to overflow. */ /* Wait for timer 2 to overflow. */
while (!(TIFR2 & (1 << TOV2))){ while (!(TIFR2 & (1 << TOV2))){
; ;
} }
/* Stop timer 1. Now, TCNT1 contains the number of CPU cycles */ /* Stop timer 1. Now, TCNT1 contains the number of CPU cycles */
/* counted while timer 2 was counting */ /* counted while timer 2 was counting */
TCCR1B = 0; TCCR1B = 0;
TCCR2B = 0; TCCR2B = 0;
temp = TCNT1; temp = TCNT1;
if (temp < (uint16_t)(0.995 * TARGETVAL)){ if (temp < (uint16_t)(0.995 * TARGETVAL)){
/* Too fast, slow down */ /* Too fast, slow down */
OSCCAL--; OSCCAL--;
} else if (temp > (uint16_t)(1.005 * TARGETVAL)){ } else if (temp > (uint16_t)(1.005 * TARGETVAL)){
/* Too slow, speed up */ /* Too slow, speed up */
OSCCAL++; OSCCAL++;
} else { } else {
/* We are within +/- 0.5 % of our target frequency, so we're */ /* We are within +/- 0.5 % of our target frequency, so we're */
/* done. */ /* done. */
success = true; success = true;
break; break;
}
} }
}
radio_set_clock_speed(true, CLKM_DISABLED); radio_set_clock_speed(true, CLKM_DISABLED);
/* restore timer status regs */ /* restore timer status regs */
TCCR2B = tccr2b; TCCR2B = tccr2b;
TCCR1B = tccr1b; TCCR1B = tccr1b;
TCCR1A = tccr1a; TCCR1A = tccr1a;
if (!success){ if (!success){
/* We failed, therefore restore previous OSCCAL value. */ /* We failed, therefore restore previous OSCCAL value. */
OSCCAL = osccal_saved; OSCCAL = osccal_saved;
} }
return success; return success;
} }
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
@ -1293,7 +1310,7 @@ calibrate_rc_osc_32k(void)
*/ */
uint8_t osccal_original = OSCCAL; uint8_t osccal_original = OSCCAL;
volatile uint16_t temp; volatile uint16_t temp;
/* This is bad practice, but seems to work. */ /* This is bad practice, but seems to work. */
OSCCAL = 0x80; OSCCAL = 0x80;
@ -1331,7 +1348,7 @@ calibrate_rc_osc_32k(void)
*/ */
while (!(TIFR2 & (1 << TOV2))){ while (!(TIFR2 & (1 << TOV2))){
; ;
} }
temp = TCNT1; temp = TCNT1;
TCCR1B = 0; TCCR1B = 0;

4
cpu/avr/radio/rf230/radio.h
View file

@ -45,7 +45,7 @@
* \file * \file
* \brief This file contains radio driver code. * \brief This file contains radio driver code.
* *
* $Id: radio.h,v 1.1 2008/10/14 09:43:40 adamdunkels Exp $ * $Id: radio.h,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
*/ */
#ifndef RADIO_H #ifndef RADIO_H
@ -212,6 +212,8 @@ void radio_set_extended_address( uint8_t *extended_address );
radio_status_t radio_configure_csma( uint8_t seed0, uint8_t be_csma_seed1 ); radio_status_t radio_configure_csma( uint8_t seed0, uint8_t be_csma_seed1 );
bool calibrate_rc_osc_clkm(void); bool calibrate_rc_osc_clkm(void);
void calibrate_rc_osc_32k(void); void calibrate_rc_osc_32k(void);
uint8_t * radio_frame_data(void);
uint8_t radio_frame_length(void);
#define delay_us( us ) ( _delay_loop_2( ( F_CPU / 4000000UL ) * ( us ) ) ) #define delay_us( us ) ( _delay_loop_2( ( F_CPU / 4000000UL ) * ( us ) ) )
#endif #endif