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

this does 127 B packets as fast as possible (with these settings).

Browse source 
Transmitts are every 5.8ms and are 4.48ms long
This commit is contained in:
Mariano Alvira 2010-03-05 19:25:38 -05:00
parent 8e3c2a8622
commit 5c20312744
2 changed files with 62 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
lib/maca.c
View file

@ -15,7 +15,8 @@
#endif #endif
#ifndef RECV_SOFTIMEOUT #ifndef RECV_SOFTIMEOUT
#define RECV_SOFTIMEOUT 2500000 /* 10 sec */ //#define RECV_SOFTIMEOUT 4096 /* about 3.5 128 byte packets */
#define RECV_SOFTIMEOUT 10000 /* about 3.5 128 byte packets */
#endif #endif
#define MACA_CLOCK_DIV 95 #define MACA_CLOCK_DIV 95
@ -36,7 +37,9 @@ static volatile uint8_t last_post = NO_POST;
#define safe_irq_disable(x) volatile uint32_t saved_irq; saved_irq = *INTENABLE; disable_irq(x) #define safe_irq_disable(x) volatile uint32_t saved_irq; saved_irq = *INTENABLE; disable_irq(x)
#define irq_restore() *INTENABLE = saved_irq #define irq_restore() *INTENABLE = saved_irq
void print_packets(char *s) { #define print_packets(x) Print_Packets(x)
void Print_Packets(char *s) {
volatile packet_t *p; volatile packet_t *p;
int i = 0; int i = 0;
printf("packet pool after %s:\n\r",s); printf("packet pool after %s:\n\r",s);
@ -87,6 +90,8 @@ void free_packet(volatile packet_t *p) {
volatile packet_t* get_free_packet(void) { volatile packet_t* get_free_packet(void) {
volatile packet_t *p; volatile packet_t *p;
volatile uint32_t i;
safe_irq_disable(MACA); safe_irq_disable(MACA);
p = free_head; p = free_head;
@ -95,11 +100,44 @@ volatile packet_t* get_free_packet(void) {
free_head->right = 0; free_head->right = 0;
} }
print_packets("get_free_packet");
for(i=0; i<9783; i++) { continue; }
// print_packets("get_free_packet");
irq_restore(); irq_restore();
return p; return p;
} }
void post_receive(void) {
disable_irq(MACA);
last_post = RX_POST;
/* this sets the rxlen field */
/* this is undocumented but very important */
/* you will not receive anything without setting it */
*MACA_TXLEN = (MAX_PACKET_SIZE << 16);
if(dma_rx == 0) {
dma_rx = get_free_packet();
if (dma_rx == 0)
printf("trying to fill MACA_DMARX but out of packet buffers\n");
}
*MACA_DMARX = (uint32_t)&(dma_rx->data[0]);
/* with timeout */
*MACA_SFTCLK = *MACA_CLK + RECV_SOFTIMEOUT; /* soft timeout */
*MACA_TMREN = (1 << maca_tmren_sft);
/* start the receive sequence */
enable_irq(MACA);
/* *MACA_CONTROL = ( (1 << maca_ctrl_asap) |
(1 << maca_ctrl_auto) |
(1 << maca_ctrl_prm) |
(maca_ctrl_seq_rx));
*/
*MACA_CONTROL = (
(1 << maca_ctrl_asap) |
(1 << maca_ctrl_prm) |
(maca_ctrl_seq_rx));
}
volatile packet_t* rx_packet(void) { volatile packet_t* rx_packet(void) {
volatile packet_t *p; volatile packet_t *p;
safe_irq_disable(MACA); safe_irq_disable(MACA);
@ -110,14 +148,16 @@ volatile packet_t* rx_packet(void) {
rx_head->right = 0; rx_head->right = 0;
} }
print_packets("rx_packet"); // print_packets("rx_packet");
irq_restore(); irq_restore();
if(get_field(*MACA_STATUS,CODE) != NOT_COMPLETED) { post_receive(); }
return p; return p;
} }
void post_tx(void) { void post_tx(void) {
/* set dma tx pointer to the payload */ /* set dma tx pointer to the payload */
/* and set the tx len */ /* and set the tx len */
disable_irq(MACA); disable_irq(MACA);
last_post = TX_POST; last_post = TX_POST;
dma_tx = tx_head; dma_tx = tx_head;
@ -154,7 +194,7 @@ void tx_packet(volatile packet_t *p) {
/* move the queue */ /* move the queue */
tx_end = p; tx_end->left = 0; tx_end = p; tx_end->left = 0;
} }
print_packets("tx packet"); // print_packets("tx packet");
irq_restore(); irq_restore();
if(get_field(*MACA_STATUS,CODE) != NOT_COMPLETED) { post_tx(); } if(get_field(*MACA_STATUS,CODE) != NOT_COMPLETED) { post_tx(); }
return; return;
@ -189,7 +229,7 @@ void free_tx_head(void) {
if(tx_head == 0) { tx_end = 0; } if(tx_head == 0) { tx_end = 0; }
free_packet(p); free_packet(p);
print_packets("free tx head"); // print_packets("free tx head");
irq_restore(); irq_restore();
return; return;
} }
@ -209,46 +249,16 @@ void add_to_rx(volatile packet_t *p) {
rx_end = p; rx_end->left = 0; rx_end = p; rx_end->left = 0;
} }
print_packets("add to tx"); // print_packets("add to rx");
irq_restore(); irq_restore();
return; return;
} }
void post_receive(void) {
disable_irq(MACA);
last_post = RX_POST;
/* this sets the rxlen field */
/* this is undocumented but very important */
/* you will not receive anything without setting it */
*MACA_TXLEN = (MAX_PACKET_SIZE << 16);
if(dma_rx == 0) {
dma_rx = get_free_packet();
if (dma_rx == 0)
printf("trying to fill MACA_DMARX but out of packet buffers\n");
}
*MACA_DMARX = (uint32_t)&(dma_rx->data[0]);
/* with timeout */
*MACA_SFTCLK = *MACA_CLK + RECV_SOFTIMEOUT; /* soft timeout */
*MACA_TMREN = (1 << maca_tmren_sft);
/* start the receive sequence */
enable_irq(MACA);
/* *MACA_CONTROL = ( (1 << maca_ctrl_asap) |
(1 << maca_ctrl_auto) |
(1 << maca_ctrl_prm) |
(maca_ctrl_seq_rx));
*/
*MACA_CONTROL = (
(1 << maca_ctrl_asap) |
(1 << maca_ctrl_prm) |
(maca_ctrl_seq_rx));
}
void decode_status(volatile uint32_t status) { void decode_status(volatile uint32_t status) {
volatile uint32_t code; volatile uint32_t code;
code = get_field(status,CODE); code = get_field(status,CODE);
PRINTF("status code 0x%x\n\r",code); /* PRINTF("status code 0x%x\n\r",code); */
switch(code) switch(code)
{ {
@ -296,6 +306,7 @@ void decode_status(volatile uint32_t status) {
case SUCCESS: case SUCCESS:
{ {
//PRINTF("maca: success\n\r"); //PRINTF("maca: success\n\r");
ResumeMACASync();
break; break;
} }
default: default:
@ -310,7 +321,7 @@ void decode_status(volatile uint32_t status) {
void maca_isr(void) { void maca_isr(void) {
volatile uint32_t i, status; volatile uint32_t i, status;
print_packets("maca_isr"); // print_packets("maca_isr");
status = *MACA_STATUS; status = *MACA_STATUS;
@ -332,11 +343,12 @@ void maca_isr(void) {
*MACA_CLRIRQ = (1 << maca_irq_crc); *MACA_CLRIRQ = (1 << maca_irq_crc);
} }
if(action_complete_irq()) { if(action_complete_irq()) {
PRINTF("maca action complete %d\n\r", get_field(*MACA_CONTROL,SEQUENCE)); /* PRINTF("maca action complete %d\n\r", get_field(*MACA_CONTROL,SEQUENCE)); */
if(last_post == TX_POST) { if(last_post == TX_POST) {
free_tx_head(); free_tx_head();
last_post = NO_POST; last_post = NO_POST;
} }
ResumeMACASync();
*MACA_CLRIRQ = (1 << maca_irq_acpl); *MACA_CLRIRQ = (1 << maca_irq_acpl);
} }
i = *MACA_IRQ; i = *MACA_IRQ;
@ -856,8 +868,8 @@ void ResumeMACASync(void)
// bool_t tmpIsrStatus; // bool_t tmpIsrStatus;
volatile uint32_t i, saved_irq; volatile uint32_t i, saved_irq;
disable_irq(MACA); // disable_irq(MACA);
saved_irq = *MACA_IRQ; // saved_irq = *MACA_IRQ;
// ITC_DisableInterrupt(gMacaInt_c); // ITC_DisableInterrupt(gMacaInt_c);
// AppInterrupts_ProtectFromMACAIrq(tmpIsrStatus); <- Original from MAC code, but not sure how is it implemented // AppInterrupts_ProtectFromMACAIrq(tmpIsrStatus); <- Original from MAC code, but not sure how is it implemented
@ -905,7 +917,7 @@ void ResumeMACASync(void)
// AppInterrupts_UnprotectFromMACAIrq(tmpIsrStatus); <- Original from MAC code, but not sure how is it implemented // AppInterrupts_UnprotectFromMACAIrq(tmpIsrStatus); <- Original from MAC code, but not sure how is it implemented
// ITC_EnableInterrupt(gMacaInt_c); // ITC_EnableInterrupt(gMacaInt_c);
*MACA_IRQ = saved_irq; // *MACA_IRQ = saved_irq;
enable_irq(MACA); // enable_irq(MACA);
} }

8
tests/per.c
View file

@ -47,7 +47,7 @@ uint32_t get_time(void) {
#define random_short_addr() (*MACA_RANDOM & ones(sizeof(short_addr_t)*8)) #define random_short_addr() (*MACA_RANDOM & ones(sizeof(short_addr_t)*8))
void build_session_req(volatile packet_t *p) { void build_session_req(volatile packet_t *p) {
p->length = 4; p->length = 127;
p->data[0] = 0xff; p->data[0] = 0xff;
p->data[1] = 0x01; p->data[1] = 0x01;
p->data[2] = 0x23; p->data[2] = 0x23;
@ -65,7 +65,7 @@ void session_req(short_addr_t addr) {
build_session_req(p); build_session_req(p);
tx_packet(p); tx_packet(p);
} else { } else {
printf("session_req: could not get free packet for transmit\n\r"); // printf("session_req: could not get free packet for transmit\n\r");
} }
// } // }
@ -109,6 +109,10 @@ void main(void) {
/* generate a random short address */ /* generate a random short address */
my_addr = random_short_addr(); my_addr = random_short_addr();
/* 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));
state = SCANNING; state = SCANNING;
while(1) { while(1) {