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

rftest-tx and refine post_tx for fast transmission

Browse source
This commit is contained in:
Mariano Alvira 2010-03-07 16:49:57 -05:00
parent 4b17c144d0
commit 667b238148
2 changed files with 40 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/maca.c
View file

@ -177,24 +177,24 @@ void post_tx(void) {
/* disable soft timeout clock */ /* disable soft timeout clock */
/* disable start clock */ /* disable start clock */
*MACA_TMRDIS = (1 << maca_tmren_sft) | ( 1 << maca_tmren_strt ) ; *MACA_TMRDIS = (1 << maca_tmren_sft) | ( 1 << maca_tmren_strt ) ;
/* set complete clock to long value */
/* this doesn't work right */
/* lock up seems to happen when switching from receive to transmitt */
/* set complete clock to long value */
/* acts like a watchdog incase the MACA locks up */ /* acts like a watchdog incase the MACA locks up */
*MACA_CPLCLK = *MACA_CLK + (CLK_PER_BYTE * dma_tx->length+6) + (CLK_PER_BYTE * 0); // *MACA_CPLCLK = *MACA_CLK + (CLK_PER_BYTE * dma_tx->length+6) + (CLK_PER_BYTE * 0);
/* enable complete clock */ /* enable complete clock */
*MACA_TMREN = (1 << maca_tmren_cpl); // *MACA_TMREN = (1 << maca_tmren_cpl);
/* do the transmit */
for(i=0; i<1000; i++) { continue; }
enable_irq(MACA); enable_irq(MACA);
/* *MACA_CONTROL = ( (1 << maca_ctrl_prm) | ( 4 << PRECOUNT) | /* *MACA_CONTROL = ( (1 << maca_ctrl_prm) | ( 4 << PRECOUNT) |
(maca_ctrl_mode_no_cca << maca_ctrl_mode) | (maca_ctrl_mode_no_cca << maca_ctrl_mode) |
(1 << maca_ctrl_asap) | (1 << maca_ctrl_asap) |
(maca_ctrl_seq_tx)); */ (maca_ctrl_seq_tx)); */
// for(i=0; i<1000; i++) { continue; }
*MACA_CONTROL = ( (1 << maca_ctrl_prm) | *MACA_CONTROL = ( (1 << maca_ctrl_prm) |
(maca_ctrl_mode_no_cca << maca_ctrl_mode) | (maca_ctrl_mode_no_cca << maca_ctrl_mode) |
(1 << maca_ctrl_asap) | (1 << maca_ctrl_asap) |
(maca_ctrl_seq_tx)); (maca_ctrl_seq_tx));
for(i=0; i<1000; i++) { continue; }
} }
void tx_packet(volatile packet_t *p) { void tx_packet(volatile packet_t *p) {

150
tests/rftest-tx.c
View file

@ -5,57 +5,40 @@
#include "tests.h" #include "tests.h"
#include "config.h" #include "config.h"
#define DELAY 100000 #define LED LED_RED
#define DATA 0x00401000
#define DEBUG_MACA 1
uint32_t ackBox[10]; #define PAYLOAD_LEN 16
#define DELAY 400000
#define command_xcvr_rx() \ void fill_packet(volatile packet_t *p) {
do { \ static volatile uint8_t count=0;
maca_txlen = (uint32_t)1<<16; \ volatile uint8_t i;
maca_dmatx = (uint32_t)&ackBox; \ p->length = PAYLOAD_LEN;
maca_dmarx = DATA; \
maca_tmren = (maca_cpl_clk | maca_soft_clk); \
maca_control = (control_prm | control_asap | control_seq_rx); \
}while(0)
#define PAYLOAD_LEN 16 /* not including the extra 4 bytes for len+fcs+somethingelse */
/* maca dmatx needs extra 4 bytes for checksum */
/* needs + 4 bytes for len(1 byte) + fcs(2 bytes) + somethingelse */
#define command_xcvr_tx() \
do { \
maca_txlen = (uint32_t)(PAYLOAD_LEN+4); \
maca_dmatx = (uint32_t)DATA; \
maca_dmarx = (uint32_t)&ackBox; \
maca_control = (control_prm | control_mode_no_cca | \
control_asap | control_seq_tx); \
}while(0)
volatile uint8_t *data;
uint8_t count=0;
void fill_data(void) {
uint8_t i;
for(i=0; i<PAYLOAD_LEN; i++) { for(i=0; i<PAYLOAD_LEN; i++) {
data[i] = count++; p->data[i] = count++;
} }
} }
void main(void) { void main(void) {
volatile uint32_t i; volatile uint32_t i;
uint16_t status; volatile packet_t *p;
*GPIO_PAD_DIR0 = LED; *GPIO_DATA0 = 0x00000000;
led_on(); *GPIO_PAD_DIR0 = ( 1 << LED );
/* read from the data register instead of the pad */
/* this is needed because the led clamps the voltage low */
*GPIO_DATA_SEL0 = ( 1 << LED );
uart_init(INC,MOD); uart_init(INC,MOD);
print_welcome("rftest-tx");
reset_maca(); reset_maca();
radio_init(); radio_init();
vreg_init(); vreg_init();
flyback_init(); flyback_init();
init_phy(); init_phy();
free_all_packets();
/* trim the reference osc. to 24MHz */ /* trim the reference osc. to 24MHz */
pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS); pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS);
@ -63,102 +46,25 @@ void main(void) {
set_power(0x0f); /* 0dbm */ set_power(0x0f); /* 0dbm */
set_channel(0); /* channel 11 */ set_channel(0); /* channel 11 */
/* initial radio command */
/* nop, promiscuous, no cca */
*MACA_CONTROL = (1 << PRM) | (NO_CCA << MODE); *MACA_CONTROL = (1 << PRM) | (NO_CCA << MODE);
for(i=0; i<DELAY; i++) { continue; }
data = (void *)DATA;
*MACA_DMARX = DATA; /* put data somewhere */
*MACA_PREAMBLE = 0;
/* sets up tx_on, should be a board specific item */
*GPIO_FUNC_SEL2 = (0x01 << ((44-16*2)*2));
*GPIO_PAD_DIR0 = *GPIO_PAD_DIR0 | (1<<(44-32));
fill_data();
command_xcvr_tx();
while(1) { while(1) {
if(_is_action_complete_interrupt(maca_irq)) { p = get_free_packet();
maca_clrirq = maca_irq; if(p) {
fill_packet(p);
status = *MACA_STATUS & 0x0000ffff; toggle_gpio0(LED);
switch(status) printf("rftest-tx --- ");
{ print_packet(p);
case(cc_aborted):
{
printf("aborted\n\r");
ResumeMACASync();
break;
} tx_packet(p);
case(cc_not_completed):
{
printf("not completed\n\r");
ResumeMACASync();
break;
} for(i=0; i<DELAY; i++) { continue; }
case(cc_timeout):
{
printf("timeout\n\r");
ResumeMACASync();
break;
}
case(cc_no_ack):
{
printf("no ack\n\r");
ResumeMACASync();
break;
}
case(cc_ext_timeout):
{
printf("ext timeout\n\r");
ResumeMACASync();
break;
}
case(cc_ext_pnd_timeout):
{
printf("ext pnd timeout\n\r");
ResumeMACASync();
break;
}
case(cc_success):
{
// printf("success\n\r");
printf("rftest-tx --- payload len+crc: 0x%02x timestamp: 0x%08x\n\r", PAYLOAD_LEN+4, maca_timestamp);
printf(" data: ");
for(i=0; i<PAYLOAD_LEN; i++) {
printf("%02x ",data[i]);
}
printf("\n\r");
toggle_led();
fill_data();
command_xcvr_tx();
break;
}
default:
{
printf("status: 0x%04x",status);
ResumeMACASync();
}
}
} else if (_is_filter_failed_interrupt(maca_irq)) {
printf("filter failed\n\r");
ResumeMACASync();
} }
for(i=0; i<DELAY; i++) { continue; } }
};
} }