Merge remote-tracking branch 'mjb/altoslib_mjb'
[fw/altos] / src / drivers / ao_cc1120.c
index 95b21170f597e0b1c468cef9e1d3f97a13c5b014..2f9c296f25372926f99a92e88cf8ab593ad8a539 100644 (file)
 #include <ao.h>
 #include <ao_cc1120.h>
 #include <ao_exti.h>
+#include <ao_fec.h>
+#include <ao_packet.h>
 
 uint8_t ao_radio_wake;
 uint8_t ao_radio_mutex;
 uint8_t ao_radio_abort;
+uint8_t ao_radio_in_recv;
 
-#define CC1120_DEBUG   1
+#define CC1120_DEBUG   AO_FEC_DEBUG
+#define CC1120_TRACE   0
 
-uint32_t       ao_radio_cal = 1186611;
+extern const uint32_t  ao_radio_cal;
 
 #define FOSC   32000000
 
-#define ao_radio_select()      ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS)
+#define ao_radio_select()      ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_1MHz)
 #define ao_radio_deselect()    ao_spi_put_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS)
 #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC1120_SPI_BUS)
 #define ao_radio_spi_send_fixed(d,l) ao_spi_send_fixed((d), (l), AO_CC1120_SPI_BUS)
@@ -42,7 +46,7 @@ ao_radio_reg_read(uint16_t addr)
        uint8_t data[2];
        uint8_t d;
 
-#if CC1120_DEBUG
+#if CC1120_TRACE
        printf("\t\tao_radio_reg_read (%04x): ", addr); flush();
 #endif
        if (CC1120_IS_EXTENDED(addr)) {
@@ -61,7 +65,7 @@ ao_radio_reg_read(uint16_t addr)
        ao_radio_spi_send(data, d);
        ao_radio_spi_recv(data, 1);
        ao_radio_deselect();
-#if CC1120_DEBUG
+#if CC1120_TRACE
        printf (" %02x\n", data[0]);
 #endif
        return data[0];
@@ -73,17 +77,17 @@ ao_radio_reg_write(uint16_t addr, uint8_t value)
        uint8_t data[3];
        uint8_t d;
 
-#if CC1120_DEBUG
+#if CC1120_TRACE
        printf("\t\tao_radio_reg_write (%04x): %02x\n", addr, value);
 #endif
        if (CC1120_IS_EXTENDED(addr)) {
-               data[0] = ((1 << CC1120_READ)  |
+               data[0] = ((0 << CC1120_READ)  |
                           (0 << CC1120_BURST) |
                           CC1120_EXTENDED);
                data[1] = addr;
                d = 2;
        } else {
-               data[0] = ((1 << CC1120_READ)  |
+               data[0] = ((0 << CC1120_READ)  |
                           (0 << CC1120_BURST) |
                           addr);
                d = 1;
@@ -94,19 +98,48 @@ ao_radio_reg_write(uint16_t addr, uint8_t value)
        ao_radio_deselect();
 }
 
+static void
+ao_radio_burst_read_start (uint16_t addr)
+{
+       uint8_t data[2];
+       uint8_t d;
+
+       if (CC1120_IS_EXTENDED(addr)) {
+               data[0] = ((1 << CC1120_READ)  |
+                          (1 << CC1120_BURST) |
+                          CC1120_EXTENDED);
+               data[1] = addr;
+               d = 2;
+       } else {
+               data[0] = ((1 << CC1120_READ)  |
+                          (1 << CC1120_BURST) |
+                          addr);
+               d = 1;
+       }
+       ao_radio_select();
+       ao_radio_spi_send(data, d);
+}
+
+static void
+ao_radio_burst_read_stop (void)
+{
+       ao_radio_deselect();
+}
+
+
 static uint8_t
 ao_radio_strobe(uint8_t addr)
 {
        uint8_t in;
 
-#if CC1120_DEBUG
+#if CC1120_TRACE
        printf("\t\tao_radio_strobe (%02x): ", addr); flush();
 #endif
        ao_radio_select();
        ao_radio_duplex(&addr, &in, 1);
        ao_radio_deselect();
-#if CC1120_DEBUG
-       printf("%02x\n", in);
+#if CC1120_TRACE
+       printf("%02x\n", in); flush();
 #endif
        return in;
 }
@@ -127,7 +160,7 @@ ao_radio_fifo_read(uint8_t *data, uint8_t len)
 }
 
 static uint8_t
-ao_radio_fifo_write(uint8_t *data, uint8_t len)
+ao_radio_fifo_write_start(void)
 {
        uint8_t addr = ((0 << CC1120_READ)  |
                        (1 << CC1120_BURST) |
@@ -136,26 +169,34 @@ ao_radio_fifo_write(uint8_t *data, uint8_t len)
 
        ao_radio_select();
        ao_radio_duplex(&addr, &status, 1);
-       ao_radio_spi_send(data, len);
+       return status;
+}
+
+static inline uint8_t ao_radio_fifo_write_stop(uint8_t status) {
        ao_radio_deselect();
        return status;
 }
 
 static uint8_t
-ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
+ao_radio_fifo_write(uint8_t *data, uint8_t len)
 {
-       uint8_t addr = ((0 << CC1120_READ)  |
-                       (1 << CC1120_BURST) |
-                       CC1120_FIFO);
-       uint8_t status;
+       uint8_t status = ao_radio_fifo_write_start();
+       ao_radio_spi_send(data, len);
+       return ao_radio_fifo_write_stop(status);
+}
 
-       printf ("num tx bytes: %d\n", ao_radio_reg_read(CC1120_NUM_TXBYTES));
-       ao_radio_select();
-       ao_radio_duplex(&addr, &status, 1);
+static uint8_t
+ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
+{
+       uint8_t status = ao_radio_fifo_write_start();
        ao_radio_spi_send_fixed(data, len);
-       ao_radio_deselect();
-       printf ("num tx bytes: %d\n", ao_radio_reg_read(CC1120_NUM_TXBYTES));
-       return status;
+       return ao_radio_fifo_write_stop(status);
+}
+
+static uint8_t
+ao_radio_tx_fifo_space(void)
+{
+       return CC1120_FIFO_SIZE - ao_radio_reg_read(CC1120_NUM_TXBYTES);
 }
 
 static uint8_t
@@ -173,6 +214,97 @@ ao_radio_recv_abort(void)
 
 #define ao_radio_rdf_value 0x55
 
+static uint8_t
+ao_radio_marc_status(void)
+{
+       return ao_radio_reg_read(CC1120_MARC_STATUS1);
+}
+
+static void
+ao_radio_tx_isr(void)
+{
+       ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+       ao_radio_wake = 1;
+       ao_wakeup(&ao_radio_wake);
+}
+
+static void
+ao_radio_start_tx(void)
+{
+       ao_exti_set_callback(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, ao_radio_tx_isr);
+       ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+       ao_radio_strobe(CC1120_STX);
+}
+
+static void
+ao_radio_idle(void)
+{
+       for (;;) {
+               uint8_t state = ao_radio_strobe(CC1120_SIDLE);
+               if ((state >> CC1120_STATUS_STATE) == CC1120_STATUS_STATE_IDLE)
+                       break;
+       }
+}
+
+/*
+ * Packet deviation is 20.5kHz
+ *
+ *     fdev = fosc >> 24 * (256 + dev_m) << dev_e
+ *
+ *             32e6Hz / (2 ** 24) * (256 + 80) * (2 ** 5) = 20508Hz
+ */
+
+#define PACKET_DEV_E   5
+#define PACKET_DEV_M   80
+
+/*
+ * For our packet data, set the symbol rate to 38360 Baud
+ *
+ *              (2**20 + DATARATE_M) * 2 ** DATARATE_E
+ *     Rdata = -------------------------------------- * fosc
+ *                          2 ** 39
+ *
+ *
+ *     DATARATE_M = 239914
+ *     DATARATE_E = 9
+ */
+#define PACKET_DRATE_E 9
+#define PACKET_DRATE_M 239914
+
+static const uint16_t packet_setup[] = {
+       CC1120_DEVIATION_M,     PACKET_DEV_M,
+       CC1120_MODCFG_DEV_E,    ((CC1120_MODCFG_DEV_E_MODEM_MODE_NORMAL << CC1120_MODCFG_DEV_E_MODEM_MODE) |
+                                (CC1120_MODCFG_DEV_E_MOD_FORMAT_2_GFSK << CC1120_MODCFG_DEV_E_MOD_FORMAT) |
+                                (PACKET_DEV_E << CC1120_MODCFG_DEV_E_DEV_E)),
+       CC1120_DRATE2,          ((PACKET_DRATE_E << CC1120_DRATE2_DATARATE_E) |
+                                (((PACKET_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
+       CC1120_DRATE1,          ((PACKET_DRATE_M >> 8) & 0xff),
+       CC1120_DRATE0,          ((PACKET_DRATE_M >> 0) & 0xff),
+       CC1120_PKT_CFG2,        ((CC1120_PKT_CFG2_CCA_MODE_ALWAYS_CLEAR << CC1120_PKT_CFG2_CCA_MODE) |
+                                (CC1120_PKT_CFG2_PKT_FORMAT_NORMAL << CC1120_PKT_CFG2_PKT_FORMAT)),
+       CC1120_PKT_CFG1,        ((0 << CC1120_PKT_CFG1_WHITE_DATA) |
+                                (CC1120_PKT_CFG1_ADDR_CHECK_CFG_NONE << CC1120_PKT_CFG1_ADDR_CHECK_CFG) |
+                                (CC1120_PKT_CFG1_CRC_CFG_DISABLED << CC1120_PKT_CFG1_CRC_CFG) |
+                                (0 << CC1120_PKT_CFG1_APPEND_STATUS)),
+       CC1120_PKT_CFG0,        ((0 << CC1120_PKT_CFG0_RESERVED7) |
+                                (CC1120_PKT_CFG0_LENGTH_CONFIG_FIXED << CC1120_PKT_CFG0_LENGTH_CONFIG) |
+                                (0 << CC1120_PKT_CFG0_PKG_BIT_LEN) |
+                                (0 << CC1120_PKT_CFG0_UART_MODE_EN) |
+                                (0 << CC1120_PKT_CFG0_UART_SWAP_EN)),
+};
+
+static const uint16_t packet_tx_setup[] = {
+       CC1120_PKT_CFG2,        ((CC1120_PKT_CFG2_CCA_MODE_ALWAYS_CLEAR << CC1120_PKT_CFG2_CCA_MODE) |
+                                (CC1120_PKT_CFG2_PKT_FORMAT_NORMAL << CC1120_PKT_CFG2_PKT_FORMAT)),
+       CC1120_IOCFG2,          CC1120_IOCFG_GPIO_CFG_RX0TX1_CFG,
+};
+
+static const uint16_t packet_rx_setup[] = {
+       CC1120_PKT_CFG2,        ((CC1120_PKT_CFG2_CCA_MODE_ALWAYS_CLEAR << CC1120_PKT_CFG2_CCA_MODE) |
+                                (CC1120_PKT_CFG2_PKT_FORMAT_SYNCHRONOUS_SERIAL << CC1120_PKT_CFG2_PKT_FORMAT)),
+       CC1120_IOCFG2,          CC1120_IOCFG_GPIO_CFG_CLKEN_SOFT,
+};
+
 /*
  * RDF deviation is 5kHz
  *
@@ -197,8 +329,8 @@ ao_radio_recv_abort(void)
  *
  * To make the tone last for 200ms, we need 2000 * .2 = 400 bits or 50 bytes
  */
-#define RDF_DRATE_E    6
-#define RDF_DRATE_M    511705
+#define RDF_DRATE_E    5
+#define RDF_DRATE_M    25166
 #define RDF_PACKET_LEN 50
 
 static const uint16_t rdf_setup[] = {
@@ -216,72 +348,165 @@ static const uint16_t rdf_setup[] = {
                                 (CC1120_PKT_CFG1_ADDR_CHECK_CFG_NONE << CC1120_PKT_CFG1_ADDR_CHECK_CFG) |
                                 (CC1120_PKT_CFG1_CRC_CFG_DISABLED << CC1120_PKT_CFG1_CRC_CFG) |
                                 (0 << CC1120_PKT_CFG1_APPEND_STATUS)),
+       CC1120_PKT_CFG0,        ((0 << CC1120_PKT_CFG0_RESERVED7) |
+                                (CC1120_PKT_CFG0_LENGTH_CONFIG_FIXED << CC1120_PKT_CFG0_LENGTH_CONFIG) |
+                                (0 << CC1120_PKT_CFG0_PKG_BIT_LEN) |
+                                (0 << CC1120_PKT_CFG0_UART_MODE_EN) |
+                                (0 << CC1120_PKT_CFG0_UART_SWAP_EN)),
 };
 
-#define int_pin(w)     printf("\t%s: %d\n", \
-                              w,\
-                              (AO_CC1120_INT_PORT.idr >> AO_CC1120_INT_PIN) & 1)
+static uint8_t ao_radio_mode;
 
-static uint8_t
-ao_radio_marc_status(void)
+#define AO_RADIO_MODE_BITS_PACKET      1
+#define AO_RADIO_MODE_BITS_PACKET_TX   2
+#define AO_RADIO_MODE_BITS_TX_BUF      4
+#define AO_RADIO_MODE_BITS_TX_FINISH   8
+#define AO_RADIO_MODE_BITS_PACKET_RX   16
+#define AO_RADIO_MODE_BITS_RDF         32
+
+#define AO_RADIO_MODE_NONE             0
+#define AO_RADIO_MODE_PACKET_TX_BUF    (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_PACKET_TX | AO_RADIO_MODE_BITS_TX_BUF)
+#define AO_RADIO_MODE_PACKET_TX_FINISH (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_PACKET_TX | AO_RADIO_MODE_BITS_TX_FINISH)
+#define AO_RADIO_MODE_PACKET_RX                (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_PACKET_RX)
+#define AO_RADIO_MODE_RDF              (AO_RADIO_MODE_BITS_RDF | AO_RADIO_MODE_BITS_TX_FINISH)
+
+static void
+ao_radio_set_mode(uint8_t new_mode)
 {
-       return ao_radio_reg_read(CC1120_MARC_STATUS1);
+       uint8_t changes;
+       int i;
+
+       if (new_mode == ao_radio_mode)
+               return;
+
+       changes = new_mode & (~ao_radio_mode);
+       if (changes & AO_RADIO_MODE_BITS_PACKET)
+               for (i = 0; i < sizeof (packet_setup) / sizeof (packet_setup[0]); i += 2)
+                       ao_radio_reg_write(packet_setup[i], packet_setup[i+1]);
+
+       if (changes & AO_RADIO_MODE_BITS_PACKET_TX)
+               for (i = 0; i < sizeof (packet_tx_setup) / sizeof (packet_tx_setup[0]); i += 2)
+                       ao_radio_reg_write(packet_tx_setup[i], packet_tx_setup[i+1]);
+               
+       if (changes & AO_RADIO_MODE_BITS_TX_BUF)
+               ao_radio_reg_write(CC1120_IOCFG2, CC1120_IOCFG_GPIO_CFG_TXFIFO_THR);
+
+       if (changes & AO_RADIO_MODE_BITS_TX_FINISH)
+               ao_radio_reg_write(CC1120_IOCFG2, CC1120_IOCFG_GPIO_CFG_RX0TX1_CFG);
+
+       if (changes & AO_RADIO_MODE_BITS_PACKET_RX)
+               for (i = 0; i < sizeof (packet_rx_setup) / sizeof (packet_rx_setup[0]); i += 2)
+                       ao_radio_reg_write(packet_rx_setup[i], packet_rx_setup[i+1]);
+               
+       if (changes & AO_RADIO_MODE_BITS_RDF)
+               for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
+                       ao_radio_reg_write(rdf_setup[i], rdf_setup[i+1]);
+       ao_radio_mode = new_mode;
 }
 
-static uint8_t
-ao_radio_tx_done(void)
+static const uint16_t radio_setup[] = {
+#include "ao_cc1120_CC1120.h"
+};
+
+static uint8_t ao_radio_configured = 0;
+
+static void
+ao_radio_setup(void)
 {
-       return ao_radio_marc_status() == CC1120_MARC_STATUS1_TX_FINISHED;
+       int     i;
+
+       ao_radio_strobe(CC1120_SRES);
+
+       for (i = 0; i < sizeof (radio_setup) / sizeof (radio_setup[0]); i += 2)
+               ao_radio_reg_write(radio_setup[i], radio_setup[i+1]);
+
+       ao_radio_mode = 0;
+
+       ao_config_get();
+
+       ao_radio_configured = 1;
 }
 
-static uint8_t
-ao_radio_rx_done(void)
+static void
+ao_radio_get(uint8_t len)
 {
-       return ao_radio_marc_status() == CC1120_MARC_STATUS1_RX_FINISHED;
+       static uint32_t last_radio_setting;
+       static uint8_t  last_len;
+
+       ao_mutex_get(&ao_radio_mutex);
+       if (!ao_radio_configured)
+               ao_radio_setup();
+       if (ao_config.radio_setting != last_radio_setting) {
+               ao_radio_reg_write(CC1120_FREQ2, ao_config.radio_setting >> 16);
+               ao_radio_reg_write(CC1120_FREQ1, ao_config.radio_setting >> 8);
+               ao_radio_reg_write(CC1120_FREQ0, ao_config.radio_setting);
+               last_radio_setting = ao_config.radio_setting;
+       }
+       if (len != last_len) {
+               ao_radio_reg_write(CC1120_PKT_LEN, len);
+               last_len = len;
+       }
 }
 
-void
-ao_radio_rdf(uint8_t len)
-{
-       int i;
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
-       ao_radio_get(len);
+static void
+ao_rdf_start(uint8_t len)
+{
        ao_radio_abort = 0;
-       for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
-               ao_radio_reg_write(rdf_setup[i], rdf_setup[i+1]);
-       ao_radio_reg_write(CC1120_PKT_LEN, len);
-       int_pin ("Before CFG");
-       ao_radio_reg_write(CC1120_IOCFG2, CC1120_IOCFG_GPIO_CFG_RX0TX1_CFG);
-       int_pin ("After CFG");
-       ao_radio_strobe(CC1120_STX);
-       ao_exti_enable(&AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
-       int_pin ("After strobe");
-       ao_delay(AO_MS_TO_TICKS(100));
-       ao_radio_fifo_write_fixed(ao_radio_rdf_value, len);
-       int_pin ("After delay");
+       ao_radio_get(len);
+
+       ao_radio_set_mode(AO_RADIO_MODE_RDF);
+       ao_radio_wake = 0;
+
+}
+
+static void
+ao_rdf_run(void)
+{
+       ao_radio_start_tx();
+
        cli();
-       for (i = 0; i < 20; i++) {
-#if CC1120_DEBUG
-               ao_delay(AO_MS_TO_TICKS(50));
-               int_pin ("Waited");
-               printf ("Status %02x num_tx_bytes %d marc status %x\n",
-                       ao_radio_status(),
-                       ao_radio_reg_read(CC1120_NUM_TXBYTES),
-                       ao_radio_marc_status());
-#else
+       while (!ao_radio_wake && !ao_radio_abort)
                ao_sleep(&ao_radio_wake);
-#endif
-       }
        sei();
-       printf ("num_tx_bytes %d marc status %x\n",
-               ao_radio_reg_read(CC1120_NUM_TXBYTES),
-               ao_radio_marc_status());
-       if (!ao_radio_tx_done())
+       if (!ao_radio_wake)
                ao_radio_idle();
-       ao_radio_set_packet();
        ao_radio_put();
 }
 
+void
+ao_radio_rdf(void)
+{
+       ao_rdf_start(AO_RADIO_RDF_LEN);
+
+       ao_radio_fifo_write_fixed(ao_radio_rdf_value, AO_RADIO_RDF_LEN);
+
+       ao_rdf_run();
+}
+
+void
+ao_radio_continuity(uint8_t c)
+{
+       uint8_t i;
+       uint8_t status;
+
+       ao_rdf_start(AO_RADIO_CONT_TOTAL_LEN);
+
+       status = ao_radio_fifo_write_start();
+       for (i = 0; i < 3; i++) {
+               ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
+               if (i < c)
+                       ao_radio_spi_send_fixed(ao_radio_rdf_value, AO_RADIO_CONT_TONE_LEN);
+               else
+                       ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_TONE_LEN);
+       }
+       ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
+       status = ao_radio_fifo_write_stop(status);
+       (void) status;
+       ao_rdf_run();
+}
+
 void
 ao_radio_rdf_abort(void)
 {
@@ -290,7 +515,7 @@ ao_radio_rdf_abort(void)
 }
 
 static void
-ao_radio_test(void)
+ao_radio_test_cmd(void)
 {
        uint8_t mode = 2;
        uint8_t radio_on;
@@ -309,7 +534,7 @@ ao_radio_test(void)
 #endif
                ao_radio_get(0xff);
                ao_radio_strobe(CC1120_STX);
-#if CC1120_DEBUG
+#if CC1120_TRACE
                { int t; 
                        for (t = 0; t < 10; t++) {
                                printf ("status: %02x\n", ao_radio_status());
@@ -335,166 +560,202 @@ ao_radio_test(void)
 }
 
 void
-ao_radio_send(void *d, uint8_t size)
+ao_radio_send(const void *d, uint8_t size)
 {
-       uint8_t marc_status;
+       uint8_t         marc_status;
+       static uint8_t  encode[256];
+       uint8_t         *e = encode;
+       uint8_t         encode_len;
+       uint8_t         this_len;
+       uint8_t         started = 0;
+       uint8_t         fifo_space;
+
+       encode_len = ao_fec_encode(d, size, encode);
+
+       ao_radio_get(encode_len);
+
+       started = 0;
+       fifo_space = CC1120_FIFO_SIZE;
+       while (encode_len) {
+               this_len = encode_len;
+
+               if (this_len > fifo_space) {
+                       this_len = fifo_space;
+                       ao_radio_set_mode(AO_RADIO_MODE_PACKET_TX_BUF);
+               } else {
+                       ao_radio_set_mode(AO_RADIO_MODE_PACKET_TX_FINISH);
+               }
 
-       ao_radio_get(size);
-       ao_radio_wake = 0;
-       ao_radio_fifo_write(d, size);
-       ao_exti_enable(&AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
-       ao_radio_strobe(CC1120_STX);
-       cli();
-       for (;;) {
-               if (ao_radio_wake) {
-                       marc_status = ao_radio_marc_status();
-                       if (marc_status != CC1120_MARC_STATUS1_NO_FAILURE)
-                               break;
+               ao_radio_fifo_write(e, this_len);
+               e += this_len;
+               encode_len -= this_len;
+
+               if (!started) {
+                       ao_radio_start_tx();
+                       started = 1;
+               } else {
+                       ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+               }
+                       
+               do {
                        ao_radio_wake = 0;
+                       cli();
+                       while (!ao_radio_wake)
+                               ao_sleep(&ao_radio_wake);
+                       sei();
+                       if (!encode_len)
+                               break;
+                       fifo_space = ao_radio_tx_fifo_space();
+               } while (!fifo_space);
+       }
+       ao_radio_put();
+}
+
+#define AO_RADIO_MAX_RECV      90
+
+static uint8_t rx_data[(AO_RADIO_MAX_RECV + 4) * 2 * 8];
+static uint16_t        rx_data_count;
+static uint16_t        rx_data_consumed;
+static uint16_t rx_data_cur;
+static uint8_t rx_ignore;
+static uint8_t rx_waiting;
+
+#if AO_PROFILE
+static uint32_t        rx_start_tick, rx_packet_tick, rx_done_tick, rx_last_done_tick;
+
+uint32_t       ao_rx_start_tick, ao_rx_packet_tick, ao_rx_done_tick, ao_rx_last_done_tick;
+
+#include <ao_profile.h>
+#endif
+
+static void
+ao_radio_rx_isr(void)
+{
+       uint8_t d;
+
+       d = stm_spi2.dr;
+       stm_spi2.dr = 0;
+       if (rx_ignore == 0) {
+               if (rx_data_cur >= rx_data_count)
+                       ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+               else
+                       rx_data[rx_data_cur++] = d;
+               if (rx_waiting && rx_data_cur - rx_data_consumed >= AO_FEC_DECODE_BLOCK) {
+#if AO_PROFILE
+                       if (!rx_packet_tick)
+                               rx_packet_tick = ao_profile_tick();
+                       if (rx_data_cur < rx_data_count)
+                               return;
+#endif
+                       rx_waiting = 0;
+                       ao_wakeup(&ao_radio_wake);
                }
+       } else {
+               --rx_ignore;
+       }
+}
+
+static uint16_t
+ao_radio_rx_wait(void)
+{
+       cli();
+       rx_waiting = 1;
+       while (rx_data_cur - rx_data_consumed < AO_FEC_DECODE_BLOCK &&
+              !ao_radio_abort) {
                ao_sleep(&ao_radio_wake);
        }
+       rx_waiting = 0;
        sei();
-       ao_radio_put();
+       if (ao_radio_abort)
+               return 0;
+       rx_data_consumed += AO_FEC_DECODE_BLOCK;
+#if AO_PROFILE
+       return rx_data_cur - rx_data_consumed;
+#endif
+       return AO_FEC_DECODE_BLOCK;
 }
 
 uint8_t
 ao_radio_recv(__xdata void *d, uint8_t size)
 {
-       uint8_t marc_status = CC1120_MARC_STATUS1_NO_FAILURE;
+       uint8_t         len;
+       uint16_t        i;
+       uint8_t         rssi;
+       uint8_t         ret;
+       static int been_here = 0;
+
+       size -= 2;                      /* status bytes */
+       if (size > AO_RADIO_MAX_RECV) {
+               ao_delay(AO_SEC_TO_TICKS(1));
+               return 0;
+       }
+#if AO_PROFILE
+       rx_start_tick = ao_profile_tick();
+       rx_packet_tick = 0;
+#endif
+       len = size + 2;                 /* CRC bytes */
+       len += 1 + ~(len & 1);          /* 1 or two pad bytes */
+       len *= 2;                       /* 1/2 rate convolution */
+       rx_data_count = len * 8;        /* bytes to bits */
+       rx_data_cur = 0;
+       rx_data_consumed = 0;
+       rx_ignore = 2;
 
+       ao_radio_abort = 0;
+       ao_radio_in_recv = 1;
        /* configure interrupt pin */
-       ao_radio_get(size);
+       ao_radio_get(len);
+       ao_radio_set_mode(AO_RADIO_MODE_PACKET_RX);
+
        ao_radio_wake = 0;
-       ao_exti_enable(&AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
-       ao_radio_strobe(CC1120_SRX);
-       cli();
-       for (;;) {
-               if (ao_radio_abort)
-                       break;
-               if (ao_radio_wake) {
-                       marc_status = ao_radio_marc_status();
-                       if (marc_status != CC1120_MARC_STATUS1_NO_FAILURE)
-                               break;
-                       ao_radio_wake = 0;
-               }
-               ao_sleep(&ao_radio_wake);
-       }
-       sei();
-       if (marc_status != CC1120_MARC_STATUS1_RX_FINISHED)
-               ao_radio_fifo_read(d, size);
-       ao_radio_put();
-       return marc_status == CC1120_MARC_STATUS1_RX_FINISHED;
-}
 
-/*
- * Packet deviation is 20.5kHz
- *
- *     fdev = fosc >> 24 * (256 + dev_m) << dev_e
- *
- *             32e6Hz / (2 ** 24) * (256 + 80) * (2 ** 5) = 20508Hz
- */
+       stm_spi2.cr2 = 0;
 
-#define PACKET_DEV_E   5
-#define PACKET_DEV_M   80
+       /* clear any RXNE */
+       (void) stm_spi2.dr;
 
-/*
- * For our packet data, set the symbol rate to 38360 Baud
- *
- *              (2**20 - DATARATE_M) * 2 ** DATARATE_E
- *     Rdata = -------------------------------------- * fosc
- *                          2 ** 39
- *
- *     DATARATE_M = 405002
- *     DATARATE_E = 10
- *
- * To make the tone last for 200ms, we need 2000 * .2 = 400 bits or 50 bytes
- */
-#define PACKET_DRATE_E 10
-#define PACKET_DRATE_M 405002
+       ao_exti_set_callback(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, ao_radio_rx_isr);
+       ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
 
-static const uint16_t packet_setup[] = {
-       CC1120_DEVIATION_M,     PACKET_DEV_M,
-       CC1120_MODCFG_DEV_E,    ((CC1120_MODCFG_DEV_E_MODEM_MODE_NORMAL << CC1120_MODCFG_DEV_E_MODEM_MODE) |
-                                (CC1120_MODCFG_DEV_E_MOD_FORMAT_2_GFSK << CC1120_MODCFG_DEV_E_MOD_FORMAT) |
-                                (PACKET_DEV_E << CC1120_MODCFG_DEV_E_DEV_E)),
-       CC1120_DRATE2,          ((PACKET_DRATE_E << CC1120_DRATE2_DATARATE_E) |
-                                (((PACKET_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
-       CC1120_DRATE1,          ((PACKET_DRATE_M >> 8) & 0xff),
-       CC1120_DRATE0,          ((PACKET_DRATE_M >> 0) & 0xff),
-       CC1120_PKT_CFG2,        ((CC1120_PKT_CFG2_CCA_MODE_ALWAYS_CLEAR << CC1120_PKT_CFG2_CCA_MODE) |
-                                (CC1120_PKT_CFG2_PKT_FORMAT_NORMAL << CC1120_PKT_CFG2_PKT_FORMAT)),
-       CC1120_PKT_CFG1,        ((1 << CC1120_PKT_CFG1_WHITE_DATA) |
-                                (CC1120_PKT_CFG1_ADDR_CHECK_CFG_NONE << CC1120_PKT_CFG1_ADDR_CHECK_CFG) |
-                                (CC1120_PKT_CFG1_CRC_CFG_DISABLED << CC1120_PKT_CFG1_CRC_CFG) |
-                                (1 << CC1120_PKT_CFG1_APPEND_STATUS)),
-};
+       ao_radio_strobe(CC1120_SRX);
 
-void
-ao_radio_set_packet(void)
-{
-       int i;
+       ao_radio_burst_read_start(CC1120_SOFT_RX_DATA_OUT);
 
-       for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
-               ao_radio_reg_write(packet_setup[i], packet_setup[i+1]);
-}
+       ret = ao_fec_decode(rx_data, rx_data_count, d, size + 2, ao_radio_rx_wait);
 
-void
-ao_radio_idle(void)
-{
-       for (;;) {
-               uint8_t state = ao_radio_strobe(CC1120_SIDLE);
-               if ((state >> CC1120_STATUS_STATE) == CC1120_STATUS_STATE_IDLE)
-                       break;
-       }
-       ao_radio_strobe(CC1120_SFTX);
-       ao_radio_strobe(CC1120_SFRX);
-}
+       ao_radio_burst_read_stop();
 
-static const uint16_t radio_setup[] = {
-#include "ao_cc1120_CC1120.h"
-};
+       ao_radio_strobe(CC1120_SIDLE);
 
-static uint8_t ao_radio_configured = 0;
+       /* Convert from 'real' rssi to cc1111-style values */
 
-static void
-ao_radio_isr(void)
-{
-       ao_exti_disable(&AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
-       ao_radio_wake = 1;
-       ao_wakeup(&ao_radio_wake);
-}
+       rssi = AO_RADIO_FROM_RSSI(ao_radio_reg_read(CC1120_RSSI1));
 
-static void
-ao_radio_setup(void)
-{
-       int     i;
+       ao_radio_put();
 
-       ao_radio_strobe(CC1120_SRES);
+       /* Store the received RSSI value; the crc-OK byte is already done */
 
-       for (i = 0; i < sizeof (radio_setup) / sizeof (radio_setup[0]); i += 2)
-               ao_radio_reg_write(radio_setup[i], radio_setup[i+1]);
+       ((uint8_t *) d)[size] = (uint8_t) rssi;
 
-       /* Enable marc status interrupt on gpio 2 pin */
-       ao_radio_reg_write(CC1120_IOCFG2, CC1120_IOCFG_GPIO_CFG_MARC_MCU_WAKEUP);
+       ao_radio_in_recv = 0;
 
-       /* Enable the EXTI interrupt for the appropriate pin */
-       ao_enable_port(AO_CC1120_INT_PORT);
-       ao_exti_setup(&AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, AO_EXTI_MODE_FALLING, ao_radio_isr);
+       if (ao_radio_abort)
+               ao_delay(1);
 
-       ao_radio_set_packet();
-       ao_radio_configured = 1;
-}
+#if AO_PROFILE
+       rx_last_done_tick = rx_done_tick;
+       rx_done_tick = ao_profile_tick();
 
-void
-ao_radio_get(uint8_t len)
-{
-       ao_mutex_get(&ao_radio_mutex);
-       if (!ao_radio_configured)
-               ao_radio_setup();
-       ao_radio_reg_write(CC1120_PKT_LEN, len);
+       ao_rx_start_tick = rx_start_tick;
+       ao_rx_packet_tick = rx_packet_tick;
+       ao_rx_done_tick = rx_done_tick;
+       ao_rx_last_done_tick = rx_last_done_tick;
+#endif
+
+       return ret;
 }
 
+
 #if CC1120_DEBUG
 static char *cc1120_state_name[] = {
        [CC1120_STATUS_STATE_IDLE] = "IDLE",
@@ -708,16 +969,51 @@ static void ao_radio_show(void) {
 }
 
 static void ao_radio_beep(void) {
-       ao_radio_rdf(120);
+       ao_radio_rdf(RDF_PACKET_LEN);
+}
+
+static void ao_radio_packet(void) {
+       static const uint8_t packet[] = {
+#if 1
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+#else
+               3, 1, 2, 3
+#endif
+       };
+
+       ao_radio_send(packet, sizeof (packet));
+}
+
+void
+ao_radio_test_recv()
+{
+       uint8_t bytes[34];
+       uint8_t b;
+
+       if (ao_radio_recv(bytes, 34)) {
+               if (bytes[33] & 0x80)
+                       printf ("CRC OK");
+               else
+                       printf ("CRC BAD");
+               printf (" RSSI %d", AO_RSSI_FROM_RADIO(bytes[32]));
+               for (b = 0; b < 32; b++)
+                       printf (" %02x", bytes[b]);
+               printf ("\n");
+       }
 }
 
 #endif
 
 static const struct ao_cmds ao_radio_cmds[] = {
-       { ao_radio_test,        "C <1 start, 0 stop, none both>\0Radio carrier test" },
+       { ao_radio_test_cmd,    "C <1 start, 0 stop, none both>\0Radio carrier test" },
 #if CC1120_DEBUG
        { ao_radio_show,        "R\0Show CC1120 status" },
-       { ao_radio_beep,        "B\0Emit an RDF beacon" },
+       { ao_radio_beep,        "b\0Emit an RDF beacon" },
+       { ao_radio_packet,      "p\0Send a test packet" },
+       { ao_radio_test_recv,   "q\0Recv a test packet" },
 #endif
        { 0, NULL }
 };
@@ -725,8 +1021,25 @@ static const struct ao_cmds ao_radio_cmds[] = {
 void
 ao_radio_init(void)
 {
+       int     i;
+
        ao_radio_configured = 0;
        ao_spi_init_cs (AO_CC1120_SPI_CS_PORT, (1 << AO_CC1120_SPI_CS_PIN));
 
+       AO_CC1120_SPI_CS_PORT->bsrr = ((uint32_t) (1 << AO_CC1120_SPI_CS_PIN));
+       for (i = 0; i < 10000; i++) {
+               if ((SPI_2_PORT->idr & (1 << SPI_2_MISO_PIN)) == 0)
+                       break;
+       }
+       AO_CC1120_SPI_CS_PORT->bsrr = (1 << AO_CC1120_SPI_CS_PIN);
+       if (i == 10000)
+               ao_panic(AO_PANIC_SELF_TEST_CC1120);
+
+       /* Enable the EXTI interrupt for the appropriate pin */
+       ao_enable_port(AO_CC1120_INT_PORT);
+       ao_exti_setup(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN,
+                     AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH,
+                     ao_radio_tx_isr);
+
        ao_cmd_register(&ao_radio_cmds[0]);
 }