first cut at turnon scripts for EasyTimer v2
[fw/altos] / src / drivers / ao_cc1200.c
index 8f31d2b429104daf2d966374c404e6669d28ccc5..ed1d298e1b4a8c100950da114c7ab45ed8abbce0 100644 (file)
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
 #include <ao_exti.h>
 #include <ao_fec.h>
 #include <ao_packet.h>
+#if HAS_PAD
+#include <ao_pad.h>
+#endif
+
+static uint8_t cc1201;
 
 static uint8_t ao_radio_mutex;
 
@@ -28,16 +34,28 @@ static uint8_t ao_radio_abort;              /* radio operation should abort */
 
 int8_t ao_radio_rssi;                  /* Last received RSSI value */
 
+#ifndef CC1200_DEBUG
 #define CC1200_DEBUG           0
+#endif
+
+#ifndef CC1200_LOW_LEVEL_DEBUG
 #define CC1200_LOW_LEVEL_DEBUG 0
+#endif
+
 #define CC1200_TRACE           0
 #define CC1200_APRS_TRACE      0
 
 extern const uint32_t  ao_radio_cal;
 
+#ifdef AO_CC1200_FOSC
+#define FOSC   AO_CC1200_FOSC
+#else
 #define FOSC   40000000
+#endif
+
+#define AO_CC1200_SPI_SPEED    ao_spi_speed(AO_CC1200_SPI_BUS, 7700000)        /* 7.7MHz max for extended memory reads */
 
-#define ao_radio_select()      ao_spi_get_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS,AO_SPI_SPEED_FAST)
+#define ao_radio_select()      ao_spi_get_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS,AO_CC1200_SPI_SPEED)
 #define ao_radio_deselect()    ao_spi_put_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS)
 #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC1200_SPI_BUS)
 #define ao_radio_spi_send_fixed(d,l) ao_spi_send_fixed((d), (l), AO_CC1200_SPI_BUS)
@@ -47,7 +65,7 @@ extern const uint32_t ao_radio_cal;
 static uint8_t
 ao_radio_reg_read(uint16_t addr)
 {
-       uint8_t data[2];
+       uint8_t data[3];
        uint8_t d;
 
 #if CC1200_TRACE
@@ -57,22 +75,21 @@ ao_radio_reg_read(uint16_t addr)
                data[0] = ((1 << CC1200_READ)  |
                           (0 << CC1200_BURST) |
                           CC1200_EXTENDED);
-               data[1] = addr;
+               data[1] = (uint8_t) addr;
                d = 2;
        } else {
                data[0] = ((1 << CC1200_READ)  |
                           (0 << CC1200_BURST) |
-                          addr);
+                          (uint8_t) addr);
                d = 1;
        }
        ao_radio_select();
-       ao_radio_spi_send(data, d);
-       ao_radio_spi_recv(data, 1);
+       ao_radio_duplex(data, data, d + 1);
        ao_radio_deselect();
 #if CC1200_TRACE
-       printf (" %02x\n", data[0]);
+       printf (" %02x\n", data[d]);
 #endif
-       return data[0];
+       return data[d];
 }
 
 static void
@@ -88,12 +105,12 @@ ao_radio_reg_write(uint16_t addr, uint8_t value)
                data[0] = ((0 << CC1200_READ)  |
                           (0 << CC1200_BURST) |
                           CC1200_EXTENDED);
-               data[1] = addr;
+               data[1] = (uint8_t) addr;
                d = 2;
        } else {
                data[0] = ((0 << CC1200_READ)  |
                           (0 << CC1200_BURST) |
-                          addr);
+                          (uint8_t) addr);
                d = 1;
        }
        data[d] = value;
@@ -172,9 +189,9 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
 }
 
 static uint8_t
-ao_radio_tx_fifo_space(void)
+ao_radio_int_pin(void)
 {
-       return CC1200_FIFO_SIZE - ao_radio_reg_read(CC1200_NUM_TXBYTES);
+       return ao_gpio_get(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
 }
 
 static uint8_t
@@ -195,7 +212,6 @@ ao_radio_recv_abort(void)
 static void
 ao_radio_isr(void)
 {
-       ao_exti_disable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
        ao_radio_wake = 1;
        ao_wakeup(&ao_radio_wake);
 }
@@ -203,14 +219,12 @@ ao_radio_isr(void)
 static void
 ao_radio_start_tx(void)
 {
-       ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
        ao_radio_strobe(CC1200_STX);
 }
 
 static void
 ao_radio_start_rx(void)
 {
-       ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
        ao_radio_strobe(CC1200_SRX);
 }
 
@@ -295,23 +309,42 @@ ao_radio_idle(void)
  *     CHANBW = 5.0 (round to 9.5)
  */
 
+#if FOSC == 40000000
 #define PACKET_SYMBOL_RATE_M           1013008
-
 #define PACKET_SYMBOL_RATE_E_384       8
+#define PACKET_SYMBOL_RATE_E_96                6
+#define PACKET_SYMBOL_RATE_E_24                4
+#endif
+
+#if FOSC == 32000000
+#define PACKET_SYMBOL_RATE_M           239914
+#define PACKET_SYMBOL_RATE_E_384       9
+#define PACKET_SYMBOL_RATE_E_96                7
+#define PACKET_SYMBOL_RATE_E_24                5
+#endif
 
 /* 200 / 2 = 100 */
 #define PACKET_CHAN_BW_384     ((CC1200_CHAN_BW_ADC_CIC_DECFACT_12 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
                                 (16 << CC1200_CHAN_BW_BB_CIC_DECFACT))
 
-#define PACKET_SYMBOL_RATE_E_96                6
+/*
+ * CC1201 doesn't support our low bandwidth receive setups, so we use
+ * larger values for that part, leaving the bandwidth at over 50kHz
+ */
+
 /* 200 / 10 = 20 */
-#define PACKET_CHAN_BW_96      ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
-                                (16 << CC1200_CHAN_BW_BB_CIC_DECFACT))
+#define PACKET_CHAN_BW_96_CC1200       ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
+                                        (16 << CC1200_CHAN_BW_BB_CIC_DECFACT))
+
+#define PACKET_CHAN_BW_96_CC1201       ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
+                                        (8 << CC1200_CHAN_BW_BB_CIC_DECFACT))
 
-#define PACKET_SYMBOL_RATE_E_24                4
 /* 200 / 25 = 8 */
-#define PACKET_CHAN_BW_24      ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
-                                (44 << CC1200_CHAN_BW_BB_CIC_DECFACT))
+#define PACKET_CHAN_BW_24_CC1200       ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
+                                        (44 << CC1200_CHAN_BW_BB_CIC_DECFACT))
+
+#define PACKET_CHAN_BW_24_CC1201       ((CC1200_CHAN_BW_ADC_CIC_DECFACT_48 << CC1200_CHAN_BW_ADC_CIC_DECFACT) | \
+                                        (8 << CC1200_CHAN_BW_BB_CIC_DECFACT))
 
 static const uint16_t packet_setup[] = {
        CC1200_SYMBOL_RATE1,            ((PACKET_SYMBOL_RATE_M >> 8) & 0xff),
@@ -353,7 +386,6 @@ static const uint16_t packet_setup_96[] = {
                                 (PACKET_DEV_E_96 << CC1200_MODCFG_DEV_E_DEV_E)),
        CC1200_SYMBOL_RATE2,    ((PACKET_SYMBOL_RATE_E_96 << CC1200_SYMBOL_RATE2_DATARATE_E) |
                                 (((PACKET_SYMBOL_RATE_M >> 16) & CC1200_SYMBOL_RATE2_DATARATE_M_19_16_MASK) << CC1200_SYMBOL_RATE2_DATARATE_M_19_16)),
-       CC1200_CHAN_BW,         PACKET_CHAN_BW_96,
         CC1200_MDMCFG2,                                  /* General Modem Parameter Configuration Reg. 2 */
                ((CC1200_MDMCFG2_ASK_SHAPE_8 << CC1200_MDMCFG2_ASK_SHAPE) |
                 (CC1200_MDMCFG2_SYMBOL_MAP_CFG_MODE_0 << CC1200_MDMCFG2_SYMBOL_MAP_CFG) |
@@ -368,7 +400,6 @@ static const uint16_t packet_setup_24[] = {
                                 (PACKET_DEV_E_24 << CC1200_MODCFG_DEV_E_DEV_E)),
        CC1200_SYMBOL_RATE2,    ((PACKET_SYMBOL_RATE_E_24 << CC1200_SYMBOL_RATE2_DATARATE_E) |
                                 (((PACKET_SYMBOL_RATE_M >> 16) & CC1200_SYMBOL_RATE2_DATARATE_M_19_16_MASK) << CC1200_SYMBOL_RATE2_DATARATE_M_19_16)),
-       CC1200_CHAN_BW,         PACKET_CHAN_BW_24,
         CC1200_MDMCFG2,                                  /* General Modem Parameter Configuration Reg. 2 */
                ((CC1200_MDMCFG2_ASK_SHAPE_8 << CC1200_MDMCFG2_ASK_SHAPE) |
                 (CC1200_MDMCFG2_SYMBOL_MAP_CFG_MODE_0 << CC1200_MDMCFG2_SYMBOL_MAP_CFG) |
@@ -461,6 +492,7 @@ static const uint16_t rdf_setup[] = {
  */
 #define APRS_SYMBOL_RATE_E     6
 #define APRS_SYMBOL_RATE_M     1013008
+#define APRS_BUFFER_SIZE       64
 
 static const uint16_t aprs_setup[] = {
        CC1200_DEVIATION_M,     APRS_DEV_M,
@@ -495,6 +527,9 @@ static const uint16_t aprs_setup[] = {
                 (CC1200_MDMCFG2_SYMBOL_MAP_CFG_MODE_0 << CC1200_MDMCFG2_SYMBOL_MAP_CFG) |
                 (CC1200_MDMCFG2_UPSAMPLER_P_8 << CC1200_MDMCFG2_UPSAMPLER_P) |
                 (0 << CC1200_MDMCFG2_CFM_DATA_EN)),
+       CC1200_FIFO_CFG,
+               ((0 << CC1200_FIFO_CFG_CRC_AUTOFLUSH) |
+                (APRS_BUFFER_SIZE << CC1200_FIFO_CFG_FIFO_THR)),
 };
 
 /*
@@ -536,8 +571,7 @@ static uint16_t ao_radio_mode;
 
 #define AO_RADIO_MODE_BITS_PACKET      1
 #define AO_RADIO_MODE_BITS_TX_BUF      4
-#define AO_RADIO_MODE_BITS_TX_FINISH   8
-#define AO_RADIO_MODE_BITS_RX          16
+#define AO_RADIO_MODE_BITS_FINISH      8
 #define AO_RADIO_MODE_BITS_RDF         32
 #define AO_RADIO_MODE_BITS_APRS                64
 #define AO_RADIO_MODE_BITS_TEST                128
@@ -545,12 +579,12 @@ static uint16_t ao_radio_mode;
 #define AO_RADIO_MODE_BITS_FIXED       512
 
 #define AO_RADIO_MODE_NONE             0
-#define AO_RADIO_MODE_PACKET_TX                (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_TX_FINISH)
-#define AO_RADIO_MODE_PACKET_RX                (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_RX)
-#define AO_RADIO_MODE_RDF              (AO_RADIO_MODE_BITS_RDF    | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_TX_FINISH)
+#define AO_RADIO_MODE_PACKET_TX                (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_FINISH)
+#define AO_RADIO_MODE_PACKET_RX                (AO_RADIO_MODE_BITS_PACKET | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_FINISH)
+#define AO_RADIO_MODE_RDF              (AO_RADIO_MODE_BITS_RDF    | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_FINISH)
 #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_APRS_FINISH      (AO_RADIO_MODE_BITS_APRS   | AO_RADIO_MODE_BITS_FIXED    | AO_RADIO_MODE_BITS_FINISH)
 #define AO_RADIO_MODE_TEST             (AO_RADIO_MODE_BITS_TEST   | AO_RADIO_MODE_BITS_INFINITE | AO_RADIO_MODE_BITS_TX_BUF)
 
 static void
@@ -559,7 +593,7 @@ _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]);
+               ao_radio_reg_write(regs[0], (uint8_t) regs[1]);
                regs += 2;
        }
 }
@@ -574,7 +608,7 @@ ao_radio_set_mode(uint16_t new_mode)
        if (new_mode == ao_radio_mode)
                return;
 
-       changes = new_mode & (~ao_radio_mode);
+       changes = (uint16_t) (new_mode & (~ao_radio_mode));
 
        if (changes & AO_RADIO_MODE_BITS_PACKET) {
                ao_radio_set_regs(packet_setup);
@@ -586,21 +620,28 @@ ao_radio_set_mode(uint16_t new_mode)
                        break;
                case AO_RADIO_RATE_9600:
                        ao_radio_set_regs(packet_setup_96);
+                       if (cc1201)
+                               ao_radio_reg_write(CC1200_CHAN_BW, PACKET_CHAN_BW_96_CC1201);
+                       else
+                               ao_radio_reg_write(CC1200_CHAN_BW, PACKET_CHAN_BW_96_CC1200);
                        break;
                case AO_RADIO_RATE_2400:
                        ao_radio_set_regs(packet_setup_24);
+                       if (cc1201)
+                               ao_radio_reg_write(CC1200_CHAN_BW, PACKET_CHAN_BW_24_CC1201);
+                       else
+                               ao_radio_reg_write(CC1200_CHAN_BW, PACKET_CHAN_BW_24_CC1200);
                        break;
                }
        }
 
-       if (changes & AO_RADIO_MODE_BITS_TX_BUF)
+       if (changes & AO_RADIO_MODE_BITS_TX_BUF) {
                ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_TXFIFO_THR);
+       }
 
-       if (changes & AO_RADIO_MODE_BITS_TX_FINISH)
-               ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_PKT_SYNC_RXTX);
-
-       if (changes & AO_RADIO_MODE_BITS_RX)
+       if (changes & AO_RADIO_MODE_BITS_FINISH) {
                ao_radio_reg_write(AO_CC1200_INT_GPIO_IOCFG, CC1200_IOCFG_GPIO_CFG_PKT_SYNC_RXTX);
+       }
 
        if (changes & AO_RADIO_MODE_BITS_RDF)
                ao_radio_set_regs(rdf_setup);
@@ -629,6 +670,11 @@ static uint8_t     ao_radio_configured = 0;
 static void
 ao_radio_setup(void)
 {
+       uint8_t partnumber = ao_radio_reg_read(CC1200_PARTNUMBER);
+
+       if (partnumber == CC1200_PARTNUMBER_CC1201)
+               cc1201 = 1;
+
        ao_radio_strobe(CC1200_SRES);
 
        ao_radio_set_regs(radio_setup);
@@ -658,22 +704,35 @@ ao_radio_get(uint8_t len)
 {
        static uint32_t last_radio_setting;
        static uint8_t  last_radio_rate;
+       static uint8_t  last_radio_10mw;
 
        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(CC1200_FREQ2, ao_config.radio_setting >> 16);
-               ao_radio_reg_write(CC1200_FREQ1, ao_config.radio_setting >> 8);
-               ao_radio_reg_write(CC1200_FREQ0, ao_config.radio_setting);
+               ao_radio_reg_write(CC1200_FREQ2, (uint8_t) (ao_config.radio_setting >> 16));
+               ao_radio_reg_write(CC1200_FREQ1, (uint8_t) (ao_config.radio_setting >> 8));
+               ao_radio_reg_write(CC1200_FREQ0, (uint8_t) ao_config.radio_setting);
                last_radio_setting = ao_config.radio_setting;
                ao_radio_strobe(CC1200_SCAL);
        }
        if (ao_config.radio_rate != last_radio_rate) {
-               ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET;
+               ao_radio_mode &= (uint16_t) ~AO_RADIO_MODE_BITS_PACKET;
                last_radio_rate = ao_config.radio_rate;
        }
+       if(ao_config.radio_10mw != last_radio_10mw) {
+               last_radio_10mw = ao_config.radio_10mw;
+               /*
+                * 0x37 "should" be 10dBm, but measurements on TBT
+                * v4.0 show that too hot, so use * 0x32 to make sure 
+                * we're in spec.
+                */
+               if (ao_config.radio_10mw)
+                       ao_radio_reg_write(CC1200_PA_CFG1, 0x32);
+               else
+                       ao_radio_reg_write(CC1200_PA_CFG1, 0x3f);
+       }
        ao_radio_set_len(len);
 }
 
@@ -685,8 +744,8 @@ ao_radio_state(void)
        return (ao_radio_status() >> CC1200_STATUS_STATE) & CC1200_STATUS_STATE_MASK;
 }
 
-#if CC1200_DEBUG
-void
+#if CC1200_DEBUG_
+static void
 ao_radio_show_state(char *where)
 {
        printf("%s: state %d len %d rxbytes %d\n",
@@ -701,32 +760,19 @@ ao_radio_show_state(char *where)
 /* Wait for the radio to signal an interrupt
  */
 static void
-ao_radio_wait_isr(uint16_t timeout)
+_ao_radio_wait_isr(AO_TICK_TYPE timeout)
 {
-       uint8_t state;
-
-       state = ao_radio_state();
-       switch (state) {
-       case CC1200_STATUS_STATE_IDLE:
-       case CC1200_STATUS_STATE_RX_FIFO_ERROR:
-       case CC1200_STATUS_STATE_TX_FIFO_ERROR:
-#if CC1200_LOW_LEVEL_DEBUG
-               printf("before wait, state %d\n", state); flush();
-#endif
-               ao_radio_abort = 1;
-               return;
-       }
-
-       if (timeout)
-               ao_alarm(timeout);
-
-       ao_arch_block_interrupts();
        while (!ao_radio_wake && !ao_radio_abort)
-               if (ao_sleep(&ao_radio_wake))
+               if (ao_sleep_for(&ao_radio_wake, timeout))
                        ao_radio_abort = 1;
+}
+
+static void
+ao_radio_wait_isr(AO_TICK_TYPE timeout)
+{
+       ao_arch_block_interrupts();
+       _ao_radio_wait_isr(timeout);
        ao_arch_release_interrupts();
-       if (timeout)
-               ao_clear_alarm();
 }
 
 static void
@@ -742,6 +788,8 @@ ao_rdf_start(uint8_t len)
 static void
 ao_radio_run(void)
 {
+       ao_radio_wake = 0;
+       ao_radio_abort = 0;
        ao_radio_start_tx();
        ao_radio_wait_isr(0);
        if (!ao_radio_wake)
@@ -788,23 +836,20 @@ ao_radio_rdf_abort(void)
        ao_wakeup(&ao_radio_wake);
 }
 
-static void
-ao_radio_test_cmd(void)
+static uint8_t radio_on;
+
+void
+ao_radio_test_on(void)
 {
-       uint8_t mode = 2;
-       static uint8_t radio_on;
-       ao_cmd_white();
-       if (ao_cmd_lex_c != '\n') {
-               ao_cmd_decimal();
-               mode = (uint8_t) ao_cmd_lex_u32;
-       }
-       mode++;
-       if ((mode & 2) && !radio_on) {
+       if (!radio_on) {
 #if HAS_MONITOR
                ao_monitor_disable();
 #endif
 #if PACKET_HAS_SLAVE
                ao_packet_slave_stop();
+#endif
+#if HAS_PAD
+               ao_pad_disable();
 #endif
                ao_radio_get(0xff);
                ao_radio_set_mode(AO_RADIO_MODE_TEST);
@@ -819,21 +864,43 @@ ao_radio_test_cmd(void)
 #endif
                radio_on = 1;
        }
-       if (mode == 3) {
-               printf ("Hit a character to stop..."); flush();
-               getchar();
-               putchar('\n');
-       }
-       if ((mode & 1) && radio_on) {
+}
+
+void
+ao_radio_test_off(void)
+{
+       if (radio_on) {
                ao_radio_idle();
                ao_radio_put();
                radio_on = 0;
 #if HAS_MONITOR
                ao_monitor_enable();
+#endif
+#if HAS_PAD
+               ao_pad_enable();
 #endif
        }
 }
 
+static void
+ao_radio_test_cmd(void)
+{
+       uint8_t mode = 2;
+       ao_cmd_white();
+       if (ao_cmd_lex_c != '\n')
+               mode = (uint8_t) ao_cmd_decimal();
+       mode++;
+       if ((mode & 2))
+               ao_radio_test_on();
+       if (mode == 3) {
+               printf ("Hit a character to stop..."); flush();
+               getchar();
+               putchar('\n');
+       }
+       if ((mode & 1))
+               ao_radio_test_off();
+}
+
 void
 ao_radio_send(const void *d, uint8_t size)
 {
@@ -845,104 +912,60 @@ ao_radio_send(const void *d, uint8_t size)
        ao_radio_run();
 }
 
-
-#define AO_RADIO_LOTS  64
-
 void
 ao_radio_send_aprs(ao_radio_fill_func fill)
 {
-       uint8_t buf[AO_RADIO_LOTS], *b;
+       uint8_t buf[APRS_BUFFER_SIZE];
        int     cnt;
        int     total = 0;
        uint8_t done = 0;
        uint8_t started = 0;
-       uint8_t fifo_space;
 
+       ao_radio_abort = 0;
        ao_radio_get(0xff);
-       fifo_space = CC1200_FIFO_SIZE;
-       while (!done) {
+       ao_radio_wake = 0;
+       while (!done && !ao_radio_abort) {
                cnt = (*fill)(buf, sizeof(buf));
                if (cnt < 0) {
                        done = 1;
                        cnt = -cnt;
                }
-#if CC1200_APRS_TRACE
-               printf("APRS fill %d bytes done %d\n", cnt, done);
-#endif
                total += cnt;
 
                /* At the last buffer, set the total length */
                if (done)
-                       ao_radio_set_len(total & 0xff);
-
-               b = buf;
-               while (cnt) {
-                       uint8_t this_len = cnt;
+                       ao_radio_set_len((uint8_t) (total & 0xff));
 
-                       /* Wait for some space in the fifo */
-                       while (!ao_radio_abort && (fifo_space = ao_radio_tx_fifo_space()) == 0) {
-#if CC1200_APRS_TRACE
-                               printf("APRS space %d cnt %d\n", fifo_space, cnt); flush();
-#endif
-                               ao_radio_wake = 0;
-                               ao_radio_wait_isr(AO_MS_TO_TICKS(1000));
-                       }
-                       if (ao_radio_abort)
-                               break;
-                       if (this_len > fifo_space)
-                               this_len = fifo_space;
-
-                       cnt -= this_len;
-
-                       if (done) {
-                               if (cnt)
-                                       ao_radio_set_mode(AO_RADIO_MODE_APRS_LAST_BUF);
-                               else
-                                       ao_radio_set_mode(AO_RADIO_MODE_APRS_FINISH);
-                       } else
-                               ao_radio_set_mode(AO_RADIO_MODE_APRS_BUF);
-
-                       ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
-
-                       ao_radio_fifo_write(b, this_len);
-                       b += this_len;
-#if CC1200_APRS_TRACE
-                       printf("APRS write fifo %d space now %d\n", this_len, ao_radio_tx_fifo_space());
-#endif
-                       if (!started) {
-#if CC1200_APRS_TRACE
-                               printf("APRS start\n");
-#endif
-                               ao_radio_strobe(CC1200_STX);
-#if CC1200_APRS_TRACE
-                               { int t;
-                                       for (t = 0; t < 20; t++) {
-                                               uint8_t status = ao_radio_status();
-                                               uint8_t space = ao_radio_tx_fifo_space();
-                                               printf ("status: %02x fifo %d\n", status, space);
-                                               if ((status >> 4) == 2)
-                                                       break;
-                                               ao_delay(AO_MS_TO_TICKS(0));
-                                       }
-                               }
-#endif
-                               started = 1;
-                       }
+               /* Wait for some space in the fifo */
+               ao_arch_block_interrupts();
+               while (started && ao_radio_int_pin() != 0 && !ao_radio_abort) {
+                       ao_radio_wake = 0;
+                       _ao_radio_wait_isr(AO_MS_TO_TICKS(1000));
                }
-               if (ao_radio_abort) {
-                       ao_radio_idle();
+               ao_arch_release_interrupts();
+               if (ao_radio_abort)
                        break;
+
+               if (done)
+                       ao_radio_set_mode(AO_RADIO_MODE_APRS_FINISH);
+               else
+                       ao_radio_set_mode(AO_RADIO_MODE_APRS_BUF);
+
+               ao_radio_fifo_write(buf, (uint8_t) cnt);
+               if (!started) {
+                       ao_radio_strobe(CC1200_STX);
+                       started = 1;
                }
        }
        /* Wait for the transmitter to go idle */
-       ao_radio_wake = 0;
-#if CC1200_APRS_TRACE
-       printf("APRS wait idle\n"); flush();
-#endif
-       ao_radio_wait_isr(AO_MS_TO_TICKS(1000));
-#if CC1200_APRS_TRACE
-       printf("APRS abort %d\n", ao_radio_abort);
-#endif
+       ao_arch_block_interrupts();
+       while (started && ao_radio_int_pin() != 0 && !ao_radio_abort) {
+               ao_radio_wake = 0;
+               _ao_radio_wait_isr(AO_MS_TO_TICKS(1000));
+       }
+       ao_arch_release_interrupts();
+       if (ao_radio_abort)
+               ao_radio_idle();
        ao_radio_put();
 }
 
@@ -994,16 +1017,83 @@ ao_radio_dump_state(struct ao_radio_state *s)
 #endif
 
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
+ao_radio_recv(void *d, uint8_t size, AO_TICK_TYPE timeout)
 {
-       ao_radio_abort = 0;
+       uint8_t success = 0;
 
+       ao_radio_abort = 0;
        ao_radio_get(size - 2);
        ao_radio_set_mode(AO_RADIO_MODE_PACKET_RX);
        ao_radio_wake = 0;
        ao_radio_start_rx();
-       ao_radio_wait_isr(timeout);
-       if (ao_radio_wake) {
+
+       while (!ao_radio_abort) {
+               ao_radio_wait_isr(timeout);
+               if (ao_radio_abort)
+                       break;
+               if (ao_radio_wake) {
+                       uint8_t         marc_status1 = ao_radio_reg_read(CC1200_MARC_STATUS1);
+
+                       /* Check the receiver status to see what happened
+                        */
+                       switch (marc_status1) {
+                       case CC1200_MARC_STATUS1_RX_FINISHED:
+                       case CC1200_MARC_STATUS1_ADDRESS:
+                       case CC1200_MARC_STATUS1_CRC:
+                               /* Normal return, go fetch the bytes from the FIFO
+                                * and give them back to the caller
+                                */
+                               success = 1;
+                               break;
+                       case CC1200_MARC_STATUS1_RX_TIMEOUT:
+                       case CC1200_MARC_STATUS1_RX_TERMINATION:
+                       case CC1200_MARC_STATUS1_EWOR_SYNC_LOST:
+                       case CC1200_MARC_STATUS1_MAXIMUM_LENGTH:
+                       case CC1200_MARC_STATUS1_RX_FIFO_OVERFLOW:
+                       case CC1200_MARC_STATUS1_RX_FIFO_UNDERFLOW:
+                               /* Something weird happened; reset the radio and
+                                * return failure
+                                */
+                               success = 0;
+                               break;
+                       default:
+                               /* some other status; go wait for the radio to do something useful
+                                */
+                               continue;
+                       }
+                       break;
+               } else {
+                       uint8_t modem_status1 = ao_radio_reg_read(CC1200_MODEM_STATUS1);
+
+                       /* Check to see if the packet header has been seen, in which case we'll
+                        * want to keep waiting for the rest of the packet to appear
+                        */
+                       if (modem_status1 & (1 << CC1200_MODEM_STATUS1_SYNC_FOUND))
+                       {
+                               ao_radio_abort = 0;
+
+                               /* Set a timeout based on the packet length so that we make sure to
+                                * wait long enough to receive the whole thing.
+                                *
+                                * timeout = bits * FEC expansion / rate
+                                */
+                               switch (ao_config.radio_rate) {
+                               default:
+                               case AO_RADIO_RATE_38400:
+                                       timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 384) + 1;
+                                       break;
+                               case AO_RADIO_RATE_9600:
+                                       timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 96) + 1;
+                                       break;
+                               case AO_RADIO_RATE_2400:
+                                       timeout = AO_MS_TO_TICKS((AO_TICK_TYPE) size * (8 * 2 * 10) / 24) + 1;
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       if (success) {
                int8_t  rssi;
                uint8_t status;
 
@@ -1017,14 +1107,14 @@ ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
                        rssi = -11;
 
                /* Write it back to the packet */
-               ((int8_t *) d)[size-2] = AO_RADIO_FROM_RSSI(rssi);
+               ((uint8_t *) d)[size-2] = AO_RADIO_FROM_RSSI(rssi);
        } else {
                ao_radio_idle();
                ao_radio_rssi = 0;
        }
 
        ao_radio_put();
-       return ao_radio_wake;
+       return success;
 }
 
 
@@ -1265,10 +1355,10 @@ static void ao_radio_packet(void) {
        ao_radio_send(packet, sizeof (packet));
 }
 
-void
+static void
 ao_radio_test_recv(void)
 {
-       uint8_t bytes[34];
+       static uint8_t  bytes[34];
        uint8_t b;
 
        if (ao_radio_recv(bytes, 34, 0)) {
@@ -1303,14 +1393,15 @@ ao_radio_aprs(void)
 static void
 ao_radio_strobe_test(void)
 {
+       uint8_t addr;
        uint8_t r;
 
-       ao_cmd_hex();
+       addr = ao_cmd_hex();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       r = ao_radio_strobe(ao_cmd_lex_i);
+       r = ao_radio_strobe(addr);
        printf ("Strobe %02x -> %02x (rdy %d state %d)\n",
-               ao_cmd_lex_i,
+               addr,
                r,
                r >> 7,
                (r >> 4) & 0x7);
@@ -1322,14 +1413,12 @@ ao_radio_write_test(void)
        uint16_t        addr;
        uint8_t         data;
 
-       ao_cmd_hex();
+       addr = ao_cmd_hex();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       addr = ao_cmd_lex_i;
-       ao_cmd_hex();
+       data = ao_cmd_hex();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       data = ao_cmd_lex_i;
        printf ("Write %04x = %02x\n", addr, data);
        ao_radio_reg_write(addr, data);
 }
@@ -1340,10 +1429,9 @@ ao_radio_read_test(void)
        uint16_t        addr;
        uint8_t         data;
 
-       ao_cmd_hex();
+       addr = ao_cmd_hex();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       addr = ao_cmd_lex_i;
        data = ao_radio_reg_read(addr);
        printf ("Read %04x = %02x\n", addr, data);
 }
@@ -1391,5 +1479,7 @@ ao_radio_init(void)
                      AO_EXTI_MODE_FALLING|AO_EXTI_PRIORITY_HIGH,
                      ao_radio_isr);
 
+       ao_exti_enable(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
+
        ao_cmd_register(&ao_radio_cmds[0]);
 }