altos: Unroll viterbi state loop for >30% performance boost

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

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index cc9ebd304bc499c2aec4484588e641e5a0ccf63b..30663042677668e17bcb35cf3170341268e9d738 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -33,7 +33,7 @@ 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)
@@ -690,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;