X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet.c;h=8cdf85a94f9036648acf1332bfc94cb158567afd;hb=fb0fb6f4beab484e7fe55b39d18c1f19778f1211;hp=3c1e7a18eb643168be3520e558f0ee6781ce963f;hpb=e80fa6de4ccc5c4851eab9fb941f9282d2e3eb16;p=fw%2Faltos

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 3c1e7a18..8cdf85a9 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -21,8 +21,8 @@ __xdata struct ao_packet_recv ao_rx_packet;
 __xdata struct ao_packet ao_tx_packet;
 __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
 
-static __xdata char tx_data[AO_PACKET_MAX];
-static __xdata char rx_data[AO_PACKET_MAX];
+static __xdata uint8_t tx_data[AO_PACKET_MAX];
+static __xdata uint8_t rx_data[AO_PACKET_MAX];
 static __pdata uint8_t rx_seq;
 
 __xdata struct ao_task	ao_packet_task;
@@ -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;
 }
 
-char
-ao_packet_pollchar(void)
+/* May be called with interrupts blocked */
+int
+_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;