Move RF RX into its own process

This commit is contained in:
Jim Paris 2014-06-25 18:22:50 -04:00
parent fff8a18b99
commit 4cb97a3311
2 changed files with 44 additions and 10 deletions

View file

@ -39,6 +39,10 @@
#include <stdint.h> #include <stdint.h>
#include <aducrf101-contiki.h> #include <aducrf101-contiki.h>
#include "contiki.h"
#include "contiki-net.h"
#include "net/netstack.h"
#include "radio.h" #include "radio.h"
#define MAX_PACKET_LEN 240 #define MAX_PACKET_LEN 240
@ -107,6 +111,8 @@ _set_power(int power)
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(aducrf101_rf_process, "ADuCRF101 RF driver");
/*---------------------------------------------------------------------------*/
/** Turn the radio on. */ /** Turn the radio on. */
static int static int
on(void) on(void)
@ -154,6 +160,7 @@ init(void)
{ {
off(); off();
on(); on();
process_start(&aducrf101_rf_process, NULL);
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -196,6 +203,7 @@ send(const void *payload, unsigned short payload_len)
prepare(payload, payload_len); prepare(payload, payload_len);
return transmit(payload_len); return transmit(payload_len);
} }
/*---------------------------------------------------------------------------*/
/** Read a received packet into a buffer. */ /** Read a received packet into a buffer. */
static int static int
read(void *buf, unsigned short buf_len) read(void *buf, unsigned short buf_len)
@ -329,6 +337,42 @@ set_object(radio_param_t param, const void *src, size_t size)
return RADIO_RESULT_NOT_SUPPORTED; return RADIO_RESULT_NOT_SUPPORTED;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/**
* \brief Implementation of the ADuCRF101 RF driver process
*
* This process is started by init(). It waits for events triggered
* by packet reception.
*/
PROCESS_THREAD(aducrf101_rf_process, ev, data)
{
int len;
PROCESS_BEGIN();
while(1) {
PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_POLL);
packetbuf_clear();
len = read(packetbuf_dataptr(), PACKETBUF_SIZE);
if(len > 0) {
packetbuf_set_datalen(len);
NETSTACK_RDC.input();
}
}
PROCESS_END();
}
/*---------------------------------------------------------------------------*/
/**
* \brief Trigger function called by ADI radio engine upon packet RX.
*/
void
aducrf101_rx_packet_hook(void)
{
process_poll(&aducrf101_rf_process);
}
/*---------------------------------------------------------------------------*/
const struct radio_driver aducrf101_radio_driver = { const struct radio_driver aducrf101_radio_driver = {
.init = init, .init = init,
.prepare = prepare, .prepare = prepare,

View file

@ -168,16 +168,6 @@ main(int argc, char **argv)
while(1) { while(1) {
watchdog_periodic(); watchdog_periodic();
if(NETSTACK_RADIO.pending_packet()) {
int len;
packetbuf_clear();
len = NETSTACK_RADIO.read(packetbuf_dataptr(), PACKETBUF_SIZE);
if(len > 0) {
packetbuf_set_datalen(len);
NETSTACK_RDC.input();
}
}
process_run(); process_run();
} }