altos: Clean up radio CRC handling

[fw/altos] / src / core / ao.h

diff --git a/src/core/ao.h b/src/core/ao.h
index 204c85301854546d4858963ddfea03cb4a018d0d..861a0fd479dc70aed5863cafb3591ec5a088b07b 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -396,6 +396,16 @@ ao_gps_report(void);
 void
 ao_gps_report_init(void);
 
+/*
+ * ao_gps_report_mega.c
+ */
+
+void
+ao_gps_report_mega(void);
+
+void
+ao_gps_report_mega_init(void);
+
 /*
  * ao_telemetry_orig.c
  */
@@ -501,19 +511,18 @@ extern __xdata uint8_t ao_radio_dma_done;
 extern __xdata uint8_t ao_radio_done;
 extern __xdata uint8_t ao_radio_mutex;
 
-void
-ao_radio_general_isr(void) ao_arch_interrupt(16);
-
-void
-ao_radio_get(uint8_t len);
-
-#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+#ifdef PKT_APPEND_STATUS_1_CRC_OK
+#define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
+#else
+#include <ao_fec.h>
+#define AO_RADIO_STATUS_CRC_OK AO_FEC_DECODE_CRC_OK
+#endif
 
 void
-ao_radio_set_packet(void);
+ao_radio_general_isr(void) ao_arch_interrupt(16);
 
 void
-ao_radio_send(__xdata void *d, uint8_t size) __reentrant;
+ao_radio_send(const __xdata void *d, uint8_t size) __reentrant;
 
 uint8_t
 ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
@@ -537,9 +546,6 @@ ao_radio_rdf(uint8_t pkt_len);
 void
 ao_radio_rdf_abort(void);
 
-void
-ao_radio_idle(void);
-
 void
 ao_radio_init(void);