Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos] / src / drivers / ao_cc1120.c
index 7654af856a624b0b55c76b238ad55354317239e1..5b814667fccf8f18e67d9e7aec557489bfae915a 100644 (file)
 #define AO_RADIO_MAX_RECV      sizeof(struct ao_packet)
 #define AO_RADIO_MAX_SEND      sizeof(struct ao_packet)
 
-uint8_t ao_radio_wake;
-uint8_t ao_radio_mutex;
-uint8_t ao_radio_abort;
-uint8_t ao_radio_in_recv;
+static uint8_t ao_radio_mutex;
+
+static uint8_t ao_radio_wake;          /* radio ready. Also used as sleep address */
+static uint8_t ao_radio_abort;         /* radio operation should abort */
+static uint8_t ao_radio_mcu_wake;      /* MARC status change */
+static uint8_t ao_radio_marc_status;   /* Last read MARC status value */
+static uint8_t ao_radio_tx_finished;   /* MARC status indicates TX finished */
+
+int8_t ao_radio_rssi;                  /* Last received RSSI value */
 
 #define CC1120_DEBUG   AO_FEC_DEBUG
 #define CC1120_TRACE   0
@@ -36,8 +41,10 @@ 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,AO_SPI_SPEED_1MHz)
+#define ao_radio_try_select(task_id)   ao_spi_try_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_4MHz, task_id)
+#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_4MHz)
 #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_sync(d,l)    ao_spi_send_sync((d), (l), 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)
 #define ao_radio_spi_recv(d,l) ao_spi_recv((d), (l), AO_CC1120_SPI_BUS)
@@ -102,7 +109,7 @@ ao_radio_reg_write(uint16_t addr, uint8_t value)
 }
 
 static void
-ao_radio_burst_read_start (uint16_t addr)
+_ao_radio_burst_read_start (uint16_t addr)
 {
        uint8_t data[2];
        uint8_t d;
@@ -119,8 +126,8 @@ ao_radio_burst_read_start (uint16_t addr)
                           addr);
                d = 1;
        }
-       ao_radio_select();
-       ao_radio_spi_send(data, d);
+
+       ao_radio_spi_send_sync(data, d);
 }
 
 static void
@@ -147,6 +154,7 @@ ao_radio_strobe(uint8_t addr)
        return in;
 }
 
+#if 0
 static uint8_t
 ao_radio_fifo_read(uint8_t *data, uint8_t len)
 {
@@ -161,6 +169,7 @@ ao_radio_fifo_read(uint8_t *data, uint8_t len)
        ao_radio_deselect();
        return status;
 }
+#endif
 
 static uint8_t
 ao_radio_fifo_write_start(void)
@@ -202,11 +211,13 @@ ao_radio_tx_fifo_space(void)
        return CC1120_FIFO_SIZE - ao_radio_reg_read(CC1120_NUM_TXBYTES);
 }
 
+#if CC1120_DEBUG
 static uint8_t
 ao_radio_status(void)
 {
        return ao_radio_strobe (CC1120_SNOP);
 }
+#endif
 
 void
 ao_radio_recv_abort(void)
@@ -218,13 +229,34 @@ ao_radio_recv_abort(void)
 #define ao_radio_rdf_value 0x55
 
 static uint8_t
-ao_radio_marc_status(void)
+ao_radio_get_marc_status(void)
 {
        return ao_radio_reg_read(CC1120_MARC_STATUS1);
 }
 
 static void
-ao_radio_tx_isr(void)
+ao_radio_mcu_wakeup_isr(void)
+{
+       ao_radio_mcu_wake = 1;
+       ao_wakeup(&ao_radio_wake);
+}
+
+
+static void
+ao_radio_check_marc_status(void)
+{
+       ao_radio_mcu_wake = 0;
+       ao_radio_marc_status = ao_radio_get_marc_status();
+
+       /* Anyt other than 'tx/rx finished' means an error occurred */
+       if (ao_radio_marc_status & ~(CC1120_MARC_STATUS1_TX_FINISHED|CC1120_MARC_STATUS1_RX_FINISHED))
+               ao_radio_abort = 1;
+       if (ao_radio_marc_status & (CC1120_MARC_STATUS1_TX_FINISHED))
+               ao_radio_tx_finished = 1;
+}
+
+static void
+ao_radio_isr(void)
 {
        ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
        ao_radio_wake = 1;
@@ -234,8 +266,10 @@ ao_radio_tx_isr(void)
 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_set_callback(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, ao_radio_isr);
        ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+       ao_exti_enable(AO_CC1120_MCU_WAKEUP_PORT, AO_CC1120_MCU_WAKEUP_PIN);
+       ao_radio_tx_finished = 0;
        ao_radio_strobe(CC1120_STX);
 }
 
@@ -243,44 +277,102 @@ static void
 ao_radio_idle(void)
 {
        for (;;) {
-               uint8_t state = ao_radio_strobe(CC1120_SIDLE);
-               if ((state >> CC1120_STATUS_STATE) == CC1120_STATUS_STATE_IDLE)
+               uint8_t state = (ao_radio_strobe(CC1120_SIDLE) >> CC1120_STATUS_STATE) & CC1120_STATUS_STATE_MASK;
+               if (state == CC1120_STATUS_STATE_IDLE)
                        break;
+               if (state == CC1120_STATUS_STATE_TX_FIFO_ERROR)
+                       ao_radio_strobe(CC1120_SFTX);
+               if (state == CC1120_STATUS_STATE_RX_FIFO_ERROR)
+                       ao_radio_strobe(CC1120_SFRX);
        }
+       /* Flush any pending TX bytes */
+       ao_radio_strobe(CC1120_SFTX);
 }
 
 /*
- * Packet deviation is 20.5kHz
+ * Packet deviation
  *
  *     fdev = fosc >> 24 * (256 + dev_m) << dev_e
  *
+ * Deviation for 38400 baud should be 20.5kHz:
+ *
  *             32e6Hz / (2 ** 24) * (256 + 80) * (2 ** 5) = 20508Hz
+ *
+ * Deviation for 9600 baud should be 5.125kHz:
+ *
+ *             32e6Hz / (2 ** 24) * (256 + 80) * (2 ** 3) = 5127Hz
+ *
+ * Deviation for 2400 baud should be 1.28125kHz, but cc1111 and
+ * cc115l can't do that, so we'll use 1.5kHz instead:
+ *
+ *             32e6Hz / (2 ** 24) * (256 + 137) * (2 ** 1) = 1499Hz
  */
 
-#define PACKET_DEV_E   5
-#define PACKET_DEV_M   80
+#define PACKET_DEV_M_384       80
+#define PACKET_DEV_E_384       5
+
+#define PACKET_DEV_M_96                80
+#define PACKET_DEV_E_96                3
+
+#define PACKET_DEV_M_24                137
+#define PACKET_DEV_E_24                1
 
 /*
- * For our packet data, set the symbol rate to 38400 Baud
+ * For our packet data
  *
  *              (2**20 + DATARATE_M) * 2 ** DATARATE_E
  *     Rdata = -------------------------------------- * fosc
  *                          2 ** 39
  *
+ * Given the bit period of the baseband, T, the bandwidth of the
+ * baseband signal is B = 1/(2T).  The overall bandwidth of the
+ * modulated signal is then Channel bandwidth = 2Δf + 2B.
+ *
+ * 38400 -- 2 * 20500 + 38400 = 79.4 kHz
+ *  9600 -- 2 * 5.125 +  9600 = 19.9 kHz
+ *  2400 -- 2 * 1.5   +  2400 =  5.4 khz
+ *
+ * Symbol rate 38400 Baud:
  *
  *     DATARATE_M = 239914
  *     DATARATE_E = 9
+ *     CHANBW = 79.4 (round to 100)
+ *
+ * Symbol rate 9600 Baud:
+ *
+ *     DATARATE_M = 239914
+ *     DATARATE_E = 7
+ *     CHANBW = 19.9 (round to 20)
+ *
+ * Symbol rate 2400 Baud:
+ *
+ *     DATARATE_M = 239914
+ *     DATARATE_E = 5
+ *     CHANBW = 5.0 (round to 8.0)
  */
-#define PACKET_DRATE_E 9
+
 #define PACKET_DRATE_M 239914
 
+#define PACKET_DRATE_E_384     9
+
+/* 200 / 2 = 100 */
+#define PACKET_CHAN_BW_384     ((0 << CC1120_CHAN_BW_CHFILT_BYPASS) | \
+                                (CC1120_CHAN_BW_ADC_CIC_DECFACT_20 << CC1120_CHAN_BW_ADC_CIC_DECFACT) | \
+                                (2 << CC1120_CHAN_BW_BB_CIC_DECFACT))
+
+#define PACKET_DRATE_E_96      7
+/* 200 / 10 = 20 */
+#define PACKET_CHAN_BW_96      ((0 << CC1120_CHAN_BW_CHFILT_BYPASS) | \
+                                (CC1120_CHAN_BW_ADC_CIC_DECFACT_20 << CC1120_CHAN_BW_ADC_CIC_DECFACT) | \
+                                (10 << CC1120_CHAN_BW_BB_CIC_DECFACT))
+
+#define PACKET_DRATE_E_24      5
+/* 200 / 25 = 8 */
+#define PACKET_CHAN_BW_24      ((0 << CC1120_CHAN_BW_CHFILT_BYPASS) | \
+                                (CC1120_CHAN_BW_ADC_CIC_DECFACT_20 << CC1120_CHAN_BW_ADC_CIC_DECFACT) | \
+                                (25 << CC1120_CHAN_BW_BB_CIC_DECFACT))
+
 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) |
@@ -294,18 +386,54 @@ static const uint16_t packet_setup[] = {
                                 (0 << CC1120_PKT_CFG0_PKG_BIT_LEN) |
                                 (0 << CC1120_PKT_CFG0_UART_MODE_EN) |
                                 (0 << CC1120_PKT_CFG0_UART_SWAP_EN)),
+        CC1120_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_4_BYTES << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+                                (CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD)),
+       AO_CC1120_MARC_GPIO_IOCFG,              CC1120_IOCFG_GPIO_CFG_MARC_MCU_WAKEUP,
+};
+
+static const uint16_t packet_setup_384[] = {
+       CC1120_DEVIATION_M,     PACKET_DEV_M_384,
+       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_384 << CC1120_MODCFG_DEV_E_DEV_E)),
+       CC1120_DRATE2,          ((PACKET_DRATE_E_384 << CC1120_DRATE2_DATARATE_E) |
+                                (((PACKET_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
+       CC1120_CHAN_BW,         PACKET_CHAN_BW_384,
+       CC1120_PA_CFG0,         0x7b,
+};
+
+static const uint16_t packet_setup_96[] = {
+       CC1120_DEVIATION_M,     PACKET_DEV_M_96,
+       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_96 << CC1120_MODCFG_DEV_E_DEV_E)),
+       CC1120_DRATE2,          ((PACKET_DRATE_E_96 << CC1120_DRATE2_DATARATE_E) |
+                                (((PACKET_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
+       CC1120_CHAN_BW,         PACKET_CHAN_BW_96,
+       CC1120_PA_CFG0,         0x7d,
+};
+
+static const uint16_t packet_setup_24[] = {
+       CC1120_DEVIATION_M,     PACKET_DEV_M_24,
+       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_24 << CC1120_MODCFG_DEV_E_DEV_E)),
+       CC1120_DRATE2,          ((PACKET_DRATE_E_24 << CC1120_DRATE2_DATARATE_E) |
+                                (((PACKET_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
+       CC1120_CHAN_BW,         PACKET_CHAN_BW_24,
+       CC1120_PA_CFG0,         0x7e,
 };
 
 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,
+       AO_CC1120_INT_GPIO_IOCFG,               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,
+       AO_CC1120_INT_GPIO_IOCFG,               CC1120_IOCFG_GPIO_CFG_CLKEN_SOFT,
 };
 
 /*
@@ -356,19 +484,21 @@ static const uint16_t rdf_setup[] = {
                                 (0 << CC1120_PKT_CFG0_PKG_BIT_LEN) |
                                 (0 << CC1120_PKT_CFG0_UART_MODE_EN) |
                                 (0 << CC1120_PKT_CFG0_UART_SWAP_EN)),
+        CC1120_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_NONE << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+                                (CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD)),
+       CC1120_PA_CFG0,         0x7e,
 };
 
 /*
- * APRS deviation is 5kHz
+ * APRS deviation is 3kHz
  *
  *     fdev = fosc >> 24 * (256 + dev_m) << dev_e
  *
- *             32e6Hz / (2 ** 24) * (256 + 71) * (2 ** 3) = 4989
+ *             32e6Hz / (2 ** 24) * (256 + 137) * (2 ** 2) = 2998Hz
  */
 
-#define APRS_DEV_E     3
-#define APRS_DEV_M     71
-#define APRS_PACKET_LEN        50
+#define APRS_DEV_E     2
+#define APRS_DEV_M     137
 
 /*
  * For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
@@ -401,6 +531,34 @@ static const uint16_t aprs_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_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_NONE << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+                                (CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD)),
+       CC1120_PA_CFG0,         0x7d,
+};
+
+/*
+ * For Test mode, we want an unmodulated carrier. To do that, we
+ * set the deviation to zero and enable a preamble so that the radio
+ * turns on before we send any data
+ */
+
+static const uint16_t test_setup[] = {
+       CC1120_DEVIATION_M,     0,
+       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) |
+                                (0 << CC1120_MODCFG_DEV_E_DEV_E)),
+       CC1120_DRATE2,          ((APRS_DRATE_E << CC1120_DRATE2_DATARATE_E) |
+                                (((APRS_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
+       CC1120_DRATE1,          ((APRS_DRATE_M >> 8) & 0xff),
+       CC1120_DRATE0,          ((APRS_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_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_4_BYTES << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+                                (CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD)),
 };
 
 #define AO_PKT_CFG0_INFINITE ((0 << CC1120_PKT_CFG0_RESERVED7) |       \
@@ -424,8 +582,9 @@ static uint16_t ao_radio_mode;
 #define AO_RADIO_MODE_BITS_PACKET_RX   16
 #define AO_RADIO_MODE_BITS_RDF         32
 #define AO_RADIO_MODE_BITS_APRS                64
-#define AO_RADIO_MODE_BITS_INFINITE    128
-#define AO_RADIO_MODE_BITS_FIXED       256
+#define AO_RADIO_MODE_BITS_TEST                128
+#define AO_RADIO_MODE_BITS_INFINITE    256
+#define AO_RADIO_MODE_BITS_FIXED       512
 
 #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)
@@ -435,42 +594,68 @@ static uint16_t ao_radio_mode;
 #define AO_RADIO_MODE_APRS_BUF         (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_INFINITE | AO_RADIO_MODE_BITS_TX_BUF)
 #define AO_RADIO_MODE_APRS_LAST_BUF    (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_BUF)
 #define AO_RADIO_MODE_APRS_FINISH      (AO_RADIO_MODE_BITS_APRS | AO_RADIO_MODE_BITS_FIXED | AO_RADIO_MODE_BITS_TX_FINISH)
+#define AO_RADIO_MODE_TEST             (AO_RADIO_MODE_BITS_TEST | AO_RADIO_MODE_BITS_INFINITE | AO_RADIO_MODE_BITS_TX_BUF)
+
+static void
+_ao_radio_set_regs(const uint16_t *regs, int nreg)
+{
+       int i;
+
+       for (i = 0; i < nreg; i++) {
+               ao_radio_reg_write(regs[0], regs[1]);
+               regs += 2;
+       }
+}
+
+#define ao_radio_set_regs(setup) _ao_radio_set_regs(setup, (sizeof (setup) / sizeof(setup[0])) >> 1)
 
 static void
 ao_radio_set_mode(uint16_t new_mode)
 {
        uint16_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) {
+               ao_radio_set_regs(packet_setup);
+
+               switch (ao_config.radio_rate) {
+               default:
+               case AO_RADIO_RATE_38400:
+                       ao_radio_set_regs(packet_setup_384);
+                       break;
+               case AO_RADIO_RATE_9600:
+                       ao_radio_set_regs(packet_setup_96);
+                       break;
+               case AO_RADIO_RATE_2400:
+                       ao_radio_set_regs(packet_setup_24);
+                       break;
+               }
+       }
 
        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]);
-               
+               ao_radio_set_regs(packet_tx_setup);
+
        if (changes & AO_RADIO_MODE_BITS_TX_BUF)
-               ao_radio_reg_write(CC1120_IOCFG2, CC1120_IOCFG_GPIO_CFG_TXFIFO_THR);
+               ao_radio_reg_write(AO_CC1120_INT_GPIO_IOCFG, 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);
+               ao_radio_reg_write(AO_CC1120_INT_GPIO_IOCFG, 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]);
-               
+               ao_radio_set_regs(packet_rx_setup);
+
        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_set_regs(rdf_setup);
 
        if (changes & AO_RADIO_MODE_BITS_APRS)
-               for (i = 0; i < sizeof (aprs_setup) / sizeof (aprs_setup[0]); i += 2)
-                       ao_radio_reg_write(aprs_setup[i], aprs_setup[i+1]);
+               ao_radio_set_regs(aprs_setup);
+
+       if (changes & AO_RADIO_MODE_BITS_TEST)
+               ao_radio_set_regs(test_setup);
 
        if (changes & AO_RADIO_MODE_BITS_INFINITE)
                ao_radio_reg_write(CC1120_PKT_CFG0, AO_PKT_CFG0_INFINITE);
@@ -490,12 +675,9 @@ static uint8_t     ao_radio_configured = 0;
 static void
 ao_radio_setup(void)
 {
-       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_set_regs(radio_setup);
 
        ao_radio_mode = 0;
 
@@ -519,8 +701,10 @@ static void
 ao_radio_get(uint8_t len)
 {
        static uint32_t last_radio_setting;
+       static uint8_t  last_radio_rate;
 
        ao_mutex_get(&ao_radio_mutex);
+
        if (!ao_radio_configured)
                ao_radio_setup();
        if (ao_config.radio_setting != last_radio_setting) {
@@ -529,6 +713,10 @@ ao_radio_get(uint8_t len)
                ao_radio_reg_write(CC1120_FREQ0, ao_config.radio_setting);
                last_radio_setting = ao_config.radio_setting;
        }
+       if (ao_config.radio_rate != last_radio_rate) {
+               ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET;
+               last_radio_rate = ao_config.radio_rate;
+       }
        ao_radio_set_len(len);
 }
 
@@ -551,9 +739,11 @@ ao_rdf_run(void)
        ao_radio_start_tx();
 
        ao_arch_block_interrupts();
-       while (!ao_radio_wake && !ao_radio_abort)
+       while (!ao_radio_wake && !ao_radio_abort && !ao_radio_mcu_wake)
                ao_sleep(&ao_radio_wake);
        ao_arch_release_interrupts();
+       if (ao_radio_mcu_wake)
+               ao_radio_check_marc_status();
        if (!ao_radio_wake)
                ao_radio_idle();
        ao_radio_put();
@@ -617,9 +807,10 @@ ao_radio_test_cmd(void)
                ao_packet_slave_stop();
 #endif
                ao_radio_get(0xff);
+               ao_radio_set_mode(AO_RADIO_MODE_TEST);
                ao_radio_strobe(CC1120_STX);
 #if CC1120_TRACE
-               { int t; 
+               { int t;
                        for (t = 0; t < 10; t++) {
                                printf ("status: %02x\n", ao_radio_status());
                                ao_delay(AO_MS_TO_TICKS(100));
@@ -644,13 +835,15 @@ ao_radio_test_cmd(void)
 }
 
 static void
-ao_radio_wait_isr(void)
+ao_radio_wait_isr(uint16_t timeout)
 {
-       ao_radio_wake = 0;
        ao_arch_block_interrupts();
-       while (!ao_radio_wake)
-               ao_sleep(&ao_radio_wake);
+       while (!ao_radio_wake && !ao_radio_mcu_wake && !ao_radio_abort)
+               if (ao_sleep_for(&ao_radio_wake, timeout))
+                       ao_radio_abort = 1;
        ao_arch_release_interrupts();
+       if (ao_radio_mcu_wake)
+               ao_radio_check_marc_status();
 }
 
 static uint8_t
@@ -659,11 +852,11 @@ ao_radio_wait_tx(uint8_t wait_fifo)
        uint8_t fifo_space = 0;
 
        do {
-               ao_radio_wait_isr();
+               ao_radio_wait_isr(0);
                if (!wait_fifo)
                        return 0;
                fifo_space = ao_radio_tx_fifo_space();
-       } while (!fifo_space);
+       } while (!fifo_space && !ao_radio_abort);
        return fifo_space;
 }
 
@@ -672,7 +865,6 @@ static uint8_t      tx_data[(AO_RADIO_MAX_SEND + 4) * 2];
 void
 ao_radio_send(const void *d, uint8_t size)
 {
-       uint8_t         marc_status;
        uint8_t         *e = tx_data;
        uint8_t         encode_len;
        uint8_t         this_len;
@@ -683,11 +875,17 @@ ao_radio_send(const void *d, uint8_t size)
 
        ao_radio_get(encode_len);
 
+       ao_radio_abort = 0;
+
+       /* Flush any pending TX bytes */
+       ao_radio_strobe(CC1120_SFTX);
+
        started = 0;
        fifo_space = CC1120_FIFO_SIZE;
        while (encode_len) {
                this_len = encode_len;
 
+               ao_radio_wake = 0;
                if (this_len > fifo_space) {
                        this_len = fifo_space;
                        ao_radio_set_mode(AO_RADIO_MODE_PACKET_TX_BUF);
@@ -705,16 +903,22 @@ ao_radio_send(const void *d, uint8_t size)
                } else {
                        ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
                }
-                       
+
                fifo_space = ao_radio_wait_tx(encode_len != 0);
+               if (ao_radio_abort) {
+                       ao_radio_idle();
+                       break;
+               }
        }
+       while (started && !ao_radio_abort && !ao_radio_tx_finished)
+               ao_radio_wait_isr(0);
        ao_radio_put();
 }
 
 #define AO_RADIO_LOTS  64
 
 void
-ao_radio_send_lots(ao_radio_fill_func fill)
+ao_radio_send_aprs(ao_radio_fill_func fill)
 {
        uint8_t buf[AO_RADIO_LOTS], *b;
        int     cnt;
@@ -742,13 +946,12 @@ ao_radio_send_lots(ao_radio_fill_func fill)
                        uint8_t this_len = cnt;
 
                        /* Wait for some space in the fifo */
-                       while ((fifo_space = ao_radio_tx_fifo_space()) == 0) {
+                       while (!ao_radio_abort && (fifo_space = ao_radio_tx_fifo_space()) == 0) {
                                ao_radio_wake = 0;
-                               ao_arch_block_interrupts();
-                               while (!ao_radio_wake)
-                                       ao_sleep(&ao_radio_wake);
-                               ao_arch_release_interrupts();
+                               ao_radio_wait_isr(0);
                        }
+                       if (ao_radio_abort)
+                               break;
                        if (this_len > fifo_space)
                                this_len = fifo_space;
 
@@ -771,8 +974,13 @@ ao_radio_send_lots(ao_radio_fill_func fill)
                        } else
                                ao_exti_enable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
                }
+               if (ao_radio_abort) {
+                       ao_radio_idle();
+                       break;
+               }
                /* Wait for the transmitter to go idle */
-               ao_radio_wait_isr();
+               ao_radio_wake = 0;
+               ao_radio_wait_isr(0);
        }
        ao_radio_put();
 }
@@ -783,6 +991,11 @@ static uint16_t    rx_data_consumed;
 static uint16_t rx_data_cur;
 static uint8_t rx_ignore;
 static uint8_t rx_waiting;
+static uint8_t rx_starting;
+static uint8_t rx_task_id;
+static uint32_t        rx_fast_start;
+static uint32_t rx_slow_start;
+static uint32_t        rx_missed;
 
 #if AO_PROFILE
 static uint32_t        rx_start_tick, rx_packet_tick, rx_done_tick, rx_last_done_tick;
@@ -797,13 +1010,34 @@ ao_radio_rx_isr(void)
 {
        uint8_t d;
 
-       d = stm_spi2.dr;
-       stm_spi2.dr = 0;
+       if (rx_task_id) {
+               if (ao_radio_try_select(rx_task_id)) {
+                       ++rx_fast_start;
+                       rx_task_id = 0;
+                       _ao_radio_burst_read_start(CC1120_SOFT_RX_DATA_OUT);
+               } else {
+                       if (rx_ignore)
+                               --rx_ignore;
+                       else {
+                               ao_radio_abort = 1;
+                               rx_missed++;
+                       }
+                       return;
+               }
+       }
+       if (rx_starting) {
+               rx_starting = 0;
+               ao_wakeup(&ao_radio_wake);
+       }
+       d = AO_CC1120_SPI.dr;
+       AO_CC1120_SPI.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
+               if (rx_data_cur < rx_data_count)
                        rx_data[rx_data_cur++] = d;
+               if (rx_data_cur >= rx_data_count) {
+                       ao_spi_clr_cs(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN));
+                       ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
+               }
                if (rx_waiting && rx_data_cur - rx_data_consumed >= AO_FEC_DECODE_BLOCK) {
 #if AO_PROFILE
                        if (!rx_packet_tick)
@@ -825,12 +1059,15 @@ ao_radio_rx_wait(void)
        ao_arch_block_interrupts();
        rx_waiting = 1;
        while (rx_data_cur - rx_data_consumed < AO_FEC_DECODE_BLOCK &&
-              !ao_radio_abort) {
-               ao_sleep(&ao_radio_wake);
+              !ao_radio_abort &&
+              !ao_radio_mcu_wake)
+       {
+               if (ao_sleep_for(&ao_radio_wake, AO_MS_TO_TICKS(100)))
+                       ao_radio_abort = 1;
        }
        rx_waiting = 0;
        ao_arch_release_interrupts();
-       if (ao_radio_abort)
+       if (ao_radio_abort || ao_radio_mcu_wake)
                return 0;
        rx_data_consumed += AO_FEC_DECODE_BLOCK;
 #if AO_PROFILE
@@ -840,13 +1077,12 @@ ao_radio_rx_wait(void)
 }
 
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size)
+ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
 {
        uint8_t         len;
-       uint16_t        i;
-       uint8_t         rssi;
+       uint8_t         radio_rssi = 0;
+       uint8_t         rssi0;
        uint8_t         ret;
-       static int been_here = 0;
 
        size -= 2;                      /* status bytes */
        if (size > AO_RADIO_MAX_RECV) {
@@ -865,46 +1101,91 @@ ao_radio_recv(__xdata void *d, uint8_t size)
        rx_data_consumed = 0;
        rx_ignore = 2;
 
+       /* Must be set before changing the frequency; any abort
+        * after the frequency is set needs to terminate the read
+        * so that the registers can be reprogrammed
+        */
        ao_radio_abort = 0;
-       ao_radio_in_recv = 1;
-       /* configure interrupt pin */
+
        ao_radio_get(len);
-       ao_radio_set_mode(AO_RADIO_MODE_PACKET_RX);
 
        ao_radio_wake = 0;
+       ao_radio_mcu_wake = 0;
 
-       stm_spi2.cr2 = 0;
+       ao_radio_set_mode(AO_RADIO_MODE_PACKET_RX);
 
-       /* clear any RXNE */
-       (void) stm_spi2.dr;
+       /* configure interrupt pin */
+       ao_radio_reg_write(AO_CC1120_INT_GPIO_IOCFG, CC1120_IOCFG_GPIO_CFG_CLKEN_SOFT);
+       ao_exti_set_mode(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN,
+                        AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH);
+
+       rx_starting = 1;
+       rx_task_id = ao_cur_task->task_id;
 
        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);
 
        ao_radio_strobe(CC1120_SRX);
 
-       ao_radio_burst_read_start(CC1120_SOFT_RX_DATA_OUT);
+       ao_arch_block_interrupts();
+       while (rx_starting && !ao_radio_abort) {
+               if (ao_sleep_for(&ao_radio_wake, timeout))
+                       ao_radio_abort = 1;
+       }
+       uint8_t rx_task_id_save = rx_task_id;
+       rx_task_id = 0;
+       rx_starting = 0;
+       ao_arch_release_interrupts();
+
+       if (ao_radio_abort) {
+               if (rx_task_id_save == 0)
+                       ao_radio_burst_read_stop();
+               ret = 0;
+               goto abort;
+       }
+
+       if (rx_task_id_save) {
+               ++rx_slow_start;
+               ao_radio_select();
+               _ao_radio_burst_read_start(CC1120_SOFT_RX_DATA_OUT);
+               if (rx_ignore) {
+                       uint8_t ignore = AO_CC1120_SPI.dr;
+                       (void) ignore;
+                       AO_CC1120_SPI.dr = 0;
+                       --rx_ignore;
+               }
+       }
 
        ret = ao_fec_decode(rx_data, rx_data_count, d, size + 2, ao_radio_rx_wait);
 
        ao_radio_burst_read_stop();
 
-       ao_radio_strobe(CC1120_SIDLE);
+       if (ao_radio_mcu_wake)
+               ao_radio_check_marc_status();
+       if (ao_radio_abort)
+               ret = 0;
 
+abort:
        /* Convert from 'real' rssi to cc1111-style values */
 
-       rssi = AO_RADIO_FROM_RSSI(ao_radio_reg_read(CC1120_RSSI1));
+       rssi0 = ao_radio_reg_read(CC1120_RSSI0);
+       if (rssi0 & 1) {
+               int8_t rssi = ao_radio_reg_read(CC1120_RSSI1);
+               ao_radio_rssi = rssi;
 
-       ao_radio_put();
+               /* Bound it to the representable range */
+               if (rssi > -11)
+                       rssi = -11;
+               radio_rssi = AO_RADIO_FROM_RSSI (rssi);
+       }
 
-       /* Store the received RSSI value; the crc-OK byte is already done */
+       ao_radio_idle();
 
-       ((uint8_t *) d)[size] = (uint8_t) rssi;
+       ao_radio_put();
 
-       ao_radio_in_recv = 0;
+       /* Store the received RSSI value; the crc-OK byte is already done */
 
-       if (ao_radio_abort)
-               ao_delay(1);
+       ((uint8_t *) d)[size] = radio_rssi;
 
 #if AO_PROFILE
        rx_last_done_tick = rx_done_tick;
@@ -937,7 +1218,7 @@ struct ao_cc1120_reg {
        char            *name;
 };
 
-const static struct ao_cc1120_reg ao_cc1120_reg[] = {
+static const struct ao_cc1120_reg ao_cc1120_reg[] = {
        { .addr = CC1120_IOCFG3,        .name = "IOCFG3" },
        { .addr = CC1120_IOCFG2,        .name = "IOCFG2" },
        { .addr = CC1120_IOCFG1,        .name = "IOCFG1" },
@@ -1118,22 +1399,26 @@ const static struct ao_cc1120_reg ao_cc1120_reg[] = {
 
 static void ao_radio_show(void) {
        uint8_t status = ao_radio_status();
-       int     i;
+       unsigned int    i;
 
        ao_radio_get(0xff);
        status = ao_radio_status();
        printf ("Status:   %02x\n", status);
        printf ("CHIP_RDY: %d\n", (status >> CC1120_STATUS_CHIP_RDY) & 1);
        printf ("STATE:    %s\n", cc1120_state_name[(status >> CC1120_STATUS_STATE) & CC1120_STATUS_STATE_MASK]);
-       printf ("MARC:     %02x\n", ao_radio_marc_status());
+       printf ("MARC:     %02x\n", ao_radio_get_marc_status());
 
        for (i = 0; i < AO_NUM_CC1120_REG; i++)
                printf ("\t%02x %-20.20s\n", ao_radio_reg_read(ao_cc1120_reg[i].addr), ao_cc1120_reg[i].name);
+
+       printf("RX fast start: %u\n", rx_fast_start);
+       printf("RX slow start: %u\n", rx_slow_start);
+       printf("RX missed:     %u\n", rx_missed);
        ao_radio_put();
 }
 
 static void ao_radio_beep(void) {
-       ao_radio_rdf(RDF_PACKET_LEN);
+       ao_radio_rdf();
 }
 
 static void ao_radio_packet(void) {
@@ -1152,12 +1437,12 @@ static void ao_radio_packet(void) {
 }
 
 void
-ao_radio_test_recv()
+ao_radio_test_recv(void)
 {
        uint8_t bytes[34];
        uint8_t b;
 
-       if (ao_radio_recv(bytes, 34)) {
+       if (ao_radio_recv(bytes, 34, 0)) {
                if (bytes[33] & 0x80)
                        printf ("CRC OK");
                else
@@ -1169,21 +1454,24 @@ ao_radio_test_recv()
        }
 }
 
+#if HAS_APRS
 #include <ao_aprs.h>
 
 static void
-ao_radio_aprs()
+ao_radio_aprs(void)
 {
        ao_packet_slave_stop();
        ao_aprs_send();
 }
-
+#endif
 #endif
 
 static const struct ao_cmds ao_radio_cmds[] = {
        { ao_radio_test_cmd,    "C <1 start, 0 stop, none both>\0Radio carrier test" },
 #if CC1120_DEBUG
+#if HAS_APRS
        { ao_radio_aprs,        "G\0Send APRS packet" },
+#endif
        { ao_radio_show,        "R\0Show CC1120 status" },
        { ao_radio_beep,        "b\0Emit an RDF beacon" },
        { ao_radio_packet,      "p\0Send a test packet" },
@@ -1195,8 +1483,6 @@ 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));
 
@@ -1215,7 +1501,13 @@ ao_radio_init(void)
        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_radio_isr);
+
+       /* Enable the hacked up GPIO3 pin */
+       ao_enable_port(AO_CC1120_MCU_WAKEUP_PORT);
+       ao_exti_setup(AO_CC1120_MCU_WAKEUP_PORT, AO_CC1120_MCU_WAKEUP_PIN,
+                     AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_MED,
+                     ao_radio_mcu_wakeup_isr);
 
        ao_cmd_register(&ao_radio_cmds[0]);
 }