altos: Clean up radio CRC handling

[fw/altos] / src / drivers / ao_cc1120.c

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 501b937004c1cd0264409f6a61a7ff9775f48d2b..30663042677668e17bcb35cf3170341268e9d738 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -29,17 +29,11 @@ uint8_t ao_radio_in_recv;
 #define CC1120_DEBUG   AO_FEC_DEBUG
 #define CC1120_TRACE   0
 
-#if CC1120_TRACE
-#define fec_dump_bytes(b,l,n) ao_fec_dump_bytes(b,l,n)
-#else
-#define fec_dump_bytes(b,l,n)
-#endif
-
 const uint32_t ao_radio_cal = 0x6ca333;
 
 #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)
@@ -582,12 +576,12 @@ ao_radio_send(const void *d, uint8_t size)
 
 #define AO_RADIO_MAX_RECV      90
 
-uint8_t        rx_data[(AO_RADIO_MAX_RECV + 4) * 2 * 8];
-uint16_t       rx_data_count;
-uint16_t       rx_data_consumed;
-uint16_t rx_data_cur;
-uint8_t        rx_ignore;
-uint8_t        rx_waiting;
+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;
@@ -696,12 +690,7 @@ ao_radio_recv(__xdata void *d, uint8_t size)
 
        ao_radio_put();
 
-       /* Construct final packet */
-
-       if (ret && ((uint8_t *) d)[size] == 0 && ((uint8_t *)d)[size+1] == 0)
-               ((uint8_t *) d)[size + 1] = 0x80;
-       else
-               ((uint8_t *) d)[size + 1] = 0x00;
+       /* Store the received RSSI value; the crc-OK byte is already done */
 
        ((uint8_t *) d)[size] = (uint8_t) rssi;