altos: Make sure we drop the SPI mutex when aborting cc1120 recv

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

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 913199232a75b46d2db390ac9e665686626529e0..8cdf85a94f9036648acf1332bfc94cb158567afd 100644 (file)
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -31,7 +31,6 @@ __xdata uint8_t ao_packet_restart;
 
 #if PACKET_HAS_MASTER
 __xdata uint8_t ao_packet_master_sleeping;
-__xdata uint8_t ao_packet_last_rssi;
 #endif
 
 void
@@ -62,7 +61,7 @@ ao_packet_recv(void)
 #ifdef AO_LED_GREEN
        ao_led_on(AO_LED_GREEN);
 #endif
-       dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv));
+       dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv), 0);
 #ifdef AO_LED_GREEN
        ao_led_off(AO_LED_GREEN);
 #endif
@@ -85,9 +84,6 @@ ao_packet_recv(void)
        if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
                return 0;
 
-#if PACKET_HAS_MASTER
-       ao_packet_last_rssi = ao_rx_packet.rssi;
-#endif
        /* Accept packets with matching call signs, or any packet if
         * our callsign hasn't been configured
         */
@@ -169,12 +165,10 @@ ao_packet_putchar(char c) __reentrant
                tx_data[ao_packet_tx_used++] = c;
 }
 
+/* May be called with interrupts blocked */
 int
-ao_packet_pollchar(void)
+_ao_packet_pollchar(void)
 {
-       /* No need to block interrupts, all variables here
-        * are only manipulated in task context
-        */
        if (!ao_packet_enable)
                return AO_READ_AGAIN;