X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=9682e42fb33c9cde8d69122f632acd0f969ecb81;hp=cd4e4814e07a8a27611f9a56c06db47bcc25941f;hb=484b44e81b655f1ecb48256095382a56d2839bae;hpb=c443f43f8dee6e0fcbcecf9d09e948fd928b7af4

diff --git a/src/ao.h b/src/ao.h
index cd4e4814..9682e42f 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -69,10 +69,6 @@ ao_sleep(__xdata void *wchan);
 void
 ao_wakeup(__xdata void *wchan);
 
-/* Wake up a specific task */
-void
-ao_wake_task(__xdata struct ao_task *task);
-
 /* set an alarm to go off in 'delay' ticks */
 void
 ao_alarm(uint16_t delay);
@@ -391,14 +387,10 @@ ao_cmd_init(void);
  * ao_dma.c
  */
 
-/* Allocate a DMA channel. the 'done' parameter will be set
- * when the dma is finished or aborted and will be used to
- * wakeup any waiters
+/* Allocate a DMA channel. the 'done' parameter will be set when the
+ * dma is finished and will be used to wakeup any waiters
  */
 
-#define AO_DMA_DONE	1
-#define AO_DMA_ABORTED	2
-
 uint8_t
 ao_dma_alloc(__xdata uint8_t * done);
 
@@ -781,9 +773,11 @@ struct ao_gps_sat_data {
 	uint8_t		c_n_1;
 };
 
+#define AO_MAX_GPS_TRACKING	12
+
 struct ao_gps_tracking_data {
 	uint8_t			channels;
-	struct ao_gps_sat_data	sats[12];
+	struct ao_gps_sat_data	sats[AO_MAX_GPS_TRACKING];
 };
 
 extern __xdata uint8_t ao_gps_mutex;
@@ -836,6 +830,15 @@ struct ao_telemetry {
 	struct ao_gps_tracking_data	gps_tracking;
 };
 
+/*
+ * ao_radio_recv tacks on rssi and status bytes
+ */
+struct ao_telemetry_recv {
+	struct ao_telemetry	telemetry;
+	int8_t			rssi;
+	uint8_t			status;
+};
+
 /* Set delay between telemetry reports (0 to disable) */
 
 #define AO_TELEMETRY_INTERVAL_PAD	AO_MS_TO_TICKS(1000)
@@ -878,22 +881,16 @@ void
 ao_radio_set_rdf(void);
 
 void
-ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant;
-
-struct ao_radio_recv {
-	struct ao_telemetry	telemetry;
-	int8_t			rssi;
-	uint8_t			status;
-};
+ao_radio_send(__xdata void *data, uint8_t size) __reentrant;
 
 uint8_t
-ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
+ao_radio_recv(__xdata void *data, uint8_t size) __reentrant;
 
 void
-ao_radio_rdf(int ms);
+ao_radio_recv_abort(void);
 
 void
-ao_radio_abort(void);
+ao_radio_rdf(int ms);
 
 void
 ao_radio_rdf_abort(void);